move study.h where it belongs

tutorial gets a "defaultorder" string

src/common/gamecode/study.c

@@ -264,7 +264,7 @@ teach(unit * u, struct order * ord)
     teaching -= i * 30;
     change_effect(u, oldpotiontype[P_FOOL], -i);
     j = teaching / 30;
-    add_message(&u->faction->msgs, msg_message("teachdumb",
+    ADDMSG(&u->faction->msgs, msg_message("teachdumb",
       "teacher amount", u, j));
   }
   if (teaching == 0) return;
@@ -385,7 +385,7 @@ teach(unit * u, struct order * ord)
       strcat(zOrder, unitid(u2));
 
       if (get_keyword(u2->thisorder) != K_STUDY) {
-        add_message(&u->faction->msgs,
+        ADDMSG(&u->faction->msgs,
           msg_feedback(u, ord, "teach_nolearn", "student", u2));
         continue;
       }
@@ -398,14 +398,14 @@ teach(unit * u, struct order * ord)
       parser_popstate();
 
       if (sk == NOSKILL) {
-        add_message(&u->faction->msgs,
+        ADDMSG(&u->faction->msgs,
           msg_feedback(u, ord, "teach_nolearn", "student", u2));
         continue;
       }
 
       /* u is teacher, u2 is student */
       if (eff_skill_study(u2, sk, r) > eff_skill_study(u, sk, r)-TEACHDIFFERENCE) {
-        add_message(&u->faction->msgs,
+        ADDMSG(&u->faction->msgs,
           msg_feedback(u, ord, "teach_asgood", "student", u2));
         continue;
       }
@@ -632,7 +632,7 @@ learn(void)
         }
         if (money>0) {
           use_pooled(u, oldresourcetype[R_SILVER], GET_DEFAULT, money);
-          add_message(&u->faction->msgs, msg_message("studycost",
+          ADDMSG(&u->faction->msgs, msg_message("studycost",
             "unit region cost skill", u, u->region, money, sk));
         }
 
@@ -700,9 +700,9 @@ learn(void)
             while (teach->teachers[index] && index!=MAXTEACHERS) {
               unit * teacher = teach->teachers[index++];
               if (teacher->faction != u->faction) {
-                add_message(&u->faction->msgs, msg_message("teach_student",
+                ADDMSG(&u->faction->msgs, msg_message("teach_student",
                   "teacher student skill", teacher, u, sk));
-                add_message(&teacher->faction->msgs, msg_message("teach_teacher",
+                ADDMSG(&teacher->faction->msgs, msg_message("teach_teacher",
                   "teacher student skill level", teacher, u, sk,
                   effskill(u, sk)));
               }

src/res/eressea/en/strings.xml

@@ -6,6 +6,6 @@
   		<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
 	</string>
 	<string name="defaultorder">
-		<text locale="en">WORK</text>
+		<text locale="en">WORKWORK</text>
 	</string>
 </strings>

src/res/tutorial.xml

@@ -77,4 +77,12 @@
       <text locale="en">ERESSEA ORDERS</text>
     </string>
   </strings>
+
+  <string name="defaultorder">
+    <text locale="de">ARBEITE</text>
+  </string>
+  <string name="defaultorder">
+    <text locale="en">WORK</text>
+  </string>
+
 </eressea>