http://eressea.upb.de/mantis/view.php?id=1334

"road anstatt straße im cr"

src/common/gamecode/creport.c

@@ -1116,9 +1116,9 @@ cr_borders(seen_region ** seen, const region * r, const faction * f, int seemode
         }
       }
       if (cs) {
-        const char * bname = b->type->__name; /* bug 1326 - I hate this */
+        const char * bname = b->type->name(b, r, f, 0); /* bug 1326 - I hate this */
         fprintf(F, "GRENZE %d\n", ++g);
-        fprintf(F, "\"%s\";typ\n", LOC(default_locale, bname));
+        fprintf(F, "\"%s\";typ\n", LOC(default_locale, mkname("border", bname)));
         fprintf(F, "%d;richtung\n", d);
         if (!b->type->transparent(b, f)) fputs("1;opaque\n", F);
         /* hack: */

src/common/gamecode/report.c

@@ -840,7 +840,7 @@ describe(FILE * F, const region * r, int partial, faction * f)
   const char *tname;
   struct edge {
     struct edge * next;
-    char * name;
+    const char * name;
     boolean transparent;
     boolean block;
     boolean exist[MAXDIRECTIONS];
@@ -868,10 +868,10 @@ describe(FILE * F, const region * r, int partial, faction * f)
         b = b->next;
         continue;
       }
-      while (e && (e->transparent != transparent || strcmp(name,e->name))) e = e->next;
+      while (e && (e->transparent != transparent || strcmp(name, e->name))) e = e->next;
       if (!e) {
         e = calloc(sizeof(struct edge), 1);
-        e->name = strdup(name);
+        e->name = name;
         e->transparent = transparent;
         e->next = edges;
         edges = e;
@@ -989,7 +989,7 @@ describe(FILE * F, const region * r, int partial, faction * f)
     bytes = (int)strlcpy(bufp, LOC(f->locale, resourcename(oldresourcetype[R_SILVER], rmoney(r)!=1)), size);
     if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER();
   }
-  /* Pferde */
+  /* horses */
 
   if (rhorses(r)) {
     bytes = snprintf(bufp, size, ", %d ", rhorses(r));
@@ -1152,7 +1152,7 @@ describe(FILE * F, const region * r, int partial, faction * f)
     if (!e->transparent) bytes = (int)strlcpy(bufp, " versperrt ", size);
     else bytes = (int)strlcpy(bufp, " befindet sich ", size);
     if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER();
-    bytes = (int)strlcpy(bufp, e->name, size);
+    bytes = (int)strlcpy(bufp, LOC(f->locale, mkname("border", e->name)), size);
     if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER();
     if (!e->transparent) bytes = (int)strlcpy(bufp, " die Sicht.", size);
     else bytes = (int)strlcpy(bufp, ".", size);
@@ -1163,7 +1163,6 @@ describe(FILE * F, const region * r, int partial, faction * f)
   if (edges) {
     while (edges) {
       e = edges->next;
-      free(edges->name);
       free(edges);
       edges = e;
     }

src/common/kernel/border.c

@@ -281,8 +281,8 @@ b_namewall(const border * b, const region * r, const struct faction * f, int gfl
   unused(f);
   unused(r);
   unused(b);
-	if (gflags & GF_ARTICLE) return "eine Wand";
-	return "Wand";
+  if (gflags & GF_ARTICLE) return "a_wall";
+  return "wall";
 }
 
 border_type bt_wall = {
@@ -319,8 +319,8 @@ b_namefogwall(const border * b, const region * r, const struct faction * f, int
   unused(f);
   unused(b);
   unused(r);
-	if (gflags & GF_ARTICLE) return "eine Nebelwand";
-	return "Nebelwand";
+  if (gflags & GF_ARTICLE) return "a_fogwall";
+  return "fogwall";
 }
 
 static boolean
@@ -349,12 +349,11 @@ border_type bt_fogwall = {
 static const char *
 b_nameillusionwall(const border * b, const region * r, const struct faction * f, int gflags)
 {
-	/* TODO: UNICODE: f->locale bestimmt die Sprache */
   int fno = b->data.i;
   unused(b);
   unused(r);
-	if (gflags & GF_ARTICLE) return (f && fno==f->subscription)?"eine Illusionswand":"eine Wand";
-	return (f && fno==f->no)?"Illusionswand":"Wand";
+  if (gflags & GF_ARTICLE) return (f && fno==f->subscription)?"an_illusionwall":"a_wall";
+  return (f && fno==f->no)?"illusionwall":"wall";
 }
 
 border_type bt_illusionwall = {
@@ -383,22 +382,21 @@ boolean b_blockquestportal(const border * b, const unit * u, const region * r) {
 static const char *
 b_namequestportal(const border * b, const region * r, const struct faction * f, int gflags)
 {
-	/* TODO: UNICODE: f->locale bestimmt die Sprache */
   int lock = b->data.i;
   unused(b);
   unused(r);
 
   if (gflags & GF_ARTICLE) {
     if(lock > 0) {
-			return "ein gewaltiges verschlossenes Tor";
+      return "a_gate_locked";
     } else {
-			return "ein gewaltiges offenes Tor";
+      return "a_gate_open";
     }
   } else {
     if(lock > 0) {
-			return "gewaltiges verschlossenes Tor";
+      return "gate_locked";
     } else {
-			return "gewaltiges offenes Tor";
+      return "gate_open";
     }
   }
 }
@@ -430,25 +428,25 @@ b_nameroad(const border * b, const region * r, const struct faction * f, int gfl
 
   unused(f);
   if (gflags & GF_ARTICLE) {
-    if (!(gflags & GF_DETAILED)) return LOC(f->locale, "nr_a_road");
+    if (!(gflags & GF_DETAILED)) return "a_road";
     else if (r->terrain->max_road<=local) {
       int remote = (r2==b->from)?b->data.sa[0]:b->data.sa[1];
       if (r2->terrain->max_road<=remote) {
-        return LOC(f->locale, "nr_a_road");
+        return "a_road";
       } else {
-        return LOC(f->locale, "nr_an_incomplete_road");
+        return "an_incomplete_road";
       }
     } else {
       int percent = max(1, 100*local/r->terrain->max_road);
       if (local) {
-        snprintf(buffer, sizeof(buffer), LOC(f->locale, "nr_road_percent"), percent);
+        snprintf(buffer, sizeof(buffer), "a_road_percent", percent);
       } else {
-        return LOC(f->locale, "nr_a_road_connection");
+        return "a_road_connection";
       }
     }
   }
-  else if (gflags & GF_PLURAL) return LOC(f->locale, "nr_roads");
-  else return LOC(f->locale, "nr_road");
+  else if (gflags & GF_PLURAL) return "roads";
+  else return "road";
   return buffer;
 }
 

src/common/modules/arena.c

@@ -312,7 +312,7 @@ guardian_faction(plane * pl, int id)
 
   if (!f) {
     f = calloc(1, sizeof(faction));
-		f->banner = strdup("Sie dienen dem großen Wyrm");
+    f->banner = strdup("Sie dienen dem grossen Wyrm");
     f->passw = strdup(itoa36(rng_int()));
     f->override = strdup(itoa36(rng_int()));
     set_email(&f->email, "igjarjuk@eressea.de");

src/common/spells/spells.c

@@ -545,7 +545,7 @@ sp_summon_familiar(castorder *co)
   int dh, dh1, bytes;
   direction_t d;
   message * msg;
-  char zText[NAMESIZE], * bufp = zText;
+  char zText[1024], * bufp = zText;
   size_t size = sizeof(zText) - 1;
 
   if (get_familiar(mage) != NULL ) {
@@ -2808,15 +2808,15 @@ resolve_buddy(variant data)
 
 
 static const char *
-fire_name(const border * b, const region * r, const faction * f, int gflags)
+b_namefirewall(const border * b, const region * r, const faction * f, int gflags)
 {
   unused(f);
   unused(r);
   unused(b);
   if (gflags & GF_ARTICLE)
-    return "eine Feuerwand";
+    return "a_firewall";
   else
-    return "Feuerwand";
+    return "firewall";
 }
 
 static void
@@ -2881,7 +2881,7 @@ border_type bt_firewall = {
   wall_read, /* read */
   wall_write, /* write */
   b_blocknone, /* block */
-  fire_name, /* name */
+  b_namefirewall, /* name */
   b_rvisible, /* rvisible */
   b_finvisible, /* fvisible */
   b_uinvisible, /* uvisible */
@@ -2955,15 +2955,15 @@ sp_firewall(castorder *co)
 /* ------------------------------------------------------------- */
 
 static const char *
-wisps_name(const border * b, const region * r, const faction * f, int gflags)
+b_namewisps(const border * b, const region * r, const faction * f, int gflags)
 {
   unused(f);
   unused(r);
   unused(b);
   if (gflags & GF_ARTICLE)
-    return "eine Gruppe von Irrlichtern";
+    return "a_wisps";
   else
-    return "Irrlichter";
+    return "wisps";
 }
 
 typedef struct wisps_data {
@@ -3009,7 +3009,7 @@ border_type bt_wisps = {
   wall_read, /* read */
   wall_write, /* write */
   b_blocknone, /* block */
-  wisps_name, /* name */
+  b_namewisps, /* name */
   b_rvisible, /* rvisible */
   b_fvisible, /* fvisible */
   b_uvisible, /* uvisible */

src/res/de/strings.xml

@@ -19,6 +19,7 @@
     <text locale="de">Wabernde grüne Schwaden treiben durch den Nebel und
     verdichten sich zu einer unheimlichen Kreatur, die nur aus einem langen
     Ruderschwanz und einem riesigen runden Maul zu bestehen scheint.</text>
+    <text locale="en">Wobbling green vapours drift through the mists to form an eldritch creature that seems to be entirely made up of huge jaws and a long tail.</text>
   </string>
   <namespace name="raceinfo">
     <string name="no_info">
@@ -7442,41 +7443,114 @@
     <text locale="en">Owner</text>
   </string>
 
-  <string name="nr_a_road">
+  <namespace name="border">
+    <string name="a_road">
       <text locale="de">eine Straße</text>
       <text locale="en">a road</text>
     </string>
 
-  <string name="nr_roads">
+    <string name="roads">
       <text locale="de">Straßen</text>
       <text locale="en">roads</text>
     </string>
 
-  <string name="nr_road">
+    <string name="road">
       <text locale="de">Straße</text>
       <text locale="en">road</text>
     </string>
 
-  <string name="nr_road_percent">
+    <string name="a_road_percent">
       <text locale="de">eine zu %d%% vollendete Straße</text>
       <text locale="en">a road that is %d%% complete</text>
     </string>
 
-  <string name="nr_a_road_connection">
+    <string name="a_road_connection">
       <text locale="de">ein Straßenanschluß</text>
       <text locale="en">a connection to another road</text>
     </string>
 
+    <string name="an_incomplete_road">
+      <text locale="de">eine unvollständige Straße</text>
+      <text locale="en">an incomplete road</text>
+    </string>
+
+    <string name="wall">
+      <text locale="de">Wand</text>
+      <text locale="en">wall</text>
+    </string>
+
+    <string name="a_wall">
+      <text locale="de">eine Wand</text>
+      <text locale="en">a wall</text>
+    </string>
+
+    <string name="firewall">
+      <text locale="de">Feuerwand</text>
+      <text locale="en">firewall</text>
+    </string>
+
+    <string name="a_firewall">
+      <text locale="de">eine Feuerwand</text>
+      <text locale="en">a firewall</text>
+    </string>
+
+    <string name="fogwall">
+      <text locale="de">Nebelwand</text>
+      <text locale="en">wall of fog</text>
+    </string>
+
+    <string name="a_fogwall">
+      <text locale="de">eine Nebelwand</text>
+      <text locale="en">a wall of fog</text>
+    </string>
+
+    <string name="wisps">
+      <text locale="de">Irrlichter</text>
+      <text locale="en">wisps</text>
+    </string>
+
+    <string name="a_wisps">
+      <text locale="de">eine Gruppe von Irrlichtern</text>
+      <text locale="en">a cloud of wisps</text>
+    </string>
+
+    <string name="gate_open">
+      <text locale="de">gewaltiges offenes Tor</text>
+      <text locale="en">massive open door</text>
+    </string>
+
+    <string name="a_gate_open">
+      <text locale="de">ein gewaltiges offenes Tor</text>
+      <text locale="en">a massive open door</text>
+    </string>
+
+    <string name="gate_closed">
+      <text locale="de">gewaltiges geschlossenes Tor</text>
+      <text locale="en">massive locked door</text>
+    </string>
+
+    <string name="a_gate_closed">
+      <text locale="de">ein gewaltiges geschlossenes Tor</text>
+      <text locale="en">a massive locked door</text>
+    </string>
+
+    <string name="illusionwall">
+      <text locale="de">Illusionswand</text>
+      <text locale="en">illusionary wall</text>
+    </string>
+
+    <string name="an_illusionwall">
+      <text locale="de">eine Illusionswand</text>
+      <text locale="en">an illusionary wall</text>
+    </string>
+
+  </namespace>
+
   <string name="nr_reduced_production">
     <text locale="de">Die Region ist verwüstet, der Boden karg.</text>
     <text locale="en">The region is ravaged, the ground infertile.</text>
   </string>
 
-  <string name="nr_an_incomplete_road">
-    <text locale="de">eine unvollständige Straße</text>
-    <text locale="en">an incomplete road</text>
-  </string>
-
   <string name="par_unit">
     <text locale="de">Einheit-Nr</text>
     <text locale="en">unitid</text>