diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 3062a8ba4..85fbae3c3 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2785,7 +2785,7 @@ reports(void)
for (f = factions; f; f = f->next) {
int error = write_reports(f, ltime);
if (error) retval = error;
- if (!nosh && f->email && BAT) {
+ if (!nosh && f->email && strlen(f->email) && BAT) {
sprintf(buf, "%s/%s.sh", reportpath(), factionid(f));
shfp = fopen(buf, "w");
fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MailitPath());
@@ -2816,12 +2816,6 @@ reports(void)
} else if(f->options & REPORT_BZIP2) {
- if (f->age == 1) {
- fprintf(shfp,
- " \\\n\t\"text/plain\" \"Willkommen\" %s/%s/%s/welcome.txt",
- resourcepath(), global.welcomepath, locale_name(f->locale));
- }
-
fprintf(BAT, "bzip2 -9v `ls %d-%s.nr %d-%s.txt %d-%s.cr`\n",
turn, factionid(f),
turn, factionid(f),
@@ -2843,16 +2837,17 @@ reports(void)
fprintf(shfp,
" \\\n\t\"application/x-bzip2\" \"Computer-Report\" %d-%s.cr.bz2",
turn, factionid(f));
+
+ if (f->age == 1) {
+ fprintf(shfp,
+ " \\\n\t\"text/plain\" \"Willkommen\" %s/%s/%s/welcome.txt",
+ resourcepath(), global.welcomepath, locale_name(f->locale));
+ }
+
} else {
fprintf(shfp, MAIL " $addr \"%s %s\"", global.gamename, gamedate_short(f->locale));
- if (f->age == 1) {
- fprintf(shfp,
- " \\\n\t\"text/plain\" \"Willkommen\" %s/%s/%s/welcome.txt",
- resourcepath(), global.welcomepath, locale_name(f->locale));
- }
-
if (!nonr && f->options & REPORT_NR)
fprintf(shfp,
" \\\n\t\"text/plain\" \"Report\" %d-%s.nr",
@@ -2867,6 +2862,13 @@ reports(void)
fprintf(shfp,
" \\\n\t\"text/x-eressea-cr\" \"Computer-Report\" %d-%s.cr",
turn, factionid(f));
+
+ if (f->age == 1) {
+ fprintf(shfp,
+ " \\\n\t\"text/plain\" \"Willkommen\" %s/%s/%s/welcome.txt",
+ resourcepath(), global.welcomepath, locale_name(f->locale));
+ }
+
}
fprintf(BAT, ". %s.sh %s\n", factionid(f), f->email);
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index b227c22ed..170c4c34b 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -450,7 +450,7 @@
ein Drachenschiff
-
+
eine Trireme