Merge branch 'master' of gitorious.org:fg/fgdata

Nasal/local_weather/compat_layer.nas

@@ -119,6 +119,11 @@ print("* can disable global weather:      "~result);
 
 
 print("Compatibility layer: tests done.");
+
+# do actual startup()
+local_weather.updateMenu();
+local_weather.startup();
+
 });
 
 

Nasal/local_weather/local_weather.nas

@@ -4621,10 +4621,4 @@ var updateMenu = func {
 
 _setlistener("/nasal/local_weather/enabled", updateMenu);
 
-# wait for Nasal to be available and do what is in startup()
-
-_setlistener("/nasal/local_weather/loaded", func {
-	updateMenu();
-	startup();
-});
 

Translations/strings-default.xml

@@ -100,6 +100,7 @@
  <enable-ai-models-desc>Enable AI subsystem (required for multi-player, AI traffic and many other animations)</enable-ai-models-desc>
  <disable-ai-traffic-desc>Disable artificial traffic.</disable-ai-traffic-desc>
  <enable-ai-traffic-desc>Enable artificial traffic.</enable-ai-traffic-desc>
+ <disable-ai-scenarios>Disable all AI scenarios.</disable-ai-scenarios>
  <ai-scenario>Add and enable a new scenario. Multiple options are allowed.</ai-scenario>
  <disable-freeze-desc>Start in a running state</disable-freeze-desc>
  <enable-freeze-desc>Start in a frozen state</enable-freeze-desc>

options.xml

@@ -78,11 +78,11 @@
    </option>
 
    <option>
-       <name>fg-aircraft</name>
-       <arg>path</arg>
-       <description>strings/fg-aircraft-desc</description>
-       <brief/>
-      </option>
+    <name>fg-aircraft</name>
+    <arg>path</arg>
+    <description>strings/fg-aircraft-desc</description>
+    <brief/>
+   </option>
 
    <option>
     <name>language</name>
@@ -232,6 +232,11 @@
     <description>strings/enable-ai-traffic-desc</description>
    </option>
 
+   <option>
+    <name>disable-ai-scenarios</name>
+    <description>strings/disable-ai-scenarios</description>
+   </option>
+
    <option>
     <name>ai-scenario</name>
     <arg>scenario</arg>