From d4bd2bc7f7f7e1101dff49a189e822ed1c311851 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 8 Jul 2012 11:37:19 -0700
Subject: [PATCH] remove DELIVER

translate hunger in the NR
---
 res/de/strings.xml     |  8 +++++---
 src/gamecode/economy.c |  2 +-
 src/kernel/order.c     |  5 -----
 src/kernel/reports.c   | 10 ++++++----
 src/kernel/types.h     |  1 -
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/res/de/strings.xml b/res/de/strings.xml
index aea55a6a9..d7f7039f6 100644
--- a/res/de/strings.xml
+++ b/res/de/strings.xml
@@ -2200,9 +2200,6 @@
   <string name="LERNEN">
     <text locale="de">LERNEN</text>
   </string>
-  <string name="LIEFERE">
-    <text locale="de">LIEFERE</text>
-  </string>
   <string name="MACHEN">
     <text locale="de">MACHEN</text>
   </string>
@@ -6980,6 +6977,11 @@
     <text locale="en">guards the region</text>
   </string>
 
+  <string name="unit_hungers">
+    <text locale="de">hungert</text>
+    <text locale="en">hungry</text>
+  </string>
+
   <string name="list_and">
     <text locale="de"> und </text>
     <text locale="en"> and </text>
diff --git a/src/gamecode/economy.c b/src/gamecode/economy.c
index 6668c3a21..859cdd079 100644
--- a/src/gamecode/economy.c
+++ b/src/gamecode/economy.c
@@ -1306,7 +1306,7 @@ void economics(region * r)
               ord = NULL;
             destroyed = true;
           }
-        } else if (kwd == K_GIVE || kwd == K_LIEFERE) {
+        } else if (kwd == K_GIVE) {
           give_cmd(u, ord);
         } else if (kwd == K_FORGET) {
           forget_cmd(u, ord);
diff --git a/src/kernel/order.c b/src/kernel/order.c
index 4457a5c6b..13cd7dc6d 100644
--- a/src/kernel/order.c
+++ b/src/kernel/order.c
@@ -260,10 +260,6 @@ static order *create_order_i(keyword_t kwd, const char *sptr, int persistent,
     case K_KOMMENTAR:
     case NOKEYWORD:
       return NULL;
-    case K_LIEFERE:
-      kwd = K_GIVE;
-      persistent = 1;
-      break;
     default:
       break;
     }
@@ -575,7 +571,6 @@ bool is_persistent(const order * ord)
     return false;
 
   case K_KOMMENTAR:
-  case K_LIEFERE:
     return true;
 
   default:
diff --git a/src/kernel/reports.c b/src/kernel/reports.c
index 86995cb2d..54cdbb011 100644
--- a/src/kernel/reports.c
+++ b/src/kernel/reports.c
@@ -620,10 +620,12 @@ bufunit(const faction * f, const unit * u, int indent, int mode, char *buf,
           WARN_STATIC_BUFFER();
       }
       if (fval(u, UFL_HUNGER)) {
-        if (c)
-          bytes = (int)strlcpy(bufp, ", hungert", size);
-        else
-          bytes = (int)strlcpy(bufp, "hungert", size);
+        if (c) {
+          bytes = (int)strlcpy(bufp, ", ", size);
+          if (wrptr(&bufp, &size, bytes) != 0)
+            WARN_STATIC_BUFFER();
+        }
+        bytes = (int)strlcpy(bufp, LOC(f->locale, "unit_hungers"), size);
         if (wrptr(&bufp, &size, bytes) != 0)
           WARN_STATIC_BUFFER();
       }
diff --git a/src/kernel/types.h b/src/kernel/types.h
index f6f1e4099..f023e435a 100644
--- a/src/kernel/types.h
+++ b/src/kernel/types.h
@@ -101,7 +101,6 @@ typedef enum {
   K_CONTACT,
   K_TEACH,
   K_STUDY,
-  K_LIEFERE,
   K_MAKE,
   K_MOVE,
   K_PASSWORD,