From 81e96c121a7ead9180caa992fa0c9860d72b9703 Mon Sep 17 00:00:00 2001
From: Steffen Mecke <stm2@users.sf.net>
Date: Mon, 27 Apr 2015 15:14:42 +0200
Subject: [PATCH 1/2] typo

---
 res/core/messages.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/core/messages.xml b/res/core/messages.xml
index 21276676e..56f7bb01b 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -1080,7 +1080,7 @@
       <arg name="region" type="region"/>
       <arg name="command" type="order"/>
     </type>
-    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die einheit kann sich nicht so gut tarnen."</text>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Einheit kann sich nicht so gut tarnen."</text>
     <text locale="en">"$unit($unit) in $region($region): '$order($command)' -The unit cannot hide that well."</text>
   </message>
 

From a9a14a79d040aeeb0878bec92e3935b6e97284b0 Mon Sep 17 00:00:00 2001
From: Steffen Mecke <stm2@users.sf.net>
Date: Thu, 29 Jan 2015 23:28:55 +0100
Subject: [PATCH 2/2] fixed messed up english strings for wounds

---
 res/core/de/strings.xml |  8 ++++----
 src/reports.c           | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index 5b2637c3f..0cd699f53 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -3569,13 +3569,13 @@
 
   </namespace>
   <namespace name="damage">
-    <string name="critical">
+    <string name="plusstrong">
       <text locale="de">sehr stark</text>
-      <text locale="en">critically wounded</text>
+      <text locale="en">super strong</text>
     </string>
-    <string name="heavily">
+    <string name="strong">
       <text locale="de">stark</text>
-      <text locale="en">heavily wounded</text>
+      <text locale="en">strong</text>
     </string>
     <string name="badly">
       <text locale="de">schwer verwundet</text>
diff --git a/src/reports.c b/src/reports.c
index 1dc779ff6..c32902df0 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -126,18 +126,24 @@ const char *report_kampfstatus(const unit * u, const struct locale *lang)
 
 const char *hp_status(const unit * u)
 {
-    double p = (double)((double)u->hp / (double)(u->number * unit_max_hp(u)));
+    double p;
+    int max_hp = u->number * unit_max_hp(u);
+
+    if (u->hp ==  max_hp)
+        return NULL;
+
+    p = (double)((double)u->hp / (double)(max_hp));
 
-    if (p > 2.00)
-        return mkname("damage", "critical");
-    if (p > 1.50)
-        return mkname("damage", "heavily");
     if (p < 0.50)
         return mkname("damage", "badly");
     if (p < 0.75)
         return mkname("damage", "wounded");
     if (p < 0.99)
         return mkname("damage", "exhausted");
+    if (p > 2.00)
+        return mkname("damage", "plusstrong");
+    if (p > 1.50)
+        return mkname("damage", "strong");
 
     return NULL;
 }