diff --git a/res/e3a/strings.xml b/res/e3a/strings.xml index 11208a146..d0647a6d1 100644 --- a/res/e3a/strings.xml +++ b/res/e3a/strings.xml @@ -206,7 +206,18 @@ - + + + Dieser Zauber wird die gesamte Ausrüstung der + Zieleinheit für + einige Zeit vor den Blicken anderer verschleiern. Der + Zauber + schützt nicht vor Dieben und Spionen. + This spell will hide the whole equipment of a target + unit from the + looks of others. It will not protect against thieves or + spies. + Durch dieses uralte Tanzritual ruft der Zauberkundige die Kräfte des Lebens und der Fruchtbarkeit an. Die darauf folgenden diff --git a/res/eressea/strings.xml b/res/eressea/strings.xml index 357d5d83d..551551ae7 100644 --- a/res/eressea/strings.xml +++ b/res/eressea/strings.xml @@ -1,17 +1,6 @@ - - Dieser Zauber wird die gesamte Ausrüstung der - Zieleinheit für - einige Zeit vor den Blicken anderer verschleiern. Der - Zauber - schützt nicht vor Dieben und Spionen. - This spell will hide the whole equipment of a target - unit from the - looks of others. It will not protect against thieves or - spies. - Aufzeichung des Vortrags von Selen Ard'Ragorn in Bar'Glingal: diff --git a/src/report.c b/src/report.c index 98740aef2..0b591b5ed 100644 --- a/src/report.c +++ b/src/report.c @@ -1374,41 +1374,27 @@ static void durchreisende(stream *out, const region * r, const faction * f) if (cansee_durchgezogen(f, r, u, 0)) { ++counter; if (u->ship != NULL) { -#ifdef GERMAN_FLUFF_ENABLED - if (strcmp("de", f->locale->name)==0) { - if (counter == 1) { - bytes = (int)strlcpy(bufp, "Die ", size); - } - else { - bytes = (int)strlcpy(bufp, "die ", size); - } - if (wrptr(&bufp, &size, bytes) != 0) { - WARN_STATIC_BUFFER(); - break; - } - } -#endif bytes = (int)strlcpy(bufp, shipname(u->ship), size); } else { bytes = (int)strlcpy(bufp, unitname(u), size); } if (wrptr(&bufp, &size, bytes) != 0) { - WARN_STATIC_BUFFER(); + INFO_STATIC_BUFFER(); break; } if (counter + 1 < maxtravel) { bytes = (int)strlcpy(bufp, ", ", size); if (wrptr(&bufp, &size, bytes) != 0) { - WARN_STATIC_BUFFER(); + INFO_STATIC_BUFFER(); break; } } else if (counter + 1 == maxtravel) { bytes = (int)strlcpy(bufp, LOC(f->locale, "list_and"), size); if (wrptr(&bufp, &size, bytes) != 0) { - WARN_STATIC_BUFFER(); + INFO_STATIC_BUFFER(); break; } } diff --git a/src/study.h b/src/study.h index 88a6daa5b..d5d664fd2 100644 --- a/src/study.h +++ b/src/study.h @@ -32,7 +32,7 @@ extern "C" { extern bool is_migrant(struct unit *u); extern int study_cost(struct unit *u, skill_t talent); -#define MAXTEACHERS 8 +#define MAXTEACHERS 16 typedef struct teaching_info { struct unit *teachers[MAXTEACHERS]; int value; diff --git a/src/util/bsdstring.h b/src/util/bsdstring.h index 200ca30a6..883e102e6 100644 --- a/src/util/bsdstring.h +++ b/src/util/bsdstring.h @@ -17,5 +17,6 @@ extern size_t slprintf(char * dst, size_t size, const char * format, ...); #endif #define WARN_STATIC_BUFFER() log_warning("static buffer too small in %s:%d\n", __FILE__, __LINE__) +#define INFO_STATIC_BUFFER() log_info("static buffer too small in %s:%d\n", __FILE__, __LINE__) #endif