Merge remote-tracking branch 'upstream/develop'

res/core/de/strings.xml

@@ -21,6 +21,12 @@
     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="shipinfo">
+    <string name="no_info">
+      <text locale="de">Keine Informationen über diesen Schiffstyp verfügbar.</text>
+      <text locale="en">No Information available for this type of ship.</text>
+    </string>
+  </namespace>
   <namespace name="raceinfo">
     <string name="no_info">
       <text locale="de">Keine Informationen über diese Rasse verfügbar.</text>
@@ -62,6 +68,10 @@
     </string>
   </namespace>
   <namespace name="iteminfo">
+    <string name="no_info">
+      <text locale="de">Keine Informationen.</text>
+      <text locale="en">No Information available.</text>
+    </string>
     <string name="trollspoil">
       <text locale="de">Das Horn eines Trolles. Kein Troll würde sich lebend davon trennen.</text>
       <text locale="en">The horn of an adult troll. No troll would ever part with this while he's alive.</text>
@@ -5181,14 +5191,6 @@
       powerful
       spells he will need some luck for a successful analysis.</text>
     </string>
-    <string name="concealing_aura">
-      <text locale="de">Dieser Zauber wird die gesamte Ausrüstung der
-      Zieleinheit für
-      einige Zeit vor den Blicken anderer verschleiern. </text>
-      <text locale="en">This spell will hide the whole equipment of a target
-      unit from the
-      looks of others.</text>
-    </string>
     <string name="tybiedfumbleshield">
       <text locale="de">Dieser Zauber legt ein antimagisches Feld um die Magier der Feinde
          und behindert ihre Zauber erheblich. Nur wenige werden die Kraft

res/core/messages.xml

@@ -2899,9 +2899,10 @@
     <type>
       <arg name="unit" type="unit"/>
       <arg name="region" type="region"/>
+      <arg name="terrain" type="string"/>
     </type>
-    <text locale="de">"$unit($unit) entdeckt, dass $region($region) $terrain($region) ist."</text>
+    <text locale="de">"$unit($unit) entdeckt, dass $region($region) $localize($terrain) ist."</text>
-    <text locale="en">"$unit($unit) discovered that $region($region) is $terrain($region)."</text>
+    <text locale="en">"$unit($unit) discovered that $region($region) is $localize($terrain)."</text>
   </message>
   <message name="leftship" section="movement">
     <type>

res/eressea/strings.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <strings>
   <namespace name="spellinfo">
+    <string name="concealing_aura">
+      <text locale="de">Dieser Zauber wird die gesamte Ausrüstung der
+      Zieleinheit für
+      einige Zeit vor den Blicken anderer verschleiern. </text>
+      <text locale="en">This spell will hide the whole equipment of a target
+      unit from the
+      looks of others.</text>
+    </string>
   <string name="headache">
       <text locale="de">
       Aufzeichung des Vortrags von Selen Ard'Ragorn in Bar'Glingal: 
@@ -95,10 +103,6 @@
   </namespace>
   <namespace name="shipinfo">
     <!-- ship info is not implemented! -->
-    <string name="no_info">
-      <text locale="de">Keine Informationen über diesen Schiffstyp verfügbar.</text>
-      <text locale="en">No Information available for this type of ship.</text>
-    </string>
     <string name="balloon">
       <text locale="de">Der Sumpfgasballon besteht aus einem großen 
         Weidenkorb, welcher Platz
@@ -120,10 +124,6 @@
       <text locale="de">Eine Geburtstagstorte mit 10 Kerzen. Herzlichen Glückwunsch, Eressea!</text>
       <text locale="en">A birthday cake with 10 candles. Happy Birthday, Eressea!</text>
     </string>
-    <string name="no_info">
-      <text locale="de">Keine Informationen.</text>
-      <text locale="en">No Information available.</text>
-    </string>
     <string name="griphonwing">
       <text locale="de">Dieses Fluggerät aus der Schmiede der Zwerge von Celeband galt wie die
         'Ebene der Herausforderung' seit Urzeiten als verschollen, ja man

scripts/eressea/autoseed.lua

@@ -88,7 +88,7 @@ function autoseed.init()
             end
             local dupe = get_faction_by_email(p.email)
             if dupe then
-                eressea.log.warning("seed: duplicate email " .. p.email .. " already used by faction " .. tostring(dupe))
+                eressea.log.warning("seed: duplicate email " .. p.email .. " already used by " .. tostring(dupe))
             else
                 local f = seed(start, p.email, p.race or "human", p.lang or "de")
                 num_seeded = num_seeded + 1

scripts/newplayer.lua

@@ -72,7 +72,7 @@ for _, p in ipairs(players) do
     local dupe = false
     for f in factions() do
         if f.email==p.email then
-            print("seed: duplicate email " .. p.email .. " already used by faction " .. tostring(f))
+            print("seed: duplicate email " .. p.email .. " already used by " .. tostring(f))
             dupe = true
             break
         end

src/kernel/save.c

@@ -712,11 +712,11 @@ unit *read_unit(struct gamedata *data)
                         ord = NULL;
                     }
                     else if (p == MAXPERSISTENT) {
-                        log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
+                        log_info("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
                     }
                 }
                 else if (n == MAXORDERS) {
-                    log_warning("%s had %d or more orders\n", unitname(u), MAXORDERS);
+                    log_info("%s had %d or more orders\n", unitname(u), MAXORDERS);
                 }
                 if (ord != NULL)
                     free_order(ord);
@@ -779,7 +779,7 @@ void write_unit(struct gamedata *data, const unit * u)
             writeorder(data, ord, u->faction->locale);
         }
         else {
-            log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
+            log_info("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
             break;
         }
     }
@@ -792,7 +792,7 @@ void write_unit(struct gamedata *data, const unit * u)
                 writeorder(data, ord, u->faction->locale);
             }
             else {
-                log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
+                log_info("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
                 break;
             }
         }

src/move.c

@@ -1592,13 +1592,13 @@ static const region_list *travel_route(unit * u,
                 else if ((u_race(u)->flags & RCF_WALK) == 0) {
                     /* Spezialeinheiten, die nicht laufen können. */
                     ADDMSG(&u->faction->msgs, msg_message("detectocean",
-                        "unit region", u, next));
+                        "unit region terrain", u, next, terrain_name(next)));
                     break;
                 }
                 else if (landing) {
                     /* wir sind diese woche angelandet */
                     ADDMSG(&u->faction->msgs, msg_message("detectocean",
-                        "unit region", u, next));
+                        "unit region terrain", u, next, terrain_name(next)));
                     break;
                 }
             }
@@ -1607,7 +1607,7 @@ static const region_list *travel_route(unit * u,
                  * Pferde betreten werden. */
                 if (!(canswim(u) || canfly(u))) {
                     ADDMSG(&u->faction->msgs, msg_message("detectocean",
-                        "unit region", u, next));
+                        "unit region terrain", u, next, terrain_name(next)));
                     break;
                 }
             }