diff --git a/data/gui/addons_loading.stkgui b/data/gui/addons_loading.stkgui
index 98c4eb543..d51e3f12c 100644
--- a/data/gui/addons_loading.stkgui
+++ b/data/gui/addons_loading.stkgui
@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
-
-
-      <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row" >
-        <div width="40%" height="100%" layout="vertical-row" >
-            <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png"/>
-            <spacer proportion="1" />
-        </div>
-        <spacer proportion="1" />
-        <div width="60%" height="50%" layout="vertical-row" >
-            <label id="name" width="100%" text_align="left"/>
-            <div width="100%" height="100%" layout="horizontal-row" >
-                <div width="50%" height="100%" layout="vertical-row" >
-                    <label id="size"     width="100%" text=""/>
-                    <label id="revision" width="100%" text=""/>
-                </div>
-                <div width="50%" height="32" layout="vertical-row" >
-                    <ratingbar id="rating" height="64" width="100%" />
-                </div>
+        <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row">
+            <div width="40%" height="100%" layout="vertical-row">
+                <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png" />
+                <spacer proportion="1" />
+            </div>
+            <spacer proportion="1" />
+            <div width="60%" height="50%" layout="vertical-row">
+                <label id="name" width="100%" text_align="left"/>
+                <div width="100%" height="100%" layout="horizontal-row">
+                    <div width="50%" height="100%" layout="vertical-row">
+                        <label id="size"     width="100%" text="" />
+                        <label id="revision" width="100%" text="" />
+                    </div>
+                    <div width="50%" height="32" layout="vertical-row">
+                        <ratingbar id="rating" height="64" width="100%" />
+                    </div>
+                </div>
+                <spacer height="10"/>
+                <label id="flags"    width="100%" text="" word_wrap="true" />
             </div>
-            <spacer height="10"/>
-            <label id="flags"    width="100%" text="" word_wrap="true"/>
         </div>
-      </div>
 
-      <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
-
-      <div width="80%" proportion="5" align="center">
-        <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
-            <icon-button id="install" width="128" height="128"
-                         icon="gui/package-update.png"
-                         I18N="Add-on screen action"  text="Install"/>
-            <icon-button id="uninstall" width="128" height="128"
-                         icon="gui/package-uninstall.png"
-                         I18N="Add-on screen action" text="Uninstall"/>
-            <icon-button id="back" width="128" height="128"
-                         icon="gui/back.png"
-                         I18N="Add-ons screen action" text="Back"/>
-        </buttonbar>
-        <progressbar id="progress" x="0" y="20%" width="100%" height="30%"  />
-      </div>
+        <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
+        <div width="80%" proportion="5" align="center">
+            <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
+                <icon-button id="install" width="128" height="128"
+                             icon="gui/package-update.png"
+                             I18N="Add-on screen action"  text="Install" />
+                <icon-button id="uninstall" width="128" height="128"
+                             icon="gui/package-uninstall.png"
+                             I18N="Add-on screen action" text="Uninstall" />
+                <icon-button id="back" width="128" height="128"
+                             icon="gui/back.png"
+                             I18N="Add-on screen action" text="Back" />
+            </buttonbar>
+            <progressbar id="progress" x="0" y="20%" width="100%" height="30%" />
+        </div>
     </div>
 </stkgui>
diff --git a/data/gui/addons_screen.stkgui b/data/gui/addons_screen.stkgui
index 708f6bff9..71b47158e 100644
--- a/data/gui/addons_screen.stkgui
+++ b/data/gui/addons_screen.stkgui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
-
         <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
             <icon-button id="back"   height="100%" icon="gui/back.png"/>
             <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
@@ -14,7 +13,7 @@
                 <spacer width="10" />
                 <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
                 <spinner id="filter_date" proportion="8" align="center" min_value="0" wrap_around="true"/>
-                <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/>
+                <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only items with good rating"/>
                 <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/>
                 <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
             </div>
@@ -24,16 +23,15 @@
 
         <tabs id="category" height="10%" max_height="110" width="90%" align="center">
             <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
-                    I18N="Section in the addons menu" text="Karts"/>
+                    I18N="In the addons screen" text="Karts"/>
             <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
-                    I18N="Section in the addons menu" text="Tracks"/>
+                    I18N="In the addons screen" text="Tracks"/>
             <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
-                    I18N="Section in the addons menu" text="Arenas"/>
+                    I18N="In the addons screen" text="Arenas"/>
         </tabs>
 
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
             <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
         </box>
-
     </div>
 </stkgui>
diff --git a/data/gui/enter_gp_name_dialog.stkgui b/data/gui/enter_gp_name_dialog.stkgui
index 2508f6565..2946fc64f 100644
--- a/data/gui/enter_gp_name_dialog.stkgui
+++ b/data/gui/enter_gp_name_dialog.stkgui
@@ -12,7 +12,7 @@
 
         <spacer height="20" width="20" />
 
-        <button id="cancel" I18N="When configuring input" text="Press ESC to cancel" align="center"/>
+        <button id="cancel" I18N="In the 'add new grand prix' dialog" text="Press ESC to cancel" align="center"/>
 
         <spacer height="15" width="20" />
 
diff --git a/data/gui/enter_player_name_dialog.stkgui b/data/gui/enter_player_name_dialog.stkgui
index 4c0f9f013..45176b442 100644
--- a/data/gui/enter_player_name_dialog.stkgui
+++ b/data/gui/enter_player_name_dialog.stkgui
@@ -12,8 +12,8 @@
         <spacer height="20" width="20" />
 
         <buttonbar proportion="1" id="options" width="100%" height="100%">
-            <button id="ok"     I18N="When configuring input" text="OK" align="center"/>
-            <button id="cancel" I18N="When configuring input" text="Cancel" align="center"/>
+            <button id="ok"     I18N="In the 'add new player' dialog" text="OK" align="center"/>
+            <button id="cancel" I18N="In the 'add new player' dialog" text="Cancel" align="center"/>
         </buttonbar>
         <spacer height="15" width="20" />
 
diff --git a/data/gui/gp_info.stkgui b/data/gui/gp_info.stkgui
index a1018587c..e469856b9 100644
--- a/data/gui/gp_info.stkgui
+++ b/data/gui/gp_info.stkgui
@@ -30,26 +30,26 @@
             <div width="50%" height="100%" layout="vertical-row">
 
                 <div width="100%" height="20%" layout="horizontal-row" >
-                    <label id="ai-text" height="100%" width="50%" I18N="Number of AI karts" text="AI karts"/>
+                    <label id="ai-text" height="100%" width="50%" I18N="In the grand prix info screen" text="AI karts"/>
                     <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
                 </div>
                 <spacer height="5%" />
                 <div width="100%" height="20%" layout="horizontal-row" >
-                    <label id="reverse-text"      width="50%" height="100%" I18N="Drive the track reverse" text="Reverse"/>
+                    <label id="reverse-text"      width="50%" height="100%" I18N="In the grand prix info screen" text="Reverse"/>
                     <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
                 </div>
                 <spacer height="5%" />
                 <div width="100%" height="20%" layout="horizontal-row">
                     <label id="track-text" width="50%" height="100%" text="Tracks"
-                           I18N="Number of tracks to pick in a random Grand Prix."/>
+                           I18N="In the grand prix info screen"/>
                     <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
                              wrap_around="true" />
                     <spacer height="1%" />
                 </div>
                 <spacer height="5%" />
                 <div width="100%" height="20%" layout="horizontal-row" >
-                    <label   id="group-text"    width="50%" height="100%" I18N="Number of AI karts" text="Track group"/>
+                    <label   id="group-text"    width="50%" height="100%" I18N="In the grand prix info screen" text="Track group"/>
                     <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
                     <spacer proportion="1" height="2" />
                 </div>
@@ -59,10 +59,10 @@
         <buttonbar id="buttons" height="15%" width="100%" align="center">
 
             <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Start race" text="Start Race"/>
+                    I18N="In the grand prix info screen" text="Start Race"/>
 
             <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Continue saved GP" text="Continue saved GP"/>
+                    I18N="In the grand prix info screen" text="Continue saved GP"/>
         </buttonbar>
 
     </div>
diff --git a/data/gui/gpeditor.stkgui b/data/gui/gpeditor.stkgui
index 594386ed9..da7a0cf97 100644
--- a/data/gui/gpeditor.stkgui
+++ b/data/gui/gpeditor.stkgui
@@ -21,8 +21,7 @@
         <spacer height="20" />
 
         <box proportion="2" width="100%" layout="vertical-row">
-            <label id="gpname" text_align="center" width="100%"
-                I18N="In the grand prix editor screen" text="" />
+            <label id="gpname" text_align="center" width="100%" text="" />
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
                 label_location="each" align="left" max_rows="1"
                 child_width="160" child_height="120" />
diff --git a/data/gui/main.stkgui b/data/gui/main.stkgui
index 67479aed0..66ca6f8ca 100644
--- a/data/gui/main.stkgui
+++ b/data/gui/main.stkgui
@@ -48,17 +48,17 @@
                  <icon-button id="test_unlocked2" width="64" height="64" icon="gui/main_options.png" extend_label="50"
                              text="TEST: Unlocked 2" label_location="hover"/>      
                 <icon-button id="options" width="64" height="64" icon="gui/main_options.png" extend_label="50"
-                             I18N="Main menu button"  text="Options" label_location="hover"/>
+                             I18N="In the main screen"  text="Options" label_location="hover"/>
                 <icon-button id="help" width="64" height="64" icon="gui/main_help.png"  extend_label="50"
-                             I18N="Main menu button" text="Help" label_location="hover"/>
+                             I18N="In the main screen" text="Help" label_location="hover"/>
                 <icon-button id="startTutorial" width="64" height="64" icon="gui/tutorial.png" extend_label="150"
-                             I18N="Main menu button" text="Tutorial" label_location="hover"/>
+                             I18N="In the main screen" text="Tutorial" label_location="hover"/>
                 <icon-button id="gpEditor" width="64" height="64" icon="gui/gpeditor.png" extend_label="150"
-                             I18N="Main menu button" text="Grand Prix Editor" label_location="hover"/>
+                             I18N="In the main screen" text="Grand Prix Editor" label_location="hover"/>
                 <icon-button id="about" width="64" height="64" icon="gui/main_about.png"  extend_label="50"
-                             I18N="Main menu button" text="About" label_location="hover"/>
+                             I18N="In the main screen" text="About" label_location="hover"/>
                 <icon-button id="quit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"
-                             I18N="Main menu button" text="Quit" label_location="hover"/>
+                             I18N="In the main screen" text="Quit" label_location="hover"/>
             </buttonbar>
         </bottombar>
     </div>
diff --git a/data/gui/online/create_server.stkgui b/data/gui/online/create_server.stkgui
index 1b6b29861..c8f539388 100644
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/online/create_server.stkgui
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-
-        <header text_align="center" width="80%" align="center" I18N="In the create server screen" text="Server Creation"/>
+        <header text_align="center" width="80%" align="center" I18N="In the server creation screen" text="Server Creation"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
             <div width="90%" align="center" layout="vertical-row" y="2%" height="96%">
                 <div width="100%" align="center" layout="vertical-row"  height="fit" >
                     <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the create server screen" text="Name of the server"/>
-                        <textbox proportion="1" id="name" I18N="In the create server screen"/>
+                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Name of the server"/>
+                        <textbox proportion="1" id="name" I18N="In the server creation screen"/>
                     </div>
 
                     <spacer height="20" width="20"/>
 
                     <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the create server screen" text="Max. number of players"/>
+                        <label proportion="1" text_align="left" I18N="In the server creation screen" text="Max. number of players"/>
                         <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
                     </div>
                 </div>
@@ -24,9 +23,9 @@
 
                 <buttonbar id="options" x="0" y="0" width="25%" height="12%" align="center">
                     <icon-button id="create" width="64" height="64" icon="gui/green_check.png"
-                                 I18N="Main menu button" text="Create" label_location="bottom"/>
+                                 I18N="In the server creation screen" text="Create" label_location="bottom"/>
                     <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                                 I18N="Main menu button" text="Cancel" label_location="bottom"/>
+                                 I18N="In the server creation screen" text="Cancel" label_location="bottom"/>
                 </buttonbar>
             </div>
         </box>
diff --git a/data/gui/online/guest_login.stkgui b/data/gui/online/guest_login.stkgui
index 42ce4cd1b..013469aa2 100644
--- a/data/gui/online/guest_login.stkgui
+++ b/data/gui/online/guest_login.stkgui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
         <header align="center" width="80%" text="Login" text_align="center"/>
         <spacer height="15" width="10"/>
 
@@ -20,19 +19,17 @@
             <spacer height="15" width="10"/>
             <box proportion="4" width="90%" layout="vertical-row" align="center">
                 <div x="2%" y="2%" width="96%" height="80%" layout="vertical-row" id="outer_box" >
-                    <label I18N="In the online multiplayer screen" proportion="4" word_wrap="true" text=
-                    "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."
-                           align="center"/>
+                    <label I18N="In the login dialog" proportion="4" word_wrap="true"
+                        text="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."
+                         align="center"/>
                 </div>
             </box>
             <spacer height="15" width="10"/>
             <buttonbar id="options" width="90%" height="13%" align="bottom">
                 <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
-                             I18N="Login dialog"  text="Sign In" label_location="bottom"/>
+                             I18N="In the login dialog"  text="Sign In" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="Login dialog" text="Close" label_location="bottom"/>
+                             I18N="In the login dialog" text="Close" label_location="bottom"/>
             </buttonbar>
             <spacer height="15" width="10"/>
         </box>
diff --git a/data/gui/online/lobby.stkgui b/data/gui/online/lobby.stkgui
index aa0ec49c4..a86e226d7 100644
--- a/data/gui/online/lobby.stkgui
+++ b/data/gui/online/lobby.stkgui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-
         <header text_align="center" width="80%" align="center" I18N="In networking lobby" text="Lobby"/>
         <spacer height="15" width="10"/>
         <div proportion="1" x="2%" width="96%" layout="vertical-row">
@@ -40,11 +39,9 @@
 
             <buttonbar id="menu_bottomrow" x="0" y="0" width="20%" height="100%" align="center">
                 <icon-button id="exit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"
-                             I18N="Main menu button" text="Exit" label_location="hover"/>
+                             I18N="In the networking lobby" text="Exit" label_location="hover"/>
             </buttonbar>
-
         </bottombar>
-
     </div>
 
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
diff --git a/data/gui/online/lobby_settings.stkgui b/data/gui/online/lobby_settings.stkgui
index 2dbf3bcb4..71f975d54 100644
--- a/data/gui/online/lobby_settings.stkgui
+++ b/data/gui/online/lobby_settings.stkgui
@@ -7,7 +7,7 @@
             <div width="90%" align="center" layout="vertical-row" height="fit" >
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label proportion="1" text_align="left" I18N="In the lobby settings screen" text="Name of the server"/>
-                    <textbox proportion="2" id="name" I18N="In the login dialog"/>
+                    <textbox proportion="2" id="name" I18N="In the lobby settings screen"/>
                 </div>
 
                 <spacer height="20" width="20"/>
diff --git a/data/gui/online/main.stkgui b/data/gui/online/main.stkgui
index 2b0150313..b4cf4df8e 100644
--- a/data/gui/online/main.stkgui
+++ b/data/gui/online/main.stkgui
@@ -6,23 +6,22 @@
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
             <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" id="outer_box" >
-                <label I18N="In the online multiplayer screen" proportion="4" word_wrap="true" text=
-                "Here will come some information.. or statistics.. or whatever. Yet to be filled in! It will change depending on state. And I'd also like a close button at the right top.
-
-                " align="center"/>
+                <!-- TODO: Here will come some information.. or statistics.. or whatever. Yet to be filled in! It will change depending on state. And I'd also like a close button at the right top. -->
+                <label I18N="In the online multiplayer screen" proportion="4"
+                    word_wrap="true" text="" align="center"/>
             </div>
         </box>
 
         <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
             <icon-button id="quick_play" width="128" height="128"
                          icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
-                         I18N="Online menu button" text="Quick Play"/>
+                         I18N="In the online multiplayer screen" text="Quick Play"/>
             <icon-button id="find_server" width="128" height="128"
                          icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
-                         I18N="Online menu button" text="Find Server"/>
+                         I18N="In the online multiplayer screen" text="Find Server"/>
             <icon-button id="create_server" width="128" height="128"
                          icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
-                         I18N="Online menu button" text="Create Server"/>
+                         I18N="In the online multiplayer screen" text="Create Server"/>
         </buttonbar>
 
         <spacer width="10" height="7%"/>
@@ -34,9 +33,9 @@
 
             <buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
                 <icon-button id="profile" width="64" height="64" icon="gui/green_check.png"  extend_label="50"
-                             I18N="Online menu button" text="Profile" label_location="hover"/>
+                             I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
                 <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
-                             I18N="Online menu button" text="Sign Out" label_location="hover"/>
+                             I18N="In the online multiplayer screen" text="Sign Out" label_location="hover"/>
             </buttonbar>
 
         </bottombar>
diff --git a/data/gui/online/profile_achievements.stkgui b/data/gui/online/profile_achievements.stkgui
index 0d52222be..33b0900d1 100644
--- a/data/gui/online/profile_achievements.stkgui
+++ b/data/gui/online/profile_achievements.stkgui
@@ -9,7 +9,8 @@
         <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" I18N="Section in the profile menu" text="Achievements"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.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"/>
         </tabs>
diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui
index 47f2ed31c..37a89864e 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -10,7 +10,8 @@
 
         <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_friends" width="128" height="128" icon="gui/options_players.png" I18N="Section in the profile menu" text="Friends"/>
+            <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"/>
         </tabs>
 
@@ -21,7 +22,7 @@
         <div id="search_div" height="fit" width="100%" layout="vertical-row">
             <spacer width="10" height="10"/>
             <box height="fit" width="100%" layout="vertical-row">
-                <label height="fit" text_align="left" I18N="Profile friends" text="Look for more friends:"/>
+                <label height="fit" text_align="left" I18N="In the profile screen" text="Look for more friends:"/>
                 <spacer width="10" height="10"/>
                 <div height="fit" width="100%" layout="horizontal-row" align="center">
                     <textbox id="search_box" proportion="1" height="fit"/>
diff --git a/data/gui/online/profile_overview.stkgui b/data/gui/online/profile_overview.stkgui
index 81afe5507..158d95f43 100644
--- a/data/gui/online/profile_overview.stkgui
+++ b/data/gui/online/profile_overview.stkgui
@@ -9,7 +9,8 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png" I18N="Section in the profile menu" text="Overview"/>
+            <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_settings" width="128" height="128" icon="gui/main_options.png"/>
diff --git a/data/gui/online/profile_settings.stkgui b/data/gui/online/profile_settings.stkgui
index 7b15fc064..d021747ba 100644
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/online/profile_settings.stkgui
@@ -3,7 +3,6 @@
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
         <header id="title" text_align="center" width="80%" align="center" text="..."/>
 
         <spacer height="25" width="10"/>
@@ -11,7 +10,8 @@
         <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_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 menu" text="Account Settings"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"
+                I18N="Section in the profile screen" text="Account Settings"/>
         </tabs>
 
         <box proportion="1" width="100%" layout="vertical-row">
diff --git a/data/gui/online/recovery_info.stkgui b/data/gui/online/recovery_info.stkgui
index 23c23aa13..50ac5c186 100644
--- a/data/gui/online/recovery_info.stkgui
+++ b/data/gui/online/recovery_info.stkgui
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-       I18N="In the registration dialog' dialog" text="Account Recovery"/>
+            I18N="In the recovery dialog" text="Account Recovery"/>
 
         <spacer height="20" width="50"/>
 
-        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the registration dialog"
-        text="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."/>
+        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the recovery dialog"
+            text="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." />
 
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="25%" height="15%" align="center">
             <icon-button id="cancel" width="64" height="64" icon="gui/green_check.png"
-                I18N="Registration dialog" text="Close" label_location="none"/>
+                I18N="In the recovery dialog" text="Close" label_location="none"/>
         </buttonbar>
     </div>
 </stkgui>
diff --git a/data/gui/online/recovery_input.stkgui b/data/gui/online/recovery_input.stkgui
index 037de6f9b..9dc2819c9 100644
--- a/data/gui/online/recovery_input.stkgui
+++ b/data/gui/online/recovery_input.stkgui
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
-
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-       I18N="In the recovery dialog' dialog" text="Account Recovery"/>
+            I18N="In the recovery dialog" text="Account Recovery"/>
 
         <spacer height="20" width="50"/>
 
         <label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true"
-        text="Fill in the username and email address you supplied at registration to be able to reset your password."/>
+            text="Fill in the username and email address you supplied at registration to be able to reset your password."/>
 
         <spacer height="40" width="50"/>
 
@@ -30,15 +29,15 @@
         <spacer height="20" width="50"/>
 
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
-           I18N="In the recovery" text=""/>
+           I18N="In the recovery dialog" text=""/>
 
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="25%" proportion="1" align="center">
             <icon-button id="submit" width="64" height="64" icon="gui/green_check.png"
-                I18N="Registration dialog" text="Submit" label_location="none"/>
+                I18N="In the recovery dialog" text="Submit" label_location="none"/>
             <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                I18N="Registration dialog"  text="Cancel" label_location="none"/>
+                I18N="In the recovery dialog"  text="Cancel" label_location="none"/>
         </buttonbar>
     </div>
 </stkgui>
diff --git a/data/gui/online/register.stkgui b/data/gui/online/register.stkgui
index 01b243dbc..18dc92cd8 100644
--- a/data/gui/online/register.stkgui
+++ b/data/gui/online/register.stkgui
@@ -15,9 +15,9 @@
                 </div>
                 <div width="100%" height="12%" layout="horizontal-row" >
                     <label    id="label_online" proportion="1" height="100%" text_align="left"
-                              I18N="In the login screen" text="Create online account"/>
+                              I18N="In the registration dialog" text="Create online account"/>
                     <div proportion="2" layout="horizontal-row" height="fit">
-                        <checkbox id="online" I18N="In the login screen" text_align="left"/>
+                        <checkbox id="online" I18N="In the registration dialog" text_align="left"/>
                     </div>
                 </div>
 
@@ -59,9 +59,9 @@
 
             <buttonbar id="options" width="40%" height="15%" align="center">
                 <icon-button id="next" width="50%" height="90%" icon="gui/green_check.png"
-                    I18N="Registration dialog" text="OK" label_location="none"/>
+                    I18N="In the registration dialog" text="OK" label_location="none"/>
                 <icon-button id="cancel" width="50%" height="90%" icon="gui/main_quit.png"
-                    I18N="Registration dialog"  text="Cancel" label_location="none"/>
+                    I18N="In the registration dialog"  text="Cancel" label_location="none"/>
             </buttonbar>
         </box>
     </div>
diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/online/registration_terms.stkgui
index 4d9d2f299..cf6d202a4 100644
--- a/data/gui/online/registration_terms.stkgui
+++ b/data/gui/online/registration_terms.stkgui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="4%" width="96%" height="92%" layout="vertical-row" >
-
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-       I18N="In the registration dialog' dialog" text="Terms and Agreement"/>
+            I18N="In the registration dialog" text="Terms and Agreement"/>
 
         <spacer height="25" width="50"/>
 
@@ -19,15 +18,15 @@
         <spacer height="20" width="50"/>
 
         <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
-           I18N="In the registration dialog" text=""/>
+            I18N="In the registration dialog" text=""/>
 
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="45%" height="14%" align="center">
             <icon-button id="accept" width="64" height="64" icon="gui/green_check.png"
-                I18N="Registration dialog" text="Accept" label_location="bottom"/>
+                I18N="In the registration dialog" text="Accept" label_location="bottom"/>
             <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                I18N="Registration dialog" text="Cancel" label_location="bottom"/>
+                I18N="In the registration dialog" text="Cancel" label_location="bottom"/>
         </buttonbar>
     </div>
 </stkgui>
diff --git a/data/gui/online/server_info_dialog.stkgui b/data/gui/online/server_info_dialog.stkgui
index b9da20e33..a9bc3fa44 100644
--- a/data/gui/online/server_info_dialog.stkgui
+++ b/data/gui/online/server_info_dialog.stkgui
@@ -3,7 +3,7 @@
     <div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
 
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-       I18N="In the server info dialog' dialog" text="Server Info"/>
+       I18N="In the server info dialog" text="Server Info"/>
 
        <spacer height="20" width="50"/>
 
@@ -22,9 +22,9 @@
 
         <buttonbar id="options" width="90%" height="20%" align="center">
                 <icon-button id="join" width="64" height="64" icon="gui/green_check.png"
-                             I18N="Login dialog"  text="Join" label_location="bottom"/>
+                             I18N="In the server info dialog"  text="Join" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="Login dialog" text="Cancel" label_location="bottom"/>
+                             I18N="In the server info dialog" text="Cancel" label_location="bottom"/>
         </buttonbar>
     </div>
 </stkgui>
diff --git a/data/gui/online/vote_dialog.stkgui b/data/gui/online/vote_dialog.stkgui
index 37b830868..904deba58 100644
--- a/data/gui/online/vote_dialog.stkgui
+++ b/data/gui/online/vote_dialog.stkgui
@@ -2,7 +2,7 @@
 <stkgui>
     <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
         <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-       I18N="In the vote dialog' dialog" text="Vote"/>
+            I18N="In the vote dialog" text="Vote"/>
 
         <spacer height="20" width="50"/>
 
diff --git a/data/gui/options_audio.stkgui b/data/gui/options_audio.stkgui
index 4150e2f08..471e64453 100644
--- a/data/gui/options_audio.stkgui
+++ b/data/gui/options_audio.stkgui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row">
         <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
         <spacer height="15" width="10"/>
 
@@ -19,10 +18,10 @@
             <spacer height="5" width="10"/>
 
             <!-- ******** Music ******** -->
-            <label width="100%" I18N="Section in the audio/video settings submenu" text="Music"/>
+            <label width="100%" I18N="In the audio options screen" text="Music"/>
 
             <div width="75%" height="fit" layout="horizontal-row" >
-                <label proportion="1" height="100%" text_align="right" I18N="Next to checkbox in settings menu" text="Enabled"/>
+                <label proportion="1" height="100%" text_align="right" I18N="In the audio options screen" text="Enabled"/>
 
                 <div proportion="1" height="fit" layout="horizontal-row" >
                     <spacer width="40" height="100%" />
@@ -31,7 +30,7 @@
                 </div>
             </div>
             <div width="75%" height="fit" layout="horizontal-row" >
-                <label proportion="1" height="100%" text_align="right" I18N="Music volume in options" text="Volume"/>
+                <label proportion="1" height="100%" text_align="right" I18N="In the audio options screen" text="Volume"/>
                 <div proportion="1" height="fit" layout="horizontal-row" >
                     <spacer width="40" height="100%" />
                     <gauge id="music_volume" proportion="1" min_value="1" max_value="10"/>
@@ -41,10 +40,10 @@
             <spacer height="15" width="10"/>
 
             <!-- ******** SFX ******** -->
-            <label width="100%" I18N="Section in audio/video settings submenu" text="Sound Effects"/>
+            <label width="100%" I18N="In the audio options screen" text="Sound Effects"/>
 
             <div width="75%" height="fit" layout="horizontal-row" >
-                <label proportion="1" height="100%" text_align="right" I18N="Next to checkbox in settings menu" text="Enabled"/>
+                <label proportion="1" height="100%" text_align="right" I18N="In the audio options screen" text="Enabled"/>
                 <div proportion="1" height="fit" layout="horizontal-row" >
                     <spacer width="40" height="100%" />
                     <!-- FIXME: don't hardcode height -->
@@ -52,14 +51,13 @@
                 </div>
             </div>
             <div width="75%" height="fit" layout="horizontal-row" >
-                <label proportion="1" height="100%" text_align="right" I18N="Sound volume in options" text="Volume"/>
+                <label proportion="1" height="100%" text_align="right" I18N="In the audio options screen" text="Volume"/>
                 <div proportion="1" height="fit" layout="horizontal-row" >
                     <spacer width="40" height="100%" />
                     <gauge id="sfx_volume" proportion="1" min_value="1" max_value="10"/>
                 </div>
             </div>
 
-
             <spacer height="20" width="10"/>
 
         </box>
diff --git a/data/gui/options_device.stkgui b/data/gui/options_device.stkgui
index afe5c5de3..8b45928a1 100644
--- a/data/gui/options_device.stkgui
+++ b/data/gui/options_device.stkgui
@@ -33,7 +33,7 @@
                 <spacer width="7" height="5"/>
                 <div height="100%" width="fit" layout="vertical-row">
                     <button id="delete"
-                            I18N="To delete a keyboard configuration"  text="Delete Configuration"/>
+                            I18N="In the input configuration screen"  text="Delete Configuration"/>
                     <spacer width="50" height="10" />
                     <button id="back_to_device_list" I18N="In the input configuration screen"  text="Back to device list"/>
 
diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui
index e966291f1..e4a230d5f 100644
--- a/data/gui/options_input.stkgui
+++ b/data/gui/options_input.stkgui
@@ -16,7 +16,7 @@
 
         <box proportion="1" width="100%" layout="vertical-row">
             <label width="100%"
-                I18N="In key bindings configuration menu"
+                I18N="In the input configuration screen"
                 text="Press enter or double-click on a device to configure it"
                 text_align="center" />
 
@@ -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 'fire' key is pressed to join the game."
+            <label 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>
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui
index d291eab90..286b0971b 100644
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@@ -29,7 +29,7 @@
             <spacer width="5" height="10"/>
 
             <label width="100%"
-                I18N="In players configuration menu"
+                I18N="In the player configuration screen"
                 text="Press enter or double-click on a player to edit him/her"
                 text_align="center" />
 
@@ -40,7 +40,7 @@
             <spacer width="20" height="25"/>
 
             <button id="addplayer" x="20"
-                    I18N="In players configuration menu"
+                    I18N="In the player configuration screen"
                     text="Add Player" align="center"/>
 
             <spacer width="20" height="15"/>
diff --git a/data/gui/options_video.stkgui b/data/gui/options_video.stkgui
index bdeb63365..afb3aaebd 100644
--- a/data/gui/options_video.stkgui
+++ b/data/gui/options_video.stkgui
@@ -20,7 +20,7 @@
 
             <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
             <div width="75%" height="fit" layout="horizontal-row" id="outer_box" >
-                <label I18N="In the graphics settings" text="Graphical Effects Level" align="center"/>
+                <label I18N="In the video settings" text="Graphical Effects Level" align="center"/>
                 <spacer width="20" height="20"/>
 
                 <div layout="vertical-row" proportion="1" height="fit" id="inner_box">
@@ -44,7 +44,7 @@
 
             <!-- ************ RESOLUTION CHOICE ************ -->
             <spacer height="10" width="10"/>
-            <label width="100%" I18N="In the graphics settings" text="Resolution"/>
+            <label width="100%" I18N="In the video settings" text="Resolution"/>
 
             <scrollable_ribbon id="resolutions" proportion="1" label_location="each"
                                width="100%" square_items="false"
@@ -71,7 +71,7 @@
             <div width="100%" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="100%" />
                 <button id="apply_resolution"
-                    I18N="In the video settings menu" text="Apply new resolution" />
+                    I18N="In the video settings" text="Apply new resolution" />
             </div>
 
             <spacer height="15" width="4"/>
diff --git a/data/gui/overworld_dialog.stkgui b/data/gui/overworld_dialog.stkgui
index c5bae2ba1..cf304fb03 100644
--- a/data/gui/overworld_dialog.stkgui
+++ b/data/gui/overworld_dialog.stkgui
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
-
         <header id="title" width="100%" text_align="center" text="Paused" proportion="3" />
 
         <!-- FIXME: some play in proportions occur below because the text of an icon
                     button is added UNDER it and not within its allocated height -->
         <icon-button id="backbtn" align="center" icon="gui/back.png" extend_label="200"
-                     I18N="Race paused button" text="Back to Game" proportion="3"/>
+                     I18N="In the in-game dialog" text="Back to Game" proportion="3"/>
 
         <spacer width="20" height="50" />
 
         <buttonbar id="choiceribbon" proportion="4" width="100%" align="center">
 
             <icon-button id="selectkart" width="128" height="128" icon="gui/random_kart.png"
-                    I18N="Race paused button" text="Select kart" word_wrap="true"/>
+                    I18N="In the in-game dialog" text="Select kart" word_wrap="true"/>
 
             <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
-                         I18N="Race paused button" text="Options" word_wrap="true"/>
+                         I18N="In the in-game dialog" text="Options" word_wrap="true"/>
 
             <icon-button id="help" width="128" height="128" icon="gui/main_help.png"
-                    I18N="Race paused button" text="Help" word_wrap="true"/>
+                    I18N="In the in-game dialog" text="Help" word_wrap="true"/>
 
             <icon-button id="exit" width="128" height="128" icon="gui/main_quit.png"
-                         I18N="Race paused button" text="Back to menu" word_wrap="true"/>
+                         I18N="In the in-game dialog" text="Back to menu" word_wrap="true"/>
 
         </buttonbar>
 
diff --git a/data/gui/soccer_setup.stkgui b/data/gui/soccer_setup.stkgui
index f61cd16b0..d0ca84123 100644
--- a/data/gui/soccer_setup.stkgui
+++ b/data/gui/soccer_setup.stkgui
@@ -10,28 +10,28 @@
 
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
-                    I18N="In soccer setup menu" text="Number of goals to win" text_align="left" />
+                    I18N="In soccer setup screen" text="Number of goals to win" text_align="left" />
             <spacer width="50" height="25"/>
             <spinner id="goalamount" width="200" height="90%" min_value="1" max_value="10"/>
         </div>
 
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
-                    I18N="In soccer setup menu" text="Maximum time (min.)" text_align="left" />
+                    I18N="In soccer setup screen" text="Maximum time (min.)" text_align="left" />
             <spacer width="50" height ="25"/>
             <spinner id="timeamount" width="200" height="90%" min_value="1" max_value="15"/>
         </div>
 
         <div layout="horizontal-row" width="fit" height="35" align="left">
             <bright proportion="1" height="100%"
-                    I18N="In soccer setup menu" text="Game type (Goals limit / Time limit)" text_align="left" />
+                    I18N="In soccer setup screen" text="Game type (Goals limit / Time limit)" text_align="left" />
             <spacer width="50" height="25"/>
             <checkbox id="time_enabled"/>
         </div>
 
         <spacer height="40" width="25"/>
 
-        <bright height="15" width="25" I18N="In soccer setup menu" text="Use left/right to choose your team and press fire" text_align="center" align="center" />
+        <bright height="15" width="25" I18N="In soccer setup screen" text="Use left/right to choose your team and press fire" text_align="center" align="center" />
 
         <div id="central_div" layout="horizontal-row" width="100%" proportion="1" align="center">
             <roundedbox y="5%" width="100%" layout="horizontal-row" height="100%">
diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
index 32ab2e52d..7f4e78f7a 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@@ -3,7 +3,6 @@
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
-
         <header id="name" height="5%" width="80%" align="center" text_align="center"/>
 
         <spacer width="1" height="5%"/>
@@ -13,7 +12,6 @@
             <div proportion="1" height="100%" layout="vertical-row">
                 <placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
                 </placeholder>
-
             </div>
             <!-- Right pane -->
             <div proportion="1" height="100%" layout="vertical-row">
@@ -55,7 +53,7 @@
 
             <div width="75%" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="2" />
-                <label id="lap-text" height="100%" width="40%" I18N="Number of laps" text="Number of laps"/>
+                <label id="lap-text" height="100%" width="40%" I18N="In the track info screen" text="Number of laps"/>
                 <spacer witdh="40" height="2" />
                 <spinner id="lap-spinner" width="20%" min_value="1" max_value="20" align="center"
                          wrap_around="true" />
@@ -63,7 +61,7 @@
             </div>
             <div width="75%" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="2" />
-                <label id="ai-text" height="100%" width="40%" I18N="Number of AI karts" text="Number of AI karts"/>
+                <label id="ai-text" height="100%" width="40%" I18N="In the track info screen" text="Number of AI karts"/>
                 <spacer with="40" height="2" />
                 <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
                          wrap_around="true" />
@@ -71,7 +69,7 @@
             </div>
             <div width="75%" height="fit" layout="horizontal-row" >
                 <spacer width="40" height="2" />
-                <label id="reverse-text" height="100%" width="40%" I18N="Drive the track reverse" text="Drive in reverse"/>
+                <label id="reverse-text" height="100%" width="40%" I18N="In the track info screen" text="Drive in reverse"/>
                 <spacer width="40" height="2" />
                 <checkbox id="reverse"/>
                 <spacer proportion="1" height="2" />
@@ -80,11 +78,9 @@
         </box>
         <spacer width="1" height="5%"/>
         <buttonbar id="buttons" height="15%" width="100%" align="center">
-
             <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
-                    I18N="Start race" text="Start Race"/>
-
-        </buttonbar>>
+                    I18N="In the track info screen" text="Start Race"/>
 
+        </buttonbar>
     </div>
 </stkgui>
diff --git a/data/gui/tracks.stkgui b/data/gui/tracks.stkgui
index d4307703d..aef3313d6 100644
--- a/data/gui/tracks.stkgui
+++ b/data/gui/tracks.stkgui
@@ -4,7 +4,7 @@
 
     <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
 
-        <header width="80%" I18N="Section in track selection screen" text="Grand Prix"
+        <header width="80%" I18N="In the track selection screen" text="Grand Prix"
                 align="center" text_align="center" />
 
         <box width="100%" height="195" padding="0">
@@ -12,7 +12,7 @@
                                 square_items="true" child_width="175" child_height="120" />
         </box>
 
-        <header width="100%" I18N="Section in track selection screen" text="All Tracks"
+        <header width="100%" I18N="In the track selection screen" text="All Tracks"
                 align="center" text_align="center" />
 
         <box proportion="1" width="100%" layout="vertical-row" padding="1">
diff --git a/data/gui/user_screen.stkgui b/data/gui/user_screen.stkgui
index ce64e1a94..877f87cb1 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -17,13 +17,13 @@
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
-                    <label proportion="1" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Online"/>
                 </div>
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <checkbox width="fit" id="remember-user" I18N="In the login screen" text_align="left"/>
+                    <checkbox width="fit" id="remember-user" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
                     <label proportion="1" id="label_remember" height="100%" text_align="left"
-                              I18N="In the login screen" text="Remember password"/>
+                              I18N="In the user screen" text="Remember password"/>
                 </div>
                 <!-- Disable guest accounts for now
                 <div width="100%" height="fit" layout="horizontal-row" >
@@ -35,14 +35,14 @@
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label width="40%" id="label_username" height="100%" text_align="left"
                            I18N="In the user screen" text="Username"/>
-                    <textbox id="username" proportion="2" height="fit" I18N="In the registration dialog"/>
+                    <textbox id="username" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
                 <spacer height="20" width="20"/>
 
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label id="label_password" width="40%" height="100%" text_align="left"
-                           I18N="In the registration dialog" text="Password"/>
-                    <textbox id="password" proportion="2" height="fit" I18N="In the registration dialog"/>
+                           I18N="In the user screen" text="Password"/>
+                    <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
             </div>
             <div width="80%" align="center" layout="vertical-row" height="fit">
@@ -51,15 +51,15 @@
             <spacer width="20" height="25"/>
             <buttonbar id="options" width="90%" height="13%" align="bottom">
                 <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
-                             I18N="Login dialog" text="OK" label_location="bottom"/>
+                             I18N="In the user screen" text="OK" label_location="bottom"/>
                 <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
-                             I18N="Login dialog" text="Add user" label_location="bottom"/>
+                             I18N="In the user screen" text="Add user" label_location="bottom"/>
                 <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
-                             I18N="Login dialog" text="Delete" label_location="bottom"/>
+                             I18N="In the user screen" text="Delete" label_location="bottom"/>
                 <icon-button id="rename" width="64" height="64" icon="gui/gp_rename.png"
-                             I18N="Login dialog" text="Rename" label_location="bottom"/>
+                             I18N="In the user screen" text="Rename" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="Login dialog" text="Cancel" label_location="bottom"/>
+                             I18N="In the user screen" text="Cancel" label_location="bottom"/>
             </buttonbar>
         </box>
         <spacer width="20" height="15"/>
diff --git a/data/gui/user_screen_tab.stkgui b/data/gui/user_screen_tab.stkgui
index 4ebb48810..84f1f9179 100644
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/user_screen_tab.stkgui
@@ -24,12 +24,12 @@
             <spacer height="15" width="10"/>
             <div width="90%" align="center" layout="vertical-row" height="fit">
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <checkbox width="fit" id="online" I18N="In the login screen" text_align="left"/>
+                    <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
-                    <label proportion="1" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
+                    <label proportion="1" height="100%" text_align="left" I18N="In the user screen" text="Online"/>
                 </div>
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <checkbox width="fit" id="remember-user" I18N="In the login screen" text_align="left"/>
+                    <checkbox width="fit" id="remember-user" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
                     <label id="label_remember" proportion="1" height="100%" text_align="left"
                               I18N="In the user screen" text="Remember password"/>
@@ -44,7 +44,7 @@
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <label id="label_username" width="40%" height="100%" text_align="left"
                            I18N="In the user screen" text="Username"/>
-                    <textbox id="username" proportion="2" height="fit" I18N="In the registration dialog"/>
+                    <textbox id="username" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
                 <spacer height="20" width="20"/>
 
@@ -60,15 +60,15 @@
             <spacer width="20" height="25"/>
             <buttonbar id="options" width="90%" height="13%" align="center">
                 <icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
-                             I18N="Login dialog" text="OK" label_location="bottom"/>
+                             I18N="In the user screen" text="OK" label_location="bottom"/>
                 <icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"
-                             I18N="Login dialog" text="Add user" label_location="bottom"/>
+                             I18N="In the user screen" text="Add user" label_location="bottom"/>
                 <icon-button id="delete" width="64" height="64" icon="gui/remove.png"
-                             I18N="Login dialog" text="Delete" label_location="bottom"/>
+                             I18N="In the user screen" text="Delete" label_location="bottom"/>
                 <icon-button id="rename" width="64" height="64" icon="gui/rename.png"
-                             I18N="Login dialog" text="Rename" label_location="bottom"/>
+                             I18N="In the user screen" text="Rename" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="Login dialog" text="Cancel" label_location="bottom"/>
+                             I18N="In the user screen" text="Cancel" label_location="bottom"/>
             </buttonbar>
         </box>
     </div>