Merge branch 'vieux-blood_mode' into dev

Conflicts:
	src/common/restext.cpp
	src/ui/maindialog.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index dcecb81..95e015c 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -205,6 +205,7 @@ void InitializeRestext()
     stringsEvent[EVENT_INTERFACE_EDITMODE]  = TR("Automatic indent\\When program editing");
     stringsEvent[EVENT_INTERFACE_EDITVALUE] = TR("Big indent\\Indent 2 or 4 spaces per level defined by braces");
     stringsEvent[EVENT_INTERFACE_SOLUCE4]   = TR("Access to solutions\\Show program \"4: Solution\" in the exercises");
+    stringsEvent[EVENT_INTERFACE_BLOOD]     = TR("Blood\\Display blood when the astronaut or the alien queen is hit");
 
     stringsEvent[EVENT_INTERFACE_KDEF]      = TR("Standard controls\\Standard key functions");
     stringsEvent[EVENT_INTERFACE_KLEFT]     = TR("Turn left\\turns the bot to the left");