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

Conflicts:
	Aircraft/victor/victor-set.xml

Aircraft/c172p/Models/c172p.xml

@@ -1853,7 +1853,6 @@
  <!-- Airframe -->
 
  <animation>
-
    <type>select</type>
    <object-name>Propeller</object-name>
    <condition>
@@ -1862,26 +1861,6 @@
        <value>500</value>
      </less-than>
    </condition>
-
- </animation>
-
- <animation>
-
-   <type>select</type>
-   <object-name>Propeller.Slow</object-name>
-   <condition>
-     <and>
-       <greater-than>
-         <property>engines/engine[0]/rpm</property>
-         <value>400</value>
-       </greater-than>
-       <less-than>
-         <property>engines/engine[0]/rpm</property>
-         <value>1200</value>
-       </less-than>
-     </and>
-   </condition>
-
  </animation>
 
  <animation>
@@ -1890,11 +1869,20 @@
   <condition>
    <greater-than>
     <property>engines/engine[0]/rpm</property>
-       <value>1200</value>
+    <value>400</value>
    </greater-than>
   </condition>
  </animation>
 
+ <animation>
+   <type>blend</type>
+   <object-name>Propeller.Fast</object-name>
+   <property>engines/engine[0]/rpm</property>
+   <factor>0.0004</factor>
+   <max>1.0</max>
+   <min>0.0</min>
+ </animation>
+
  <animation>
    <type>select</type>
    <object-name>navlight_left</object-name>

Translations/strings-default.xml

@@ -75,8 +75,9 @@
  <verbose-desc>Show all command line options when combined with --help or -h</verbose-desc>
  <version-desc>Display the current FlightGear version</version-desc>
  <fg-root-desc>Specify the root data path</fg-root-desc>
- <fg-scenery-desc n="0">Specify the base scenery path;</fg-scenery-desc>
+ <fg-scenery-desc n="0">Specify the scenery path(s);</fg-scenery-desc>
  <fg-scenery-desc n="1">Defaults to $FG_ROOT/Scenery</fg-scenery-desc>
+ <fg-aircraft-desc>Specify additional aircraft directory path(s)</fg-aircraft-desc>
  <language-desc>Select the language for this session</language-desc>
  <disable-game-mode-desc>Disable full-screen game mode</disable-game-mode-desc>
  <enable-game-mode-desc>Enable full-screen game mode</enable-game-mode-desc>

options.xml

@@ -77,6 +77,13 @@
     <brief/>
    </option>
 
+   <option>
+       <name>fg-aircraft</name>
+       <arg>path</arg>
+       <description>strings/fg-aircraft-desc</description>
+       <brief/>
+      </option>
+
    <option>
     <name>language</name>
     <arg>code</arg>
@@ -537,11 +544,12 @@
     <description>strings/disable-auto-coordination-desc</description>
    </option>
 
+<!--
    <option>
     <name>aircraft-dir</name>
     <arg>path</arg>
     <description>strings/aircraft-dir-desc</description>
-   </option>
+   </option> -->
 
    <option>
      <name>livery</name>