Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove DELIVER 

translate hunger in the NR
This commit is contained in:
Enno Rehling 2012-07-08 11:37:19 -07:00
parent 0a756efba9
commit d4bd2bc7f7
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/de/strings.xml
View File

@ -2200,9 +2200,6 @@
<string name="LERNEN"> <string name="LERNEN">
<text locale="de">LERNEN</text> <text locale="de">LERNEN</text>
</string> </string>
<string name="LIEFERE">
<text locale="de">LIEFERE</text>
</string>
<string name="MACHEN"> <string name="MACHEN">
<text locale="de">MACHEN</text> <text locale="de">MACHEN</text>
</string> </string>
@ -6980,6 +6977,11 @@
<text locale="en">guards the region</text> <text locale="en">guards the region</text>
</string> </string>
<string name="unit_hungers">
<text locale="de">hungert</text>
<text locale="en">hungry</text>
</string>
<string name="list_and"> <string name="list_and">
<text locale="de"> und </text> <text locale="de"> und </text>
<text locale="en"> and </text> <text locale="en"> and </text>

2
src/gamecode/economy.c
View File

@ -1306,7 +1306,7 @@ void economics(region * r)
ord = NULL; ord = NULL;
destroyed = true; destroyed = true;
} }
} else if (kwd == K_GIVE || kwd == K_LIEFERE) { } else if (kwd == K_GIVE) {
give_cmd(u, ord); give_cmd(u, ord);
} else if (kwd == K_FORGET) { } else if (kwd == K_FORGET) {
forget_cmd(u, ord); forget_cmd(u, ord);

5
src/kernel/order.c
View File

@ -260,10 +260,6 @@ static order *create_order_i(keyword_t kwd, const char *sptr, int persistent,
case K_KOMMENTAR: case K_KOMMENTAR:
case NOKEYWORD: case NOKEYWORD:
return NULL; return NULL;
case K_LIEFERE:
kwd = K_GIVE;
persistent = 1;
break;
default: default:
break; break;
} }
@ -575,7 +571,6 @@ bool is_persistent(const order * ord)
return false; return false;
case K_KOMMENTAR: case K_KOMMENTAR:
case K_LIEFERE:
return true; return true;
default: default:

10
src/kernel/reports.c
View File

@ -620,10 +620,12 @@ bufunit(const faction * f, const unit * u, int indent, int mode, char *buf,
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
} }
if (fval(u, UFL_HUNGER)) { if (fval(u, UFL_HUNGER)) {
if (c) if (c) {
bytes = (int)strlcpy(bufp, ", hungert", size); bytes = (int)strlcpy(bufp, ", ", size);
else if (wrptr(&bufp, &size, bytes) != 0)
bytes = (int)strlcpy(bufp, "hungert", size); WARN_STATIC_BUFFER();
}
bytes = (int)strlcpy(bufp, LOC(f->locale, "unit_hungers"), size);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
} }

1
src/kernel/types.h
View File

@ -101,7 +101,6 @@ typedef enum {
K_CONTACT, K_CONTACT,
K_TEACH, K_TEACH,
K_STUDY, K_STUDY,
K_LIEFERE,
K_MAKE, K_MAKE,
K_MOVE, K_MOVE,
K_PASSWORD, K_PASSWORD,