diff --git a/data/po/fr.po b/data/po/fr.po
index 48ca01363..3713cceec 100644
--- a/data/po/fr.po
+++ b/data/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 21:17-0400\n"
-"PO-Revision-Date: 2009-08-29 21:27-0500\n"
+"POT-Creation-Date: 2009-08-29 21:48-0400\n"
+"PO-Revision-Date: 2009-08-29 21:49-0500\n"
 "Last-Translator: Marianne Gagnon (Auria) <auria.mg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -127,7 +127,7 @@ msgid "Audio/Video"
 msgstr "Audio/Vidéo"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
-#: src/input/input.cpp:479
+#: src/input/input.cpp:478
 #, c-format
 msgid "Axis %d %s"
 msgstr "Axe %d %s"
@@ -161,12 +161,13 @@ msgstr ""
 msgid "Cake - thrown at the closest rival, best on short ranges and long straights"
 msgstr "Gâteau - lance-le sur ton plus proche rival, idéal sur courtes distances et sur les routes droites"
 
-#: src/states_screens/dialogs/enter_player_name_dialog.cpp:69
-#: src/states_screens/dialogs/player_info_dialog.cpp:80
+#: src/states_screens/dialogs/enter_player_name_dialog.cpp:72
+#: src/states_screens/dialogs/player_info_dialog.cpp:81
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:149
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/dialogs/player_info_dialog.cpp:155
 msgid "Cancel Remove"
 msgstr "Annuler la supression"
 
@@ -186,7 +187,7 @@ msgstr "Défis"
 #. I18N: In the kart selection (player setup) screen
 #: data/po/gui_strings.h:96
 msgid "Choose a Kart (more players can join by pressing 'fire' now)"
-msgstr "Choisis ton kart (d'autres joueurs puevent se joindre en appuyant sur 'feu')"
+msgstr "Choisis ton kart (d'autres joueurs peuvent se joindre en appuyant sur 'feu')"
 
 #: data/tracks/city/city.track:4
 msgid "City"
@@ -220,7 +221,8 @@ msgstr ""
 "'Au bout du monde' contre 3 opposants\n"
 "virtuels de niveau élevé."
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:133
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/dialogs/player_info_dialog.cpp:138
 msgid "Confirm Remove"
 msgstr "Confirme la suppression"
 
@@ -259,7 +261,8 @@ msgstr "Crédits"
 msgid "Crescent Crossing"
 msgstr "Sous la pleine lune"
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:122
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/dialogs/player_info_dialog.cpp:126
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Voulez-vous vraiment supprimer le joueur '%s' ?"
@@ -270,7 +273,8 @@ msgstr "Voulez-vous vraiment supprimer le joueur '%s' ?"
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/states_screens/dialogs/enter_player_name_dialog.cpp:36
+#. I18N: In the 'add new player' dialog
+#: src/states_screens/dialogs/enter_player_name_dialog.cpp:38
 msgid "Enter the new player's name"
 msgstr "Entre le nom du nouveau joueur"
 
@@ -345,7 +349,8 @@ msgstr ""
 "sur la piste 'Sables\n"
 "mouvants' en 2:20."
 
-#: src/states_screens/race_gui.cpp:490
+#. I18N: Shown at the end of a race
+#: src/states_screens/race_gui.cpp:491
 msgid "Finished"
 msgstr "Fini"
 
@@ -400,13 +405,13 @@ msgid "Game Modes"
 msgstr "Modes de jeu"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
-#: src/input/input.cpp:483
+#: src/input/input.cpp:482
 #, c-format
 msgid "Gamepad button %d"
 msgstr "Manette, bouton %d"
 
 #. I18N: to appear in input configuration screen, for gamepad hats
-#: src/input/input.cpp:487
+#: src/input/input.cpp:486
 #, c-format
 msgid "Gamepad hat %d"
 msgstr ""
@@ -419,7 +424,7 @@ msgid "General"
 msgstr "Général"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:677
+#: src/states_screens/race_gui.cpp:678
 msgid "Go!"
 msgstr "Partez!"
 
@@ -440,7 +445,7 @@ msgstr ""
 #. I18N: In the help menu
 #: data/po/gui_strings.h:27
 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 à droite). Tu dois réussir un défi pour en gagner l'accès."
+msgstr "Certains boutons ont un cadenas comme celui-ci. Tu dois réussir un défi pour en gagner l'accès."
 
 #: data/tracks/industry/industry.track:4
 msgid "Industry"
@@ -451,16 +456,12 @@ msgstr ""
 msgid "Intermediate"
 msgstr "Intermédiaire"
 
-#: src/input/input.cpp:501
-msgid "Invalid"
-msgstr "Invalide"
-
 #: data/tracks/castle/castle.track:4
 msgid "King Weird's Castle"
 msgstr "Château du Roi Tordu"
 
-#: src/states_screens/race_gui.cpp:497
 #: src/states_screens/race_gui.cpp:498
+#: src/states_screens/race_gui.cpp:499
 msgid "Lap"
 msgstr "Tour"
 
@@ -488,13 +489,13 @@ msgid "Make your rivals bite dust!"
 msgstr "Fais mordre la poussière à tes rivaux!"
 
 #. I18N: to appear in input configuration screen, for mouse (might not be used at all)
-#: src/input/input.cpp:495
+#: src/input/input.cpp:494
 #, 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)
-#: src/input/input.cpp:491
+#: src/input/input.cpp:490
 #, c-format
 msgid "Mouse button %d"
 msgstr "Souris, bouton %d"
@@ -602,7 +603,7 @@ msgstr "Options"
 msgid "Parachute - slows down all karts in a better position!"
 msgstr "Parachute - ralentit tous les karts en meilleure position que toi !"
 
-#: src/states_screens/race_gui.cpp:707
+#: src/states_screens/race_gui.cpp:708
 msgid "Penalty time!!"
 msgstr "Temps de pénalité !"
 
@@ -611,11 +612,12 @@ msgstr "Temps de pénalité !"
 msgid "Penguin Playground"
 msgstr "Pour jeunes pingouins"
 
-#: src/states_screens/kart_selection.cpp:118
-#: src/states_screens/kart_selection.cpp:206
-#, fuzzy, c-format
-msgid "Player %i ("
-msgstr "Joueur %i ("
+#. I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
+#: src/states_screens/kart_selection.cpp:120
+#: src/states_screens/kart_selection.cpp:210
+#, c-format
+msgid "Player %i (%s)"
+msgstr "Joueur %i (%s)"
 
 #. I18N: Section in the settings menu
 #: data/po/gui_strings.h:137
@@ -664,12 +666,12 @@ msgstr "Réglages de la course"
 msgid "Racetrack"
 msgstr "Piste de course"
 
-#: src/states_screens/kart_selection.cpp:424
+#: src/states_screens/kart_selection.cpp:428
 msgid "Random Kart"
 msgstr "Kart aléatoire"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:655
+#: src/states_screens/race_gui.cpp:656
 msgid "Ready!"
 msgstr "À vos marques..."
 
@@ -678,11 +680,13 @@ msgstr "À vos marques..."
 msgid "Regular Race (TODO - find a better name :( ) - all blows allowed, so catch weapons and make clever use of them!"
 msgstr ""
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:96
+#. I18N: In the player info dialog
+#: src/states_screens/dialogs/player_info_dialog.cpp:99
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:65
+#. I18N: In the player info dialog
+#: src/states_screens/dialogs/player_info_dialog.cpp:66
 msgid "Rename"
 msgstr "Renommer"
 
@@ -709,7 +713,7 @@ msgid "Select a game mode"
 msgstr "Choisis un mode de jeu"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:666
+#: src/states_screens/race_gui.cpp:667
 msgid "Set!"
 msgstr "Prêts"
 
@@ -971,6 +975,7 @@ msgid "You won the race!"
 msgstr "Tu as gagné la course !"
 
 #. I18N: Unbound key binding
+#: src/input/input.cpp:39
 #: data/po/gui_strings.h:186
 #: data/po/gui_strings.h:192
 #: data/po/gui_strings.h:198
@@ -995,17 +1000,11 @@ msgstr ""
 msgid "bottom"
 msgstr ""
 
-#: src/input/input.cpp:38
-msgid "not set"
-msgstr "non défini"
-
 #: data/tracks/mystery_island/mystery_island.track:7
 msgid "sj04736"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Remove Player"
-#~ msgstr "Supprimmer un joueur"
-#~ msgid "Rename Player"
-#~ msgstr "Renommer le joueur"
+#~ msgid "Player %i ("
+#~ msgstr "Joueur %i ("
 
diff --git a/data/po/fr/LC_MESSAGES/supertuxkart.mo b/data/po/fr/LC_MESSAGES/supertuxkart.mo
index 34b743846..ba49ba2e0 100644
Binary files a/data/po/fr/LC_MESSAGES/supertuxkart.mo and b/data/po/fr/LC_MESSAGES/supertuxkart.mo differ
diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 50bde3228..4e53e7597 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 21:17-0400\n"
+"POT-Creation-Date: 2009-08-29 21:48-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"
@@ -132,7 +132,7 @@ msgid "Audio/Video"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for gamepad axes
-#: src/input/input.cpp:479
+#: src/input/input.cpp:478
 #, c-format
 msgid "Axis %d %s"
 msgstr ""
@@ -163,12 +163,13 @@ msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights"
 msgstr ""
 
-#: src/states_screens/dialogs/enter_player_name_dialog.cpp:69
-#: src/states_screens/dialogs/player_info_dialog.cpp:80
+#: src/states_screens/dialogs/enter_player_name_dialog.cpp:72
+#: src/states_screens/dialogs/player_info_dialog.cpp:81
 msgid "Cancel"
 msgstr ""
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:149
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/dialogs/player_info_dialog.cpp:155
 msgid "Cancel Remove"
 msgstr ""
 
@@ -222,7 +223,8 @@ msgid ""
 "Level AI karts."
 msgstr ""
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:133
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/dialogs/player_info_dialog.cpp:138
 msgid "Confirm Remove"
 msgstr ""
 
@@ -255,7 +257,8 @@ msgstr ""
 msgid "Crescent Crossing"
 msgstr ""
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:122
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/dialogs/player_info_dialog.cpp:126
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -265,7 +268,8 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: src/states_screens/dialogs/enter_player_name_dialog.cpp:36
+#. I18N: In the 'add new player' dialog
+#: src/states_screens/dialogs/enter_player_name_dialog.cpp:38
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -322,7 +326,8 @@ msgid ""
 "in under 2:20 minutes."
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:490
+#. I18N: Shown at the end of a race
+#: src/states_screens/race_gui.cpp:491
 msgid "Finished"
 msgstr ""
 
@@ -376,13 +381,13 @@ msgid "Game Modes"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
-#: src/input/input.cpp:483
+#: src/input/input.cpp:482
 #, c-format
 msgid "Gamepad button %d"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for gamepad hats
-#: src/input/input.cpp:487
+#: src/input/input.cpp:486
 #, c-format
 msgid "Gamepad hat %d"
 msgstr ""
@@ -393,7 +398,7 @@ msgid "General"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:677
+#: src/states_screens/race_gui.cpp:678
 msgid "Go!"
 msgstr ""
 
@@ -427,15 +432,11 @@ msgstr ""
 msgid "Intermediate"
 msgstr ""
 
-#: src/input/input.cpp:501
-msgid "Invalid"
-msgstr ""
-
 #: data/tracks/castle/castle.track:4
 msgid "King Weird's Castle"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:497 src/states_screens/race_gui.cpp:498
+#: src/states_screens/race_gui.cpp:498 src/states_screens/race_gui.cpp:499
 msgid "Lap"
 msgstr ""
 
@@ -463,13 +464,13 @@ msgid "Make your rivals bite dust!"
 msgstr ""
 
 #. I18N: to appear in input configuration screen, for mouse (might not be used at all)
-#: src/input/input.cpp:495
+#: src/input/input.cpp:494
 #, 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/input.cpp:491
+#: src/input/input.cpp:490
 #, c-format
 msgid "Mouse button %d"
 msgstr ""
@@ -562,7 +563,7 @@ msgstr ""
 msgid "Parachute - slows down all karts in a better position!"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:707
+#: src/states_screens/race_gui.cpp:708
 msgid "Penalty time!!"
 msgstr ""
 
@@ -570,10 +571,11 @@ msgstr ""
 msgid "Penguin Playground"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:118
-#: src/states_screens/kart_selection.cpp:206
+#. I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
+#: src/states_screens/kart_selection.cpp:120
+#: src/states_screens/kart_selection.cpp:210
 #, c-format
-msgid "Player %i ("
+msgid "Player %i (%s)"
 msgstr ""
 
 #. I18N: Section in the settings menu
@@ -623,12 +625,12 @@ msgstr ""
 msgid "Racetrack"
 msgstr ""
 
-#: src/states_screens/kart_selection.cpp:424
+#: src/states_screens/kart_selection.cpp:428
 msgid "Random Kart"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:655
+#: src/states_screens/race_gui.cpp:656
 msgid "Ready!"
 msgstr ""
 
@@ -639,11 +641,13 @@ msgid ""
 "weapons and make clever use of them!"
 msgstr ""
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:96
+#. I18N: In the player info dialog
+#: src/states_screens/dialogs/player_info_dialog.cpp:99
 msgid "Remove"
 msgstr ""
 
-#: src/states_screens/dialogs/player_info_dialog.cpp:65
+#. I18N: In the player info dialog
+#: src/states_screens/dialogs/player_info_dialog.cpp:66
 msgid "Rename"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid "Select a game mode"
 msgstr ""
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui.cpp:666
+#: src/states_screens/race_gui.cpp:667
 msgid "Set!"
 msgstr ""
 
@@ -898,7 +902,7 @@ msgid "You won the race!"
 msgstr ""
 
 #. I18N: Unbound key binding
-#: data/po/gui_strings.h:186 data/po/gui_strings.h:192
+#: src/input/input.cpp:39 data/po/gui_strings.h:186 data/po/gui_strings.h:192
 #: data/po/gui_strings.h:198 data/po/gui_strings.h:204
 #: data/po/gui_strings.h:210 data/po/gui_strings.h:216
 #: data/po/gui_strings.h:222 data/po/gui_strings.h:228
@@ -916,10 +920,6 @@ msgstr ""
 msgid "bottom"
 msgstr ""
 
-#: src/input/input.cpp:38
-msgid "not set"
-msgstr ""
-
 #: data/tracks/mystery_island/mystery_island.track:7
 msgid "sj04736"
 msgstr ""
diff --git a/src/input/input.cpp b/src/input/input.cpp
index c31ef4d4d..3e328849d 100644
--- a/src/input/input.cpp
+++ b/src/input/input.cpp
@@ -35,12 +35,11 @@ std::string Input::getInputAsString(const Input::InputType type, const int id, c
     switch (type)
     {
         case Input::IT_NONE:
-            s = _("not set");
+            //I18N: Unbound key binding
+            s = _("[none]");
             break;
         case Input::IT_KEYBOARD:
-            // TODO - implement with non-SDL code
-            // s = SDL_GetKeyName((SDLKey) input.id0);
-            s = "some key";
+            s = "?";
             
             switch(id)
         {
@@ -498,7 +497,7 @@ std::string Input::getInputAsString(const Input::InputType type, const int id, c
                                            ? '-': '+'                        );
             break;
         default:
-            s = _("Invalid");
+            s = "?";
     }
     
     return s;
diff --git a/src/states_screens/dialogs/enter_player_name_dialog.cpp b/src/states_screens/dialogs/enter_player_name_dialog.cpp
index 1b870b512..9315831b0 100644
--- a/src/states_screens/dialogs/enter_player_name_dialog.cpp
+++ b/src/states_screens/dialogs/enter_player_name_dialog.cpp
@@ -33,7 +33,10 @@ EnterPlayerNameDialog::EnterPlayerNameDialog(const float w, const float h) :
    // label->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
   
     LabelWidget* widget = new LabelWidget();
+    
+    //I18N: In the 'add new player' dialog
     widget->m_properties[PROP_TEXT] = _("Enter the new player's name");
+    
     widget->m_properties[PROP_TEXT_ALIGN] = "center";
     widget->x = 0;
     widget->y = 0;
diff --git a/src/states_screens/dialogs/player_info_dialog.cpp b/src/states_screens/dialogs/player_info_dialog.cpp
index 7ec938968..c9819cf66 100644
--- a/src/states_screens/dialogs/player_info_dialog.cpp
+++ b/src/states_screens/dialogs/player_info_dialog.cpp
@@ -62,6 +62,7 @@ void PlayerInfoDialog::showRegularDialog()
     {
         ButtonWidget* widget = new ButtonWidget();
         widget->m_properties[PROP_ID] = "renameplayer";
+        //I18N: In the player info dialog
         widget->m_properties[PROP_TEXT] = _("Rename");
         
         const int textWidth = font->getDimension( stringw(widget->m_properties[PROP_TEXT].c_str()).c_str() ).Width + 40;
@@ -93,6 +94,8 @@ void PlayerInfoDialog::showRegularDialog()
     {
         ButtonWidget* widget = new ButtonWidget();
         widget->m_properties[PROP_ID] = "removeplayer";
+        
+        //I18N: In the player info dialog
         widget->m_properties[PROP_TEXT] = _("Remove");
         
         const int textWidth = font->getDimension( stringw(widget->m_properties[PROP_TEXT].c_str()).c_str() ).Width + 40;
@@ -119,6 +122,7 @@ void PlayerInfoDialog::showConfirmDialog()
     
     
     char message[256];
+    //I18N: In the player info dialog (when deleting)
     sprintf(message, _("Do you really want to delete player '%s' ?"), m_player->getName());
     
     core::rect< s32 > area_left(5, 0, m_area.getWidth()-5, m_area.getHeight()/2);
@@ -130,6 +134,7 @@ void PlayerInfoDialog::showConfirmDialog()
     {
         ButtonWidget* widget = new ButtonWidget();
         widget->m_properties[PROP_ID] = "confirmremove";
+        //I18N: In the player info dialog (when deleting)
         widget->m_properties[PROP_TEXT] = _("Confirm Remove");
         
         const int textWidth = font->getDimension( stringw(widget->m_properties[PROP_TEXT].c_str()).c_str() ).Width + 40;
@@ -146,6 +151,7 @@ void PlayerInfoDialog::showConfirmDialog()
     {
         ButtonWidget* widget = new ButtonWidget();
         widget->m_properties[PROP_ID] = "cancelremove";
+        //I18N: In the player info dialog (when deleting)
         widget->m_properties[PROP_TEXT] = _("Cancel Remove");
         
         const int textWidth = font->getDimension( stringw(widget->m_properties[PROP_TEXT].c_str()).c_str() ).Width + 40;
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 71f20484e..98c3c71aa 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -114,8 +114,11 @@ namespace KartSelectionScreen
             }
             
             playerIDLabel = new LabelWidget();
+            
             playerIDLabel->m_properties[PROP_TEXT] = 
-                StringUtils::insertValues(_("Player %i ("), playerID + 1) + deviceName + ")"; 
+                //I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
+                StringUtils::insertValues(_("Player %i (%s)"), playerID + 1, deviceName.c_str()); 
+            
             playerIDLabel->m_properties[PROP_TEXT_ALIGN] = "center";
             playerIDLabel->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_label", playerID);
             playerIDLabel->x = player_id_x;
@@ -203,7 +206,8 @@ namespace KartSelectionScreen
             
             playerID = newPlayerID;
             
-            std::string newLabel = StringUtils::insertValues(_("Player %i ("), playerID + 1) + deviceName + ")";
+            //I18N: In kart selection screen (Will read like 'Player 1 (foobartech gamepad)')
+            std::string newLabel = StringUtils::insertValues(_("Player %i (%s)"), playerID + 1, deviceName.c_str());
             playerIDLabel->setText( newLabel.c_str() ); 
             playerIDLabel->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_label", playerID);
         }
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 92c35b0a2..d1cd7f714 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -487,6 +487,7 @@ void RaceGUI::drawLap(const KartIconDisplayInfo* info, Kart* kart, int offset_x,
     {
         static video::SColor color = video::SColor(255, 255, 255, 255);
         core::rect<s32> pos(offset_x, offset_y, offset_x, offset_y);
+        //I18N: Shown at the end of a race
         core::stringw s=_("Finished");
         font->draw(s.c_str(), pos, color);
     }