diff --git a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png
index 556c3d3be..317ad4195 100644
Binary files a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png and b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png differ
diff --git a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png
index 149e429b8..e999b496e 100644
Binary files a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png and b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png differ
diff --git a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png
index 3f47133ac..3d83d4af8 100644
Binary files a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png and b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png differ
diff --git a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png
index 65a408c45..7a9600843 100644
Binary files a/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png and b/Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png differ
diff --git a/Aircraft/c172p/Instruments/kr87-adf/kr87.xml b/Aircraft/c172p/Instruments/kr87-adf/kr87.xml
index d9a4311a6..811eb9229 100644
--- a/Aircraft/c172p/Instruments/kr87-adf/kr87.xml
+++ b/Aircraft/c172p/Instruments/kr87-adf/kr87.xml
@@ -11,8 +11,7 @@
<type>select</type>
<object-name>indicator</object-name>
<condition>
- <property>/instrumentation/adf[0]/serviceable</property>
- <property>/instrumentation/adf[0]/power-btn</property>
+ <property>/instrumentation/adf[0]/operable</property>
</condition>
</animation>
<animation>
diff --git a/Aircraft/c172p/Models/Pedals/pedals.xml b/Aircraft/c172p/Models/Pedals/pedals.xml
old mode 100755
new mode 100644
diff --git a/Aircraft/c172p/Models/Yoke/yoke.xml b/Aircraft/c172p/Models/Yoke/yoke.xml
old mode 100755
new mode 100644
diff --git a/Aircraft/c172p/Nasal/c172-electrical.nas b/Aircraft/c172p/Nasal/c172-electrical.nas
index 29c6c39ac..492773a1d 100644
--- a/Aircraft/c172p/Nasal/c172-electrical.nas
+++ b/Aircraft/c172p/Nasal/c172-electrical.nas
@@ -9,23 +9,22 @@
# Initialize internal values
#
-battery = nil;
-alternator = nil;
+var battery = nil;
+var alternator = nil;
-last_time = 0.0;
+var last_time = 0.0;
-vbus_volts = 0.0;
-ebus1_volts = 0.0;
-ebus2_volts = 0.0;
+var vbus_volts = 0.0;
+var ebus1_volts = 0.0;
+var ebus2_volts = 0.0;
-ammeter_ave = 0.0;
+var ammeter_ave = 0.0;
##
# Initialize the electrical system
#
init_electrical = func {
- print("Initializing Nasal Electrical System");
battery = BatteryClass.new();
alternator = AlternatorClass.new();
@@ -35,8 +34,9 @@ init_electrical = func {
setprop("/controls/switches/master-avionics", 1);
setprop("/systems/electrical/outputs/autopilot",0.0);
- # Request that the update fuction be called next frame
+ # Request that the update function be called next frame
settimer(update_electrical, 0);
+ print("Electrical system initialized");
}
@@ -47,12 +47,12 @@ init_electrical = func {
BatteryClass = {};
BatteryClass.new = func {
- obj = { parents : [BatteryClass],
- ideal_volts : 24.0,
- ideal_amps : 30.0,
- amp_hours : 12.75,
- charge_percent : 1.0,
- charge_amps : 7.0 };
+ var obj = { parents : [BatteryClass],
+ ideal_volts : 24.0,
+ ideal_amps : 30.0,
+ amp_hours : 12.75,
+ charge_percent : 1.0,
+ charge_amps : 7.0 };
return obj;
}
@@ -62,8 +62,8 @@ BatteryClass.new = func {
#
BatteryClass.apply_load = func( amps, dt ) {
- amphrs_used = amps * dt / 3600.0;
- percent_used = amphrs_used / me.amp_hours;
+ var amphrs_used = amps * dt / 3600.0;
+ var percent_used = amphrs_used / me.amp_hours;
me.charge_percent -= percent_used;
if ( me.charge_percent < 0.0 ) {
me.charge_percent = 0.0;
@@ -76,13 +76,13 @@ BatteryClass.apply_load = func( amps, dt ) {
##
# Return output volts based on percent charged. Currently based on a simple
-# polynomal percent charge vs. volts function.
+# polynomial percent charge vs. volts function.
#
BatteryClass.get_output_volts = func {
- x = 1.0 - me.charge_percent;
- tmp = -(3.0 * x - 1.0);
- factor = (tmp*tmp*tmp*tmp*tmp + 32) / 32;
+ var x = 1.0 - me.charge_percent;
+ var tmp = -(3.0 * x - 1.0);
+ var factor = (tmp*tmp*tmp*tmp*tmp + 32) / 32;
return me.ideal_volts * factor;
}
@@ -95,9 +95,9 @@ BatteryClass.get_output_volts = func {
#
BatteryClass.get_output_amps = func {
- x = 1.0 - me.charge_percent;
- tmp = -(3.0 * x - 1.0);
- factor = (tmp*tmp*tmp*tmp*tmp + 32) / 32;
+ var x = 1.0 - me.charge_percent;
+ var tmp = -(3.0 * x - 1.0);
+ var factor = (tmp*tmp*tmp*tmp*tmp + 32) / 32;
return me.ideal_amps * factor;
}
@@ -109,11 +109,11 @@ BatteryClass.get_output_amps = func {
AlternatorClass = {};
AlternatorClass.new = func {
- obj = { parents : [AlternatorClass],
- rpm_source : "/engines/engine[0]/rpm",
- rpm_threshold : 800.0,
- ideal_volts : 28.0,
- ideal_amps : 60.0 };
+ var obj = { parents : [AlternatorClass],
+ rpm_source : "/engines/engine[0]/rpm",
+ rpm_threshold : 800.0,
+ ideal_volts : 28.0,
+ ideal_amps : 60.0 };
setprop( obj.rpm_source, 0.0 );
return obj;
}
@@ -126,13 +126,13 @@ AlternatorClass.apply_load = func( amps, dt ) {
# Scale alternator output for rpms < 800. For rpms >= 800
# give full output. This is just a WAG, and probably not how
# it really works but I'm keeping things "simple" to start.
- rpm = getprop( me.rpm_source );
- factor = rpm / me.rpm_threshold;
+ var rpm = getprop( me.rpm_source );
+ var factor = rpm / me.rpm_threshold;
if ( factor > 1.0 ) {
factor = 1.0;
}
# print( "alternator amps = ", me.ideal_amps * factor );
- available_amps = me.ideal_amps * factor;
+ var available_amps = me.ideal_amps * factor;
return available_amps - amps;
}
@@ -144,8 +144,8 @@ AlternatorClass.get_output_volts = func {
# scale alternator output for rpms < 800. For rpms >= 800
# give full output. This is just a WAG, and probably not how
# it really works but I'm keeping things "simple" to start.
- rpm = getprop( me.rpm_source );
- factor = rpm / me.rpm_threshold;
+ var rpm = getprop( me.rpm_source );
+ var factor = rpm / me.rpm_threshold;
if ( factor > 1.0 ) {
factor = 1.0;
}
@@ -162,8 +162,8 @@ AlternatorClass.get_output_amps = func {
# scale alternator output for rpms < 800. For rpms >= 800
# give full output. This is just a WAG, and probably not how
# it really works but I'm keeping things "simple" to start.
- rpm = getprop( me.rpm_source );
- factor = rpm / me.rpm_threshold;
+ var rpm = getprop( me.rpm_source );
+ var factor = rpm / me.rpm_threshold;
if ( factor > 1.0 ) {
factor = 1.0;
}
@@ -177,13 +177,13 @@ AlternatorClass.get_output_amps = func {
#
update_electrical = func {
- time = getprop("/sim/time/elapsed-sec");
- dt = time - last_time;
+ var time = getprop("/sim/time/elapsed-sec");
+ var dt = time - last_time;
last_time = time;
update_virtual_bus( dt );
- # Request that the update fuction be called again next frame
+ # Request that the update function be called again next frame
settimer(update_electrical, 0);
}
@@ -194,24 +194,23 @@ update_electrical = func {
#
update_virtual_bus = func( dt ) {
- serviceable = getprop("/systems/electrical/serviceable");
+ var serviceable = getprop("/systems/electrical/serviceable");
+ var external_volts = 0.0;
+ var load = 0.0;
+ var battery_volts = 0.0;
+ var alternator_volts = 0.0;
if ( serviceable ) {
- battery_volts = battery.get_output_volts();
- alternator_volts = alternator.get_output_volts();
- } else {
- battery_volts = 0.0;
- alternator_volts = 0.0;
+ battery_volts = battery.get_output_volts();
+ alternator_volts = alternator.get_output_volts();
}
- external_volts = 0.0;
- load = 0.0;
# switch state
- master_bat = getprop("/controls/engines/engine[0]/master-bat");
- master_alt = getprop("/controls/engines/engine[0]/master-alt");
+ var master_bat = getprop("/controls/engines/engine[0]/master-bat");
+ var master_alt = getprop("/controls/engines/engine[0]/master-alt");
# determine power source
- bus_volts = 0.0;
- power_source = nil;
+ var bus_volts = 0.0;
+ var power_source = nil;
if ( master_bat ) {
bus_volts = battery_volts;
power_source = "battery";
@@ -235,10 +234,10 @@ update_virtual_bus = func( dt ) {
}
setprop("systems/electrical/outputs/starter[0]", starter_volts);
if (starter_volts > 1) {
- setprop("controls/engines/engine[0]/starter",1);
- setprop("controls/engines/engine[0]/magnetos",3);
+ setprop("controls/engines/engine[0]/starter",1);
+ setprop("controls/engines/engine[0]/magnetos",3);
} else {
- setprop("controls/engines/engine[0]/starter",0);
+ setprop("controls/engines/engine[0]/starter",0);
}
# bus network (1. these must be called in the right order, 2. the
@@ -250,7 +249,7 @@ update_virtual_bus = func( dt ) {
load += avionics_bus_2();
# system loads and ammeter gauge
- ammeter = 0.0;
+ var ammeter = 0.0;
if ( bus_volts > 1.0 ) {
# normal load
load += 15.0;
@@ -272,7 +271,7 @@ update_virtual_bus = func( dt ) {
}
# filter ammeter needle pos
- ammeter_ave = 0.8 * ammeter_ave + 0.2 * ammeter;
+ var ammeter_ave = 0.8 * ammeter_ave + 0.2 * ammeter;
# outputs
setprop("/systems/electrical/amps", ammeter_ave);
@@ -285,9 +284,9 @@ update_virtual_bus = func( dt ) {
electrical_bus_1 = func() {
# we are fed from the "virtual" bus
- bus_volts = vbus_volts;
- load = 0.0;
-
+ var bus_volts = vbus_volts;
+ var load = 0.0;
+
# Cabin Lights Power
if ( getprop("/controls/circuit-breakers/cabin-lights-pwr") ) {
setprop("/systems/electrical/outputs/cabin-lights", bus_volts);
@@ -333,8 +332,8 @@ electrical_bus_1 = func() {
electrical_bus_2 = func() {
# we are fed from the "virtual" bus
- bus_volts = vbus_volts;
- load = 0.0;
+ var bus_volts = vbus_volts;
+ var load = 0.0;
# Turn Coordinator Power
setprop("/systems/electrical/outputs/turn-coordinator", bus_volts);
@@ -381,13 +380,12 @@ electrical_bus_2 = func() {
cross_feed_bus = func() {
# we are fed from either of the electrical bus 1 or 2
+ var bus_volts = ebus2_volts;
if ( ebus1_volts > ebus2_volts ) {
bus_volts = ebus1_volts;
- } else {
- bus_volts = ebus2_volts;
}
- load = 0.0;
+ var load = 0.0;
setprop("/systems/electrical/outputs/annunciators", bus_volts);
@@ -397,20 +395,18 @@ cross_feed_bus = func() {
avionics_bus_1 = func() {
- master_av = getprop("/controls/switches/master-avionics");
+ var bus_volts = 0.0;
+ var load = 0.0;
# we are fed from the electrical bus 1
+ var master_av = getprop("/controls/switches/master-avionics");
if ( master_av ) {
bus_volts = ebus1_volts;
- } else {
- bus_volts = 0.0;
}
- load = 0.0;
-
# Avionics Fan Power
setprop("/systems/electrical/outputs/avionics-fan", bus_volts);
-
+
# GPS Power
setprop("/systems/electrical/outputs/gps", bus_volts);
@@ -435,15 +431,13 @@ avionics_bus_1 = func() {
avionics_bus_2 = func() {
- master_av = getprop("/controls/switches/master-avionics");
-
+ var master_av = getprop("/controls/switches/master-avionics");
# we are fed from the electrical bus 2
+ var bus_volts = 0.0;
if ( master_av ) {
bus_volts = ebus2_volts;
- } else {
- bus_volts = 0.0;
}
- load = 0.0;
+ var load = 0.0;
# NavCom 2 Power
setprop("/systems/electrical/outputs/nav[1]", bus_volts);
diff --git a/Aircraft/c172p/Nasal/kma20.nas b/Aircraft/c172p/Nasal/kma20.nas
new file mode 100644
index 000000000..e8770762e
--- /dev/null
+++ b/Aircraft/c172p/Nasal/kma20.nas
@@ -0,0 +1,41 @@
+##################################################################
+#
+# These are the helper functions for the kma20 audio panel
+# Maintainer: Thorsten Brehm (brehmt at gmail dot com)
+#
+# Usage:
+# just create one instance of kma20 class for each kma20 panel
+# you have in your aircraft:
+# kma20.new(0);
+#
+# KMA20 audio panel properties:
+# root: /instrumentation/kma20
+# knob: microphone/radio selector (com1/2)
+# auto: selects COM1/2 based on microphone selector
+# com1: enable/disable COM1 audio (e.g. for ATIS)
+# com2: enable/disable COM2 audio (e.g. for ATIS)
+# nav1: enable/disable NAV1 station identifier
+# nav2: enable/disable NAV2 station identifier
+# adf: enable/disable ADF station identifier
+# dme: enable/disable DME station identifier
+# mkr: enable/disable marker beacon audio
+# sens: beacon receiver sensitivity
+
+var kma20 = {};
+
+kma20.new = func(rootPath) {
+ var obj = {};
+ obj.parents = [kma20];
+
+ setlistener(rootPath ~ "/com1", func(v) {setprop("/instrumentation/comm/volume", 0.7*(v.getValue() != 0));}, 1);
+ setlistener(rootPath ~ "/com2", func(v) {setprop("/instrumentation/comm[1]/volume", 0.7*(v.getValue() != 0));}, 1);
+ setlistener(rootPath ~ "/nav1", func(v) {setprop("/instrumentation/nav/audio-btn", (v.getValue() != 0));}, 1);
+ setlistener(rootPath ~ "/nav2", func(v) {setprop("/instrumentation/nav[1]/audio-btn", (v.getValue() != 0));}, 1);
+ setlistener(rootPath ~ "/adf", func(v) {setprop("/instrumentation/adf/ident-audible", (v.getValue() != 0));}, 1);
+ setlistener(rootPath ~ "/dme", func(v) {setprop("/instrumentation/dme/ident", (v.getValue() != 0));}, 1);
+ setlistener(rootPath ~ "/mkr", func(v) {setprop("/instrumentation/marker-beacon/audio-btn",(v.getValue() != 0));}, 1);
+ print( "KMA20 audio panel initialized" );
+ return obj;
+};
+
+var kma20_0 = kma20.new( "/instrumentation/kma20" );
diff --git a/Aircraft/c172p/Tutorials/altimeter.xml b/Aircraft/c172p/Tutorials/altimeter.xml
index f3a594bd2..10fc0a28a 100644
--- a/Aircraft/c172p/Tutorials/altimeter.xml
+++ b/Aircraft/c172p/Tutorials/altimeter.xml
@@ -68,10 +68,12 @@ This tutorial will teach you how to set the altimeter based on the ATIS (Automat
<step>
<message>In this lesson, you'll learn how to set the altimeter to the Livermore ATIS. I've already
set the radio to the correct frequency - 119.65 MHz</message>
+ <wait>10</wait>
</step>
<step>
<message>Listen to the ATIS message. If you cannot hear it, check the Sound Configuration item in the File menu.</message>
+ <wait>10</wait>
</step>
<step>
@@ -79,10 +81,11 @@ This tutorial will teach you how to set the altimeter based on the ATIS (Automat
We can set this using Equipment->Instrument Settings, or we can adjust
the altimeter so that the altimeter matches the altitude of Livermore - 380ft.
</message>
+ <wait>10</wait>
<view>
<heading-offset-deg>353.8</heading-offset-deg>
- <pitch-offset-deg>-17.3</pitch-offset-deg>
+ <pitch-offset-deg>-20.3</pitch-offset-deg>
<roll-offset-deg>0.0</roll-offset-deg>
<x-offset-m>-0.2</x-offset-m>
<y-offset-m>0.3</y-offset-m>
@@ -99,7 +102,7 @@ This tutorial will teach you how to set the altimeter based on the ATIS (Automat
<view>
<heading-offset-deg>353.8</heading-offset-deg>
- <pitch-offset-deg>-17.3</pitch-offset-deg>
+ <pitch-offset-deg>-20.3</pitch-offset-deg>
<roll-offset-deg>0.0</roll-offset-deg>
<x-offset-m>-0.2</x-offset-m>
<y-offset-m>0.3</y-offset-m>
@@ -119,7 +122,7 @@ This tutorial will teach you how to set the altimeter based on the ATIS (Automat
<message>Set the altimeter to 380 feet, or the pressure setting to 29.97 inHG.</message>
<view>
<heading-offset-deg>353.8</heading-offset-deg>
- <pitch-offset-deg>-17.3</pitch-offset-deg>
+ <pitch-offset-deg>-20.3</pitch-offset-deg>
<roll-offset-deg>0.0</roll-offset-deg>
<x-offset-m>-0.2</x-offset-m>
<y-offset-m>0.3</y-offset-m>
diff --git a/Aircraft/c172p/Tutorials/engine-failure.xml b/Aircraft/c172p/Tutorials/engine-failure.xml
index eb24bd480..76d704529 100644
--- a/Aircraft/c172p/Tutorials/engine-failure.xml
+++ b/Aircraft/c172p/Tutorials/engine-failure.xml
@@ -11,7 +11,7 @@ The Cessna 172 glides at a ratio of 10:1 at a best glide speed of 90kts IAS. The
Both KSFO (San Francisco International) and KHAF (Half Moon Bay) are within glide distance. In real life, you would opt for the larger of the two airports, but for an extra challenge, try to land at KHAF.
</description>
- <timeofday>evening</timeofday>
+ <timeofday>dusk</timeofday>
<presets>
<airport-id>KHAF</airport-id>
<on-ground>0</on-ground>
@@ -58,6 +58,7 @@ Both KSFO (San Francisco International) and KHAF (Half Moon Bay) are within glid
<step>
<message>We're happily cruising along, enjoying an evenings flight.</message>
+ <wait>10</wait>
</step>
<step>
diff --git a/Aircraft/c172p/Tutorials/radios.xml b/Aircraft/c172p/Tutorials/radios.xml
index 9e180aabb..98240c838 100644
--- a/Aircraft/c172p/Tutorials/radios.xml
+++ b/Aircraft/c172p/Tutorials/radios.xml
@@ -62,12 +62,14 @@ weather, the altimeter setting and the runway in use.
<step>
<message>In this lesson, you'll learn how to tune the radio to the Livermore ATIS.
The radio is in the middle of the center console.</message>
+ <wait>10</wait>
</step>
<step>
<message>There are 4 radios on this aircraft - two for communication (COMM1, COMM2) and two for navigation (NAV1, NAV2).
Each radio has an active frequency and a standby frequency.
We tune the radio by changing the standby frequency, and then swapping the active and standby. </message>
+ <wait>10</wait>
</step>
<step>
<message>To change the standby frequency, you can click on the left side of the knob to decrease it, and the right side to increase it. </message>
diff --git a/Aircraft/c172p/Tutorials/runup.xml b/Aircraft/c172p/Tutorials/runup.xml
index c2bf3146f..541092bb0 100644
--- a/Aircraft/c172p/Tutorials/runup.xml
+++ b/Aircraft/c172p/Tutorials/runup.xml
@@ -71,6 +71,7 @@ For more information on the before takeoff checklist, see Section 2-11 of the FA
</set>
<message>You can access the pre-takeoff checklist by pressing ?,
or selecting Help->Aircraft Help from the menu.</message>
+ <wait>10</wait>
</step>
<step>
diff --git a/Aircraft/c172p/Tutorials/startup.xml b/Aircraft/c172p/Tutorials/startup.xml
index 174bf69a5..f16a6a4fb 100644
--- a/Aircraft/c172p/Tutorials/startup.xml
+++ b/Aircraft/c172p/Tutorials/startup.xml
@@ -7,6 +7,7 @@ This tutorial will take you through the pre-startup checklist and starting the C
</description>
<audio-dir>Aircraft/c172p/Tutorials/startup</audio-dir>
<timeofday>morning</timeofday>
+
<presets>
<airport-id>KLVK</airport-id>
<on-ground>1</on-ground>
@@ -58,28 +59,31 @@ This tutorial will take you through the pre-startup checklist and starting the C
<step>
<message>Welcome to Livermore Municipal Airport. In this lesson we'll go through the pre-startup checks and start the aircraft.</message>
+ <wait>10</wait>
</step>
<step>
<message>Before we start up, we need to brief what we'll do in case of an engine fire on startup. As
this isn't our aircraft, and we're fully insured, we'll simply open the door and run away.</message>
+ <wait>10</wait>
</step>
<step>
<message>Next, we check our seatbelts, and seat adjustments. Cessnas can get worn seat rails that
sometimes cause the seat to slip backwards, often just as you take off, so make sure it is secure.</message>
+ <wait>10</wait>
</step>
<step>
- <message>The fuel selector is set to BOTH, the Mixture control is fully rich, and the carb heat is off. </message>
+ <message>The fuel selector is set to BOTH, the Mixture control is fully rich, and the carb heat is off.</message>
<view>
- <heading-offset-deg>347.2</heading-offset-deg>
- <pitch-offset-deg>-21.8</pitch-offset-deg>
+ <heading-offset-deg>344.0</heading-offset-deg>
+ <pitch-offset-deg>-48.7</pitch-offset-deg>
<roll-offset-deg>0.0</roll-offset-deg>
<x-offset-m>-0.2</x-offset-m>
- <y-offset-m>0.3</y-offset-m>
- <z-offset-m>0.4</z-offset-m>
- <field-of-view>55.0</field-of-view>
+ <y-offset-m>0.235</y-offset-m>
+ <z-offset-m>0.36</z-offset-m>
+ <field-of-view>37.0</field-of-view>
</view>
</step>
@@ -138,6 +142,7 @@ This tutorial will take you through the pre-startup checklist and starting the C
<step>
<message>Now, we'll check no-one is about to walk into our propeller.</message>
+ <wait>2</wait>
<view>
<heading-offset-deg>44.0</heading-offset-deg>
<pitch-offset-deg>-15.7</pitch-offset-deg>
@@ -151,6 +156,7 @@ This tutorial will take you through the pre-startup checklist and starting the C
<step>
<message>Looks clear.</message>
+ <wait>2</wait>
<view>
<heading-offset-deg>296.6</heading-offset-deg>
<pitch-offset-deg>-10.4</pitch-offset-deg>
@@ -183,6 +189,10 @@ This tutorial will take you through the pre-startup checklist and starting the C
<property>/sim/panel-hotspots</property>
<value>true</value>
</set>
+ <set>
+ <property>/sim/model/hide-yoke</property>
+ <value>true</value>
+ </set>
<error>
<message>Click the middle hotspot three times, so both magnetos are on and the key
is set to BOTH.</message>
@@ -262,6 +272,10 @@ This tutorial will take you through the pre-startup checklist and starting the C
<property>/sim/panel-hotspots</property>
<value>false</value>
</set>
+ <set>
+ <property>/sim/model/hide-yoke</property>
+ <value>false</value>
+ </set>
<error>
<message>You can release the starter motor now - the engine is running</message>
<condition>
diff --git a/Aircraft/c172p/Tutorials/takeoff.xml b/Aircraft/c172p/Tutorials/takeoff.xml
index b3d43d856..431f39c85 100644
--- a/Aircraft/c172p/Tutorials/takeoff.xml
+++ b/Aircraft/c172p/Tutorials/takeoff.xml
@@ -61,6 +61,7 @@ This tutorial will teach you how to take-off, and climb at 600 feet per minute.
nose-wheel steering and rudder. As the aircraft takes off, you will use the ailerons and elevator
to control the direction and attitude of the aircraft.
</message>
+ <wait>10</wait>
</step>
<step>
@@ -69,6 +70,7 @@ This tutorial will teach you how to take-off, and climb at 600 feet per minute.
in "yoke" mode with the left mouse button held down.
To switch the mouse to yoke mode, press the right mouse button until it displays as a + sign.
</message>
+ <wait>10</wait>
</step>
<step>
diff --git a/Aircraft/c172p/Tutorials/taxiing.xml b/Aircraft/c172p/Tutorials/taxiing.xml
index e611d138a..974978d49 100644
--- a/Aircraft/c172p/Tutorials/taxiing.xml
+++ b/Aircraft/c172p/Tutorials/taxiing.xml
@@ -96,6 +96,7 @@ For more information on taxiing, see Section 2-9 of the FAA Airplane Flying Hand
<step>
<message>In this lesson we'll taxi the aircraft from its parking
position infront of the FBO, along taxiways Juliet and Alpha to the run-up area near runway 07L.</message>
+ <wait>10</wait>
</step>
<step>
diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml
index 491c7316b..f27dffcc8 100644
--- a/Aircraft/c172p/c172p-set.xml
+++ b/Aircraft/c172p/c172p-set.xml
@@ -25,7 +25,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<flight-model archive="y">jsb</flight-model>
<aero archive="y">c172p</aero>
- <allow-toggle-cockpit>true</allow-toggle-cockpit>
+ <allow-toggle-cockpit type="bool">true</allow-toggle-cockpit>
<model>
<path archive="y">Aircraft/c172p/Models/c172p.xml</path>
@@ -51,7 +51,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<fairing2 type="bool">false</fairing2>
<fairing3 type="bool">false</fairing3>
</c172p>
-
+ <hide-yoke type="bool">false</hide-yoke>
</model>
<startup>
@@ -69,10 +69,10 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<view>
<internal type="bool" archive="y">true</internal>
<config>
- <x-offset-m archive="y">-0.21</x-offset-m>
- <y-offset-m archive="y">0.235</y-offset-m>
- <z-offset-m archive="y">0.36</z-offset-m>
- <pitch-offset-deg>-12</pitch-offset-deg>
+ <x-offset-m archive="y" type="double">-0.21</x-offset-m>
+ <y-offset-m archive="y" type="double">0.235</y-offset-m>
+ <z-offset-m archive="y" type="double">0.36</z-offset-m>
+ <pitch-offset-deg type="double">-12</pitch-offset-deg>
</config>
</view>
@@ -135,12 +135,14 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<controls>
<flight>
- <aileron-trim>0.027</aileron-trim>
- <rudder-trim>0.0</rudder-trim>
+ <aileron-trim type="double">0.027</aileron-trim>
+ <rudder-trim type="double">0.0</rudder-trim>
</flight>
<engines>
<engine n="0">
- <magnetos>3</magnetos>
+ <magnetos type="int">3</magnetos>
+ <master-bat type="bool">true</master-bat>
+ <master-alt type="bool">true</master-alt>
</engine>
</engines>
<lighting>
@@ -150,6 +152,16 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<beacon type="bool">false</beacon>
<nav-lights type="bool">false</nav-lights>
</lighting>
+ <switches>
+ <master-avionics type="bool">true</master-avionics>
+ <starter type="bool">false</starter>
+ </switches>
+ <engines>
+ <engine>
+ <master-bat type="bool">true</master-bat>
+ <master-alt type="bool">true</master-alt>
+ </engine>
+ </engines>
</controls>
<autopilot>
@@ -183,6 +195,16 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<encoder>
<serviceable type="bool">true</serviceable>
</encoder>
+ <adf n="0">
+ <ident-audible type="bool">false</ident-audible>
+ <volume type="double">0.7</volume>
+ </adf>
+ <nav n="0">
+ <volume type="double">0.7</volume>
+ </nav>
+ <nav n="1">
+ <volume type="double">0.7</volume>
+ </nav>
</instrumentation>
<engines>
@@ -202,6 +224,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
<file>Aircraft/c172p/Nasal/doors.nas</file>
<file>Aircraft/c172p/Nasal/light.nas</file>
<file>Aircraft/c172p/Nasal/tanks.nas</file>
+ <file>Aircraft/c172p/Nasal/kma20.nas</file>
<file>Aircraft/c172p/Nasal/ki266.nas</file>
<script><![CDATA[
ki266.new(0);
@@ -225,8 +248,8 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
</script>
</kap140>
<kr87>
- <file>Aircraft/c172p/Nasal/kr87.nas</file>
- </kr87>
+ <file>Aircraft/c172p/Nasal/kr87.nas</file>
+ </kr87>
</nasal>
<payload>
<weight>
diff --git a/Aircraft/ufo/Models/ufo.xml b/Aircraft/ufo/Models/ufo.xml
old mode 100755
new mode 100644
diff --git a/Docs/README.tutorials b/Docs/README.tutorials
index 3a6a939ed..2fffa5794 100644
--- a/Docs/README.tutorials
+++ b/Docs/README.tutorials
@@ -38,10 +38,13 @@ in detail below:
tutorial selection dialog
<description>...</description> mandatory; longer description for the dialog
<audio-dir>...</audio-dir> optional; defines where to load sound samples
- <interval>5</interval> optional; defines default loop interval in sec
<timeofday>noon</timeofday> optional; defines daytime; any of "dawn",
"morning", "noon", "afternoon",
"evening", "dusk", "midnight", "real"
+
+ <step-time> optional; period between each step being executed. Default 5
+ <exit-time> optional; period between exit/abort conditions being checked. Default 1
+
<nasal>
... optional; initial Nasal code; see below
</nasal>
@@ -72,10 +75,7 @@ in detail below:
<nasal>
... optional; Nasal code
</nasal>
- <interval>10</interval> optional; run loop next in this many seconds
- </init> (default: 5); doesn't change global
- interval
-
+ </init>
<step> mandatory; well, not really, but if there's not
at least one <step>, then the whole tutorial
@@ -100,7 +100,7 @@ in detail below:
... optional; Nasal code that is executed when the
</nasal> step is entered
- <interval>10</interval> optional; run loop next in this many seconds
+ <wait>10</wait> optional; wait period after initial messages etc.
<error> optional; allowed several times
<message>..</message> optional; text displayed/spoken
@@ -113,8 +113,6 @@ in detail below:
<nasal>
... optional; Nasal code that is executed when the
</nasal> error condition was fulfilled
-
- <interval>10</interval> optional; run loop next in this many seconds
</error>
<exit> optional; defines when to leave this <step>
diff --git a/Effects/building.eff b/Effects/building.eff
index 25a66f877..65a599a42 100644
--- a/Effects/building.eff
+++ b/Effects/building.eff
@@ -43,6 +43,17 @@
<reflection-fresnel type="float"> 0.0 </reflection-fresnel>
<reflection-rainbow type="float"> 0.0 </reflection-rainbow>
<reflection-noise type="float"> 0.0 </reflection-noise>
+ <texture n= "5" >
+ <type>cubemap</type>
+ <images>
+ <positive-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png</positive-x>
+ <negative-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png</negative-x>
+ <positive-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png</positive-y>
+ <negative-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png</negative-y>
+ <positive-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png</positive-z>
+ <negative-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png</negative-z>
+ </images>
+ </texture>
<!--Ambient correction -->
<ambient-correction type="float"> 0.0 </ambient-correction>
<dirt-enabled type="int"> 0 </dirt-enabled>
@@ -55,7 +66,7 @@
<diffuse type="vec4d">1.0 1.0 1.0 1.0</diffuse>
<specular type="vec4d">0.0 0.0 0.0 1.0</specular>
<emissive type="vec4d">0.02 0.02 0.02 1.0</emissive>
- <shininess>0.0</shininess>
+ <shininess>0.1</shininess>
<color-mode>ambient-and-diffuse</color-mode>
<color-mode-uniform>ambient-and-diffuse</color-mode-uniform>
<!-- DIFFUSE -->
@@ -86,7 +97,7 @@
<fogstructure><use>/environment/fog-structure</use></fogstructure>
<!-- END fog include -->
</parameters>
-
+
<!-- Atmospheric scattering technique -->
<technique n="5">
<predicate>
@@ -106,7 +117,7 @@
</or>
</and>
</predicate>
-
+
<pass>
<lighting>true</lighting>
<material>
@@ -239,7 +250,7 @@
<write-mask type="bool">false</write-mask>
</depth>
</pass>
- </technique>
+ </technique>
<technique n="8">
<pass>
diff --git a/Effects/default-pipeline.xml b/Effects/default-pipeline.xml
index 643e9310c..c6c641505 100644
--- a/Effects/default-pipeline.xml
+++ b/Effects/default-pipeline.xml
@@ -340,29 +340,41 @@
<pass>
<name>sky-clouds</name>
+ <debug-property>/sim/rendering/rembrandt/debug/lighting/sky</debug-property>
</pass>
<pass>
<name>ambient</name>
<type>fullscreen</type>
<effect>Effects/ambient</effect>
<order-num>1</order-num>
+ <debug-property>/sim/rendering/rembrandt/debug/lighting/ambient</debug-property>
</pass>
<pass>
<name>sunlight</name>
<type>fullscreen</type>
<effect>Effects/sunlight</effect>
<order-num>2</order-num>
- </pass>
- <pass>
- <name>lights</name>
- <order-num>3</order-num>
+ <debug-property>/sim/rendering/rembrandt/debug/lighting/sunlight</debug-property>
</pass>
<pass>
<name>fog</name>
<type>fullscreen</type>
<effect>Effects/fog</effect>
- <order-num>4</order-num>
+ <order-num>3</order-num>
+ <debug-property>/sim/rendering/rembrandt/debug/lighting/fog</debug-property>
</pass>
+ <pass>
+ <name>lights</name>
+ <order-num>4</order-num>
+ <debug-property>/sim/rendering/rembrandt/debug/lighting/lights</debug-property>
+ </pass>
+ <!-- pass>
+ <name>debug</name>
+ <type>fullscreen</type>
+ <effect>Effects/debug</effect>
+ <order-num>5</order-num>
+ <debug-property>/sim/rendering/rembrandt/debug/lighting/debug</debug-property>
+ </pass -->
</stage>
<stage>
diff --git a/Effects/fog.eff b/Effects/fog.eff
index 7008ef933..b35de4b16 100644
--- a/Effects/fog.eff
+++ b/Effects/fog.eff
@@ -12,7 +12,7 @@
<destination>one-minus-src-alpha</destination>
</blend>
<render-bin>
- <bin-number>10000</bin-number>
+ <bin-number>1</bin-number>
<bin-name>RenderBin</bin-name>
</render-bin>
<texture-unit>
diff --git a/Effects/model-combined-deferred.eff b/Effects/model-combined-deferred.eff
index 716220bbf..43fa258a7 100644
--- a/Effects/model-combined-deferred.eff
+++ b/Effects/model-combined-deferred.eff
@@ -25,7 +25,6 @@ the objects that use it, and replaces it with the default shader.
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
</and>
</predicate>
<pass>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index b2d8cac0e..339e33e7c 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -169,8 +169,6 @@ please see Docs/README.model-combined.eff for documentation
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
- <extension-supported>GL_ARB_texture_rg</extension-supported>
</and>
</predicate>
<pass>
diff --git a/Effects/runway.eff b/Effects/runway.eff
index 1a64d5813..cb5641766 100644
--- a/Effects/runway.eff
+++ b/Effects/runway.eff
@@ -102,7 +102,6 @@
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
</and>
</predicate>
<pass>
diff --git a/Effects/ssao.eff b/Effects/ssao.eff
index 31b36f44e..e25373a2e 100644
--- a/Effects/ssao.eff
+++ b/Effects/ssao.eff
@@ -8,7 +8,24 @@
<g_sample_rad type="float">0.03</g_sample_rad>
<random_size type="float">800.0</random_size>
</parameters>
- <technique n="11">
+ <technique n="10">
+ <predicate>
+ <and>
+ <or>
+ <less-equal>
+ <value type="float">2.0</value>
+ <glversion/>
+ </less-equal>
+ <and>
+ <extension-supported>GL_ARB_shader_objects</extension-supported>
+ <extension-supported>GL_ARB_shading_language_100</extension-supported>
+ <extension-supported>GL_ARB_vertex_shader</extension-supported>
+ <extension-supported>GL_ARB_fragment_shader</extension-supported>
+ </and>
+ </or>
+ <extension-supported>GL_EXT_gpu_shader4</extension-supported>
+ </and>
+ </predicate>
<pass>
<texture-unit>
<unit>0</unit>
@@ -81,4 +98,77 @@
</uniform>
</pass>
</technique>
+ <technique n="11">
+ <pass>
+ <texture-unit>
+ <unit>0</unit>
+ <type>buffer</type>
+ <name>depth</name>
+ </texture-unit>
+ <texture-unit>
+ <unit>1</unit>
+ <type>buffer</type>
+ <name>normal</name>
+ </texture-unit>
+ <texture-unit>
+ <unit>2</unit>
+ <type>buffer</type>
+ <name>spec-emis</name>
+ </texture-unit>
+ <texture-unit>
+ <unit>3</unit>
+ <type>noise</type>
+ </texture-unit>
+ <program>
+ <vertex-shader>Shaders/ssao.vert</vertex-shader>
+ <fragment-shader>Shaders/ssao-ati.frag</fragment-shader>
+ <fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader>
+ </program>
+ <uniform>
+ <name>depth_tex</name>
+ <type>sampler-2d</type>
+ <value type="int">0</value>
+ </uniform>
+ <uniform>
+ <name>normal_tex</name>
+ <type>sampler-2d</type>
+ <value type="int">1</value>
+ </uniform>
+ <uniform>
+ <name>spec_emis_tex</name>
+ <type>sampler-2d</type>
+ <value type="int">2</value>
+ </uniform>
+ <uniform>
+ <name>noise_tex</name>
+ <type>sampler-2d</type>
+ <value type="int">3</value>
+ </uniform>
+ <uniform>
+ <name>g_scale</name>
+ <type>float</type>
+ <value><use>g_scale</use></value>
+ </uniform>
+ <uniform>
+ <name>g_bias</name>
+ <type>float</type>
+ <value><use>g_bias</use></value>
+ </uniform>
+ <uniform>
+ <name>g_intensity</name>
+ <type>float</type>
+ <value><use>g_intensity</use></value>
+ </uniform>
+ <uniform>
+ <name>g_sample_rad</name>
+ <type>float</type>
+ <value><use>g_sample_rad</use></value>
+ </uniform>
+ <uniform>
+ <name>random_size</name>
+ <type>float</type>
+ <value><use>random_size</use></value>
+ </uniform>
+ </pass>
+ </technique>
</PropertyList>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index 544f5745a..e63d81506 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -31,7 +31,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="10">
- <image>Textures.high/Terrain/snow3.dds</image>
+ <image>Textures.high/Terrain/snow3.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
@@ -679,7 +679,7 @@
</pass>
</technique>
-
+
<technique n="12">
<pass>
<lighting>true</lighting>
diff --git a/Effects/transition.eff b/Effects/transition.eff
index e1fcf18bb..43a1e0a96 100644
--- a/Effects/transition.eff
+++ b/Effects/transition.eff
@@ -106,7 +106,6 @@ parameters :
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
</and>
</predicate>
diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff
index e8484d7e4..04a2da753 100644
--- a/Effects/water-inland.eff
+++ b/Effects/water-inland.eff
@@ -523,7 +523,6 @@
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
</and>
</predicate>
<pass>
diff --git a/Effects/water.eff b/Effects/water.eff
index 7c37c96e6..d7a5ea264 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -523,7 +523,6 @@
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
</and>
</predicate>
<pass>
@@ -913,7 +912,6 @@
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
- <extension-supported>GL_EXT_gpu_shader4</extension-supported>
</and>
</predicate>
<pass>
diff --git a/Input/Joysticks/CH/pro-pedals-usb.xml b/Input/Joysticks/CH/pro-pedals-usb.xml
index 018f90dfd..fbeb66abc 100644
--- a/Input/Joysticks/CH/pro-pedals-usb.xml
+++ b/Input/Joysticks/CH/pro-pedals-usb.xml
@@ -19,6 +19,7 @@ $Id$
<name>CH PRODUCTS CH PRO PEDALS USB </name>
<name>CH Products CH Pro Pedals USB Rudder Pedals </name>
<name>CH PRO PEDALS USB </name>
+ <name>CH Pro Pedals USB</name>
<axis n="0">
<desc>Brake left</desc>
diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
index 579ed2a2b..88a41197e 100644
--- a/Input/Joysticks/CH/pro-yoke-usb.xml
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -4,6 +4,7 @@
<name>CH PRODUCTS CH FLIGHT SIM YOKE USB </name>
<name>CH FLIGHT SIM YOKE USB </name>
+ <name>CH Flight Sim Yoke USB</name>
<axis n="0">
<desc>Aileron</desc>
diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index eef967c73..97d35bf7f 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -400,22 +400,6 @@ Shared parameters for various materials.
<bumpiness>0.1</bumpiness>
</material>
-<material n="2006">
- <name>BarrenCover</name>
- <name>Dirt</name>
- <name>OpenMining</name>
- <name>Rock</name>
- <name>Dump</name>
- <effect>Effects/transition-base-grass-inverse</effect>
- <texture>Terrain/rock.png</texture>
- <xsize>500</xsize>
- <ysize>500</ysize>
- <solid>1</solid>
- <friction-factor>0.9</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.3</bumpiness>
-</material>
-
<material n="2007">
<name>Lava</name>
<name>Burnt</name>
diff --git a/Materials/base/rock.xml b/Materials/base/rock.xml
new file mode 100644
index 000000000..ce1162983
--- /dev/null
+++ b/Materials/base/rock.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- common rock settings -->
+<PropertyList>
+ <xsize>500</xsize>
+ <ysize>500</ysize>
+ <solid>1</solid>
+ <friction-factor>0.9</friction-factor>
+ <rolling-friction>0.1</rolling-friction>
+ <bumpiness>0.3</bumpiness>
+</PropertyList>
\ No newline at end of file
diff --git a/Materials/base/water.xml b/Materials/base/water.xml
index 40714baf0..1e192557f 100644
--- a/Materials/base/water.xml
+++ b/Materials/base/water.xml
@@ -1,102 +1,102 @@
<?xml version="1.0"?>
<!-- common water settings -->
<PropertyList>
-<xsize>400</xsize>
- <ysize>400</ysize>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Geometry/container_carrier.ac</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/ContainerShip.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/Trawler.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- <object>
- <path>Models/Maritime/Civilian/Trawler.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- <object>
- <path>Models/Maritime/Civilian/Trawler.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/Freighter.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/LargeTrawler.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/SailBoatUnderSail.xml</path>
- <coverage-m2>500000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/CruiseShip.xml</path>
- <coverage-m2>5000000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <object-group>
- <range-m>40000</range-m>
- <object>
- <path>Models/Maritime/Civilian/MPPShip.xml</path>
- <coverage-m2>5000000000</coverage-m2>
- <heading-type>random</heading-type>
- </object>
- </object-group>
- <ambient>
- <r>0.0</r>
- <g>0.0</g>
- <b>0.0</b>
- <a>1.0</a>
- </ambient>
- <diffuse>
- <r>0.4</r>
- <g>0.4</g>
- <b>0.4</b>
- <a>1.0</a>
- </diffuse>
- <specular>
- <r>0.0</r>
- <g>0.0</g>
- <b>0.2</b>
- <a>1.0</a>
- </specular>
- <shininess>0</shininess>
- <solid>0</solid>
- <rolling-friction>2</rolling-friction>
- <bumpiness>0.8</bumpiness>
+ <xsize>400</xsize>
+ <ysize>400</ysize>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Geometry/container_carrier.ac</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/ContainerShip.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/Trawler.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ <object>
+ <path>Models/Maritime/Civilian/Trawler.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ <object>
+ <path>Models/Maritime/Civilian/Trawler.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/Freighter.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/LargeTrawler.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/SailBoatUnderSail.xml</path>
+ <coverage-m2>500000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/CruiseShip.xml</path>
+ <coverage-m2>5000000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <object-group>
+ <range-m>40000</range-m>
+ <object>
+ <path>Models/Maritime/Civilian/MPPShip.xml</path>
+ <coverage-m2>5000000000</coverage-m2>
+ <heading-type>random</heading-type>
+ </object>
+ </object-group>
+ <ambient>
+ <r>0.0</r>
+ <g>0.0</g>
+ <b>0.0</b>
+ <a>1.0</a>
+ </ambient>
+ <diffuse>
+ <r>0.4</r>
+ <g>0.4</g>
+ <b>0.4</b>
+ <a>1.0</a>
+ </diffuse>
+ <specular>
+ <r>0.0</r>
+ <g>0.0</g>
+ <b>0.2</b>
+ <a>1.0</a>
+ </specular>
+ <shininess>0</shininess>
+ <solid>0</solid>
+ <rolling-friction>2</rolling-friction>
+ <bumpiness>0.8</bumpiness>
</PropertyList>
\ No newline at end of file
diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml
index 4144ff33e..698c745b8 100644
--- a/Materials/dds/materials.xml
+++ b/Materials/dds/materials.xml
@@ -2352,6 +2352,15 @@
<!-- end winter-->
+<material include="Materials/base/rock.xml">
+ <name>BarrenCover</name>
+ <name>Dirt</name>
+ <name>OpenMining</name>
+ <name>Rock</name>
+ <name>Dump</name>
+ <effect>Effects/transition-base-grass-inverse</effect>
+ <texture>Terrain/rock7.dds</texture>
+</material>
<!-- runway and taxiway signs -->
diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml
index 03efdbd77..086a92c5c 100644
--- a/Materials/default/materials.xml
+++ b/Materials/default/materials.xml
@@ -2199,6 +2199,15 @@
<!-- end winter-->
+ <material include="Materials/base/rock.xml">
+ <name>BarrenCover</name>
+ <name>Dirt</name>
+ <name>OpenMining</name>
+ <name>Rock</name>
+ <name>Dump</name>
+ <texture>Terrain/rock.png</texture>
+</material>
+
<!-- runway and taxiway signs -->
<material include="Materials/base/glyphs-yellow.xml">
diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml
index 335d66625..7b334c211 100644
--- a/Materials/regions/materials.xml
+++ b/Materials/regions/materials.xml
@@ -3034,6 +3034,15 @@
<!-- end winter-->
+ <material include="Materials/base/rock.xml">
+ <name>BarrenCover</name>
+ <name>Dirt</name>
+ <name>OpenMining</name>
+ <name>Rock</name>
+ <name>Dump</name>
+ <texture>Terrain/rock.png</texture>
+ </material>
+
<!-- runway and taxiway signs -->
<material include="Materials/base/glyphs-yellow.xml">
diff --git a/Nasal/aircraft.nas b/Nasal/aircraft.nas
index 44bb1137b..581dbf795 100644
--- a/Nasal/aircraft.nas
+++ b/Nasal/aircraft.nas
@@ -1193,18 +1193,20 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
}
#### end of temporary hack for /sim/auto-coordination
- if (getprop("/sim/startup/save-on-exit")) {
+ if (!getprop("/sim/startup/restore-defaults")) {
+ # load user-specific aircraft settings
data.load();
var n = props.globals.getNode("/sim/aircraft-data");
if (n != nil)
foreach (var c; n.getChildren("path"))
if (c.getType() != "NONE")
data.add(c.getValue());
- } else {
+ }
+ if (!getprop("/sim/startup/save-on-exit"))
+ {
+ # prevent saving
data._save_ = func nil;
data._loop_ = func nil;
}
});
-
-
diff --git a/Nasal/tutorial/tutorial.nas b/Nasal/tutorial/tutorial.nas
index 6d1a5f74d..8be7cd5bf 100644
--- a/Nasal/tutorial/tutorial.nas
+++ b/Nasal/tutorial/tutorial.nas
@@ -2,8 +2,8 @@
# ---------------------------------------------------------------------------------------
-var step_interval = 0.0; # time between tutorial steps (default is set below)
-var exit_interval = 0.0; # time between fulfillment of a step and the start of the next step (default is set below)
+var step_interval = 0; # time between tutorial steps (default is set below)
+var exit_interval = 0; # time between fulfillment of a step and the start of the next step (default is set below)
var loop_id = 0;
var tutorialN = nil;
@@ -67,8 +67,8 @@ var startTutorial = func {
last_step_time = time_elapsedN.getValue();
steps = tutorialN.getChildren("step");
- step_interval = read_double(tutorialN, "step-time", 5.0); # time between tutorial steps
- exit_interval = read_double(tutorialN, "exit-time", 1.0); # time between fulfillment of steps
+ step_interval = read_int(tutorialN, "step-time", 5); # time between tutorial steps
+ exit_interval = read_int(tutorialN, "exit-time", 1); # time between fulfillment of steps
run_nasal(tutorialN);
set_models(tutorialN.getNode("models"));
@@ -133,9 +133,12 @@ var stopTutorial = func {
# - Otherwise display the instructions for the step.
#
var step_tutorial = func(id) {
+
+ # Check to ensure that this is the currently running tutorial.
id == loop_id or return;
- var continue_after = func(n, dflt) {
- settimer(func { step_tutorial(id) }, read_double(n, "wait", dflt));
+
+ var continue_after = func(n, w) {
+ settimer(func { step_tutorial(id) }, w);
}
# <end>
@@ -159,7 +162,10 @@ var step_tutorial = func(id) {
step_countN.setIntValue(step_iter_count = 0);
do_group(step, "Tutorial step " ~ current_step);
- return continue_after(step, step_interval);
+
+ # A <wait> tag affects only the initial entry to the step
+ var w = read_int(step, "wait", step_interval);
+ return continue_after(step, w);
}
step_countN.setIntValue(step_iter_count += 1);
@@ -221,12 +227,11 @@ var do_group = func(node, default_msg = nil) {
run_nasal(node);
}
-
-var read_double = func(node, child, default) {
+var read_int = func(node, child, default) {
var c = node.getNode(child);
if (c == nil)
return default;
- c = c.getValue();
+ c = int(c.getValue());
return c != nil ? c : default;
}
diff --git a/Shaders/light-point.frag b/Shaders/light-point.frag
index 7f77fa5ca..4fb0a621c 100644
--- a/Shaders/light-point.frag
+++ b/Shaders/light-point.frag
@@ -48,13 +48,22 @@ void main() {
float nDotVP = max(0.0, dot(normal, VP));
float nDotHV = max(0.0, dot(normal, halfVector));
- vec4 color = texture2D( color_tex, coords );
- vec4 Iamb = Ambient * color * att;
- vec4 Idiff = Diffuse * color * att * nDotVP;
+ vec4 color_material = texture2D( color_tex, coords );
+ vec3 color = color_material.rgb;
+ vec3 Iamb = Ambient.rgb * color * att;
+ vec3 Idiff = Diffuse.rgb * color * att * nDotVP;
+
+ float matID = color_material.a * 255.0;
+ float spec_intensity = spec_emis.x;
+ float spec_att = att;
+ if (matID == 254.0) { // 254: water, 255: Ubershader
+ spec_intensity = 1.0; // spec_color shouldn't depend on cloud cover when rendering spot light
+ spec_att = min(10.0 * att, 1.0); // specular attenuation reduced on water
+ }
vec3 Ispec = vec3(0.0);
if (cosAngIncidence > 0.0)
- Ispec = pow( nDotHV, spec_emis.y * 128.0 ) * spec_emis.x * att * Specular.rgb;
+ Ispec = pow( nDotHV, spec_emis.y * 128.0 ) * spec_intensity * spec_att * Specular.rgb;
- gl_FragColor = vec4(Iamb.rgb + Idiff.rgb + Ispec, 1.0);
+ gl_FragColor = vec4(Iamb + Idiff + Ispec, 1.0);
}
diff --git a/Shaders/light-spot.frag b/Shaders/light-spot.frag
index 63fe79b9a..498189164 100644
--- a/Shaders/light-spot.frag
+++ b/Shaders/light-spot.frag
@@ -60,13 +60,25 @@ void main() {
float nDotVP = max(0.0, dot(normal, VP));
float nDotHV = max(0.0, dot(normal, halfVector));
- vec4 color = texture2D( color_tex, coords );
- vec4 Iamb = Ambient * color * att;
- vec4 Idiff = Diffuse * color * att * nDotVP;
+ vec4 color_material = texture2D( color_tex, coords );
+ vec3 color = color_material.rgb;
+ vec3 Iamb = Ambient.rgb * color * att;
+ vec3 Idiff = Diffuse.rgb * color * att * nDotVP;
+
+ float matID = color_material.a * 255.0;
+ float spec_intensity = spec_emis.x;
+ float spec_att = att;
+ if (matID == 254.0) { // 254: water, 255: Ubershader
+ spec_intensity = 1.0; // spec_color shouldn't depend on cloud cover when rendering spot light
+ spec_att = min(10.0 * att, 1.0); // specular attenuation reduced on water
+ }
vec3 Ispec = vec3(0.0);
if (cosAngIncidence > 0.0)
- Ispec = pow( nDotHV, spec_emis.y * 128.0 ) * spec_emis.x * att * Specular.rgb;
+ Ispec = pow( nDotHV, spec_emis.y * 128.0 ) * spec_intensity * spec_att * Specular.rgb;
- gl_FragColor = vec4(Iamb.rgb + Idiff.rgb + Ispec, 1.0);
+ if (matID >= 254.0)
+ Idiff += Ispec * spec_emis.x;
+
+ gl_FragColor = vec4(Iamb + Idiff + Ispec, 1.0);
}
diff --git a/Shaders/runway-gbuffer.frag b/Shaders/runway-gbuffer.frag
index 683ce2454..42def8f40 100644
--- a/Shaders/runway-gbuffer.frag
+++ b/Shaders/runway-gbuffer.frag
@@ -50,12 +50,14 @@ void main (void)
if (normalmap_dds > 0)
N = -N;
-
+ float nFactor = 1.0 - N.z;
+ float lightness = dot(texel.rgb, vec3( 0.3, 0.59, 0.11 ));
// calculate the specular light
- float refl_correction = spec_adjust * 1.9 - 1.0;
- float shininess = max (0.35, refl_correction) * nmap.a;
+ float refl_correction = spec_adjust * 2.5 - 1.0;
+ float shininess = max (0.35, refl_correction) * nmap.a * nFactor;
- float specular = dot(vec3(0.5*shininess), vec3( 0.3, 0.59, 0.11 ));
+
+ float specular = dot(vec3(1.0) * lightness , vec3( 0.3, 0.59, 0.11 )) * nFactor;
vec4 color = vec4(1.0);
@@ -65,7 +67,7 @@ void main (void)
vec3 viewVec = normalize(vViewVec);
// Map a rainbowish color
- float v = dot(viewVec, normalize(VNormal));
+ float v = abs(dot(viewVec, normalize(VNormal)));
vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0));
// Map a fresnel effect
@@ -83,7 +85,7 @@ void main (void)
MixFactor = 0.75 * smoothstep(0.0, 1.0, MixFactor);
- reflFactor = max(map.a * (texel.r + texel.g), 1.0 - MixFactor) * (1.0- N.z) + transparency_offset ;
+ reflFactor = max(map.a * (texel.r + texel.g), 1.0 - MixFactor) * nFactor + transparency_offset ;
reflFactor =0.75 * smoothstep(0.05, 1.0, reflFactor);
// set ambient adjustment to remove bluiness with user input
@@ -96,12 +98,12 @@ void main (void)
vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v);
vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness);
- vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0);
+ vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0) * nFactor;
- vec4 mixedcolor = mix(texel, raincolor, reflFactor);
+ vec4 mixedcolor = mix(texel, raincolor * (1.0 - refl_correction * (1.0 - lightness)), reflFactor);
// the final reflection
- vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction, color.a);
+ vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction * nFactor, color.a);
encode_gbuffer(N, fragColor.rgb, 1, specular, shininess, emission, gl_FragCoord.z);
}
\ No newline at end of file
diff --git a/Shaders/runway.frag b/Shaders/runway.frag
index 463c1246b..fad9defd9 100644
--- a/Shaders/runway.frag
+++ b/Shaders/runway.frag
@@ -61,9 +61,9 @@ void main (void)
if (normalmap_dds > 0)
N = -N;
-
+ float lightness = dot(texel.rgb, vec3( 0.3, 0.59, 0.11 ));
// calculate the specular light
- float refl_correction = spec_adjust * 1.9 - 1.0;
+ float refl_correction = spec_adjust * 2.5 - 1.0;
float shininess = max (0.35, refl_correction);
float nDotVP = max(0.0, dot(N, normalize(gl_LightSource[0].position.xyz)));
float nDotHV = max(0.0, dot(N, normalize(gl_LightSource[0].halfVector.xyz)));
@@ -74,17 +74,20 @@ void main (void)
pf = pow(nDotHV, /*gl_FrontMaterial.*/shininess);
vec4 Diffuse = gl_LightSource[0].diffuse * nDotVP;
- vec4 Specular = vec4(vec3(0.5*shininess), 1.0)* gl_LightSource[0].specular * pf;
+ //vec4 Specular = vec4(vec3(0.5*shininess), 1.0)* gl_LightSource[0].specular * pf;
+ vec4 Specular = vec4(1.0)* lightness * gl_LightSource[0].specular * pf;
vec4 color = gl_Color + Diffuse * gl_FrontMaterial.diffuse;
- color += Specular * vec4(vec3(0.5*shininess), 1.0) * nmap.a;
+ //color += Specular * vec4(vec3(0.5*shininess), 1.0) * nmap.a;
+ float nFactor = 1.0 - N.z;
+ color += Specular * vec4(1.0) * nmap.a * nFactor;
color.a = texel.a * alpha;
color = clamp(color, 0.0, 1.0);
vec3 viewVec = normalize(vViewVec);
// Map a rainbowish color
- float v = dot(viewVec, normalize(VNormal));
+ float v = abs(dot(viewVec, normalize(VNormal)));
vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0));
// Map a fresnel effect
@@ -113,17 +116,18 @@ void main (void)
// add fringing fresnel and rainbow effects and modulate by reflection
vec4 reflcolor = mix(reflection, rainbow, rainbowiness * v);
- reflcolor += Specular * nmap.a;
+ reflcolor += Specular * nmap.a * nFactor;
vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v);
vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness);
vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0);
- raincolor += Specular * nmap.a;
+ raincolor += Specular * nmap.a * nFactor;
- vec4 mixedcolor = mix(texel, raincolor, reflFactor);
+
+ vec4 mixedcolor = mix(texel, raincolor * (1.0 - refl_correction * (1.0 - lightness)), reflFactor); //* (1.0 - 0.5 * transparency_offset )
// the final reflection
- vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction.rgb, color.a);
- fragColor += Specular * nmap.a;
+ vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction.rgb * (1.0 - refl_correction * (1.0 - 0.8 * lightness)) * nFactor, color.a);
+ fragColor += Specular * nmap.a * nFactor;
fragColor.rgb = fog_Func(fragColor.rgb, fogType);
gl_FragColor = fragColor;
diff --git a/Shaders/ssao-ati.frag b/Shaders/ssao-ati.frag
new file mode 100644
index 000000000..aef4f286b
--- /dev/null
+++ b/Shaders/ssao-ati.frag
@@ -0,0 +1,63 @@
+#version 120
+uniform sampler2D normal_tex;
+uniform sampler2D depth_tex;
+uniform sampler2D spec_emis_tex;
+uniform sampler3D noise_tex;
+uniform vec2 fg_BufferSize;
+uniform vec3 fg_Planes;
+uniform vec4 fg_du;
+uniform vec4 fg_dv;
+uniform float g_scale;
+uniform float g_bias;
+uniform float g_intensity;
+uniform float g_sample_rad;
+uniform float random_size;
+uniform int osg_FrameNumber;
+
+varying vec4 ray;
+
+const vec2 v[4] = vec2[](vec2(1.0,0.0),vec2(-1.0,0.0),vec2(0.0,1.0),vec2(0.0,-1.0));
+
+vec3 position( vec3 viewDir, vec2 coords, sampler2D depth_tex );
+vec3 normal_decode(vec2 enc);
+
+vec2 getRandom( in vec2 uv ) {
+ int level = osg_FrameNumber - ((osg_FrameNumber / 64) * 64);
+ return normalize( texture3D( noise_tex, vec3(uv*50.0, float(level) / 64.0) ).xy * 0.14 - 0.07 );
+}
+vec3 getPosition(in vec2 uv, in vec2 uv0, in vec4 ray0) {
+ vec2 duv = uv - uv0;
+ vec4 ray = ray0 + fg_du * duv.x + fg_dv * duv.y;
+ vec3 viewDir = normalize( ray.xyz );
+ return position(viewDir, uv, depth_tex);
+}
+float doAmbientOcclusion(in vec2 tcoord, in vec2 uv, in vec3 p, in vec3 cnorm, in vec4 ray) {
+ vec3 diff = getPosition(tcoord+uv,tcoord,ray)-p;
+ float d = length(diff);
+ vec3 v = diff / d;
+ d *= g_scale;
+ return max(0.0, dot( cnorm,v ) - g_bias) * (1.0/(1.0+d)) * g_intensity;
+}
+void main() {
+ vec2 coords = gl_TexCoord[0].xy;
+ float initialized = texture2D( spec_emis_tex, coords ).a;
+ if ( initialized < 0.1 )
+ discard;
+ vec3 normal = normal_decode(texture2D( normal_tex, coords ).rg);
+ vec3 viewDir = normalize(ray.xyz);
+ vec3 pos = position(viewDir, coords, depth_tex);
+ vec2 rand = getRandom(coords);
+ float ao = 0.0;
+ float rad = g_sample_rad;
+ int iterations = 4;
+ for (int j = 0; j < 1; ++j ) {
+ vec2 coord1 = reflect( v[j], rand ) * rad;
+ vec2 coord2 = vec2( coord1.x*0.707 - coord1.y*0.707, coord1.x*0.707 + coord1.y*0.707 );
+ ao += doAmbientOcclusion(coords,coord1*0.25,pos,normal,ray);
+ ao += doAmbientOcclusion(coords,coord2*0.5,pos,normal,ray);
+ ao += doAmbientOcclusion(coords,coord1*0.75,pos,normal,ray);
+ ao += doAmbientOcclusion(coords,coord2,pos,normal,ray);
+ }
+ ao /= 16.0;
+ gl_FragColor = vec4( vec3(1.0 - ao), 1.0 );
+}
diff --git a/Shaders/sunlight.frag b/Shaders/sunlight.frag
index 85e110f23..918dbf003 100644
--- a/Shaders/sunlight.frag
+++ b/Shaders/sunlight.frag
@@ -85,7 +85,8 @@ void main() {
}
vec3 lightDir = (fg_ViewMatrix * vec4( fg_SunDirection, 0.0 )).xyz;
lightDir = normalize( lightDir );
- vec3 color = texture2D( color_tex, coords ).rgb;
+ vec4 color_material = texture2D( color_tex, coords );
+ vec3 color = color_material.rgb;
vec3 Idiff = clamp( dot( lightDir, normal ), 0.0, 1.0 ) * color * fg_SunDiffuseColor.rgb;
vec3 halfDir = normalize( lightDir - viewDir );
vec3 Ispec = vec3(0.0);
@@ -97,8 +98,8 @@ void main() {
if (cosAngIncidence > 0.0)
Ispec = pow( blinnTerm, spec_emis.y * 128.0 ) * spec_emis.x * fg_SunSpecularColor.rgb;
- float matID = texture2D( color_tex, coords ).a * 255.0;
- if (matID == 255.0)
+ float matID = color_material.a * 255.0;
+ if (matID >= 254.0) // 254: Water, 255: Ubershader
Idiff += Ispec * spec_emis.x;
gl_FragColor = vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0);
diff --git a/Shaders/ubershader-gbuffer.frag b/Shaders/ubershader-gbuffer.frag
index 60782195b..bfd2538f8 100644
--- a/Shaders/ubershader-gbuffer.frag
+++ b/Shaders/ubershader-gbuffer.frag
@@ -92,7 +92,7 @@ void main (void)
///END bump
vec4 reflection = textureCube(Environment, reflVec * N);
vec3 viewVec = normalize(vViewVec);
- float v = dot(viewVec, normalize(VNormal));// Map a rainbowish color
+ float v = abs(dot(viewVec, normalize(VNormal)));// Map a rainbowish color
vec4 fresnel = texture2D(ReflFresnelTex, vec2(v, 0.0));
vec4 rainbow = texture2D(ReflRainbowTex, vec2(v, 0.0));
vec4 color = gl_Color * gl_FrontMaterial.diffuse;
diff --git a/Shaders/ubershader.frag b/Shaders/ubershader.frag
index 6e135e8aa..51df2d02a 100644
--- a/Shaders/ubershader.frag
+++ b/Shaders/ubershader.frag
@@ -85,7 +85,7 @@ void main (void)
///END bump
vec4 reflection = textureCube(Environment, reflVec * dot(N,VNormal));
vec3 viewVec = normalize(vViewVec);
- float v = dot(viewVec, normalize(VNormal));// Map a rainbowish color
+ float v = abs(dot(viewVec, normalize(VNormal)));// Map a rainbowish color
vec4 fresnel = texture2D(ReflFresnelTex, vec2(v, 0.0));
vec4 rainbow = texture2D(ReflRainbowTex, vec2(v, 0.0));
diff --git a/Shaders/water-gbuffer.frag b/Shaders/water-gbuffer.frag
index ae1605f21..67f5dec86 100644
--- a/Shaders/water-gbuffer.frag
+++ b/Shaders/water-gbuffer.frag
@@ -207,5 +207,5 @@ void main(void)
vec3( 0.3, 0.59, 0.11 )
);
float specular = smoothstep(0.0, 3.5, cover);
- encode_gbuffer(Normal, finalColor.rgb, 255, specular, 128, emission, gl_FragCoord.z);
+ encode_gbuffer(Normal, finalColor.rgb, 254, specular, 128, emission, gl_FragCoord.z);
}
diff --git a/Shaders/water_sine-gbuffer.frag b/Shaders/water_sine-gbuffer.frag
index 5c63bcb92..64bb2e045 100644
--- a/Shaders/water_sine-gbuffer.frag
+++ b/Shaders/water_sine-gbuffer.frag
@@ -379,5 +379,5 @@ void main(void)
vec3( 0.3, 0.59, 0.11 )
);
float specular = smoothstep(0.0, 3.5, cover);
- encode_gbuffer(Normal, finalColor.rgb, 255, specular, water_shininess, emission, gl_FragCoord.z);
+ encode_gbuffer(Normal, finalColor.rgb, 254, specular, water_shininess, emission, gl_FragCoord.z);
}
diff --git a/Translations/de/menu.xml b/Translations/de/menu.xml
index a81f2d7df..0203f0df2 100644
--- a/Translations/de/menu.xml
+++ b/Translations/de/menu.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -46,7 +48,7 @@
<position-in-air>Flugzeug positionieren (in der Luft)</position-in-air> <!-- English: "Position Aircraft In Air" -->
<goto-airport>Flughafenauswahl</goto-airport> <!-- English: "Select Airport From List" -->
<random-attitude>Zuf�llige Fluglage</random-attitude> <!-- English: "Random Attitude" -->
- <tower-position>Kontrollturmposition festlegen</tower-position> <!-- English: "Tower Position" -->
+ <tower-position>Towerposition festlegen</tower-position> <!-- English: "Tower Position" -->
<!-- Autopilot menu -->
<autopilot>Autopilot</autopilot> <!-- English: "Autopilot" -->
@@ -79,10 +81,10 @@
<ai>KI</ai> <!-- English: "AI" -->
<scenario>Flugverkehr und Szenarien</scenario> <!-- English: "Traffic and Scenario Settings" -->
<atc-in-range>ATC Stationen in der N�he</atc-in-range> <!-- English: "ATC Services in Range" -->
- <wingman>Steuerung Fl�gelmann</wingman> <!-- English: "Wingman Controls" -->
- <tanker>Steuerung Tanker</tanker> <!-- English: "Tanker Controls" -->
- <carrier>Steuerung Flugzeugtr�ger</carrier> <!-- English: "Carrier Controls" -->
- <jetway>Steuerung Fluggastbr�cke</jetway> <!-- English: "Jetway Settings" -->
+ <wingman>Wingman</wingman> <!-- English: "Wingman Controls" -->
+ <tanker>Tanker</tanker> <!-- English: "Tanker Controls" -->
+ <carrier>Flugzeugtr�ger</carrier> <!-- English: "Carrier Controls" -->
+ <jetway>Jetway</jetway> <!-- English: "Jetway Settings" -->
<!-- Multiplayer menu -->
<multiplayer>Multiplayer</multiplayer> <!-- English: "Multiplayer" -->
@@ -102,6 +104,7 @@
<!-- <reload-panel>???</reload-panel> --> <!-- English: "Reload Panel" -->
<!-- <reload-autopilot>???</reload-autopilot> --> <!-- English: "Reload Autopilot" -->
<!-- <reload-network>???</reload-network> --> <!-- English: "Reload Network" -->
+<!-- <reload-model>???</reload-model> --> <!-- English: "Reload Aircraft Model" -->
<!-- <nasal-console>???</nasal-console> --> <!-- English: "Nasal Console" -->
<!-- <development-keys>???</development-keys> --> <!-- English: "Development Keys" -->
<!-- <configure-dev-extension>???</configure-dev-extension> --> <!-- English: "Configure Development Extensions" -->
@@ -119,12 +122,12 @@
<!-- Help menu -->
<help>Hilfe</help> <!-- English: "Help" -->
- <help-browser>Hilfe (�ffnet sich im Browser)</help-browser> <!-- English: "Help (opens in browser)" -->
- <aircraft-keys>Spezielle Hilfe zum aktuellen Flugzeug</aircraft-keys> <!-- English: "Aircraft Help" -->
- <common-keys>Allgemeine Hilfe zur Flugzeugsteuerung</common-keys> <!-- English: "Common Aircraft Keys" -->
- <basic-keys>Hilfe zur Simulatorsteuerung</basic-keys> <!-- English: "Basic Simulator Keys" -->
+ <help-browser>Hilfe (im Browser)</help-browser> <!-- English: "Help (opens in browser)" -->
+ <aircraft-keys>Flugzeug Hilfe</aircraft-keys> <!-- English: "Aircraft Help" -->
+ <common-keys>Tastenbelegung (Flugzeugsteuerung)</common-keys> <!-- English: "Common Aircraft Keys" -->
+ <basic-keys>Tastenbelegung (allgemein)</basic-keys> <!-- English: "Basic Simulator Keys" -->
<joystick-info>Joystick Informationen</joystick-info> <!-- English: "Joystick Information" -->
- <tutorial-start>�bungen und Anleitungen</tutorial-start> <!-- English: "Tutorials" -->
+ <tutorial-start>Tutorials</tutorial-start> <!-- English: "Tutorials" -->
<menu-about>�ber FlightGear</menu-about> <!-- English: "About" -->
</PropertyList>
diff --git a/Translations/de/options.xml b/Translations/de/options.xml
index f0c2c8a8c..b5e18faf3 100644
--- a/Translations/de/options.xml
+++ b/Translations/de/options.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -36,6 +38,7 @@
<!-- <enable-game-mode-desc>???</enable-game-mode-desc> --> <!-- English: "Enable full-screen game mode" -->
<!-- <disable-splash-screen-desc>???</disable-splash-screen-desc> --> <!-- English: "Disable splash screen" -->
<!-- <enable-splash-screen-desc>???</enable-splash-screen-desc> --> <!-- English: "Enable splash screen" -->
+<!-- <restore-defaults-desc>???</restore-defaults-desc> --> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
<!-- <disable-save-on-exit>???</disable-save-on-exit> --> <!-- English: "Don't save preferences upon program exit" -->
<!-- <enable-save-on-exit>???</enable-save-on-exit> --> <!-- English: "Allow saving preferences at program exit" -->
<!-- <disable-intro-music-desc>???</disable-intro-music-desc> --> <!-- English: "Disable introduction music" -->
@@ -45,6 +48,10 @@
<!-- <enable-mouse-pointer-desc n="1">???</enable-mouse-pointer-desc> --> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
<!-- <disable-random-objects-desc>???</disable-random-objects-desc> --> <!-- English: "Exclude random scenery objects" -->
<!-- <enable-random-objects-desc>???</enable-random-objects-desc> --> <!-- English: "Include random scenery objects" -->
+<!-- <disable-random-vegetation-desc>???</disable-random-vegetation-desc> --> <!-- English: "Exclude random vegetation objects" -->
+<!-- <enable-random-vegetation-desc>???</enable-random-vegetation-desc> --> <!-- English: "Include random vegetation objects" -->
+<!-- <disable-random-buildings-desc>???</disable-random-buildings-desc> --> <!-- English: "Exclude random buildings objects" -->
+<!-- <enable-random-buildings-desc>???</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
<!-- <disable-real-weather-fetch-desc>???</disable-real-weather-fetch-desc> --> <!-- English: "Disable METAR based real weather fetching" -->
<!-- <enable-real-weather-fetch-desc>???</enable-real-weather-fetch-desc> --> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
<!-- <metar-desc>???</metar-desc> --> <!-- English: "Pass a METAR to set up static weather" -->
diff --git a/Translations/en/menu.xml b/Translations/en/menu.xml
index d6ee002d8..6e1d6be1f 100644
--- a/Translations/en/menu.xml
+++ b/Translations/en/menu.xml
@@ -87,6 +87,7 @@
<reload-panel>Reload Panel</reload-panel>
<reload-autopilot>Reload Autopilot</reload-autopilot>
<reload-network>Reload Network</reload-network>
+ <reload-model>Reload Aircraft Model</reload-model>
<nasal-console>Nasal Console</nasal-console>
<development-keys>Development Keys</development-keys>
<configure-dev-extension>Configure Development Extensions</configure-dev-extension>
diff --git a/Translations/en/options.xml b/Translations/en/options.xml
index 152b0fe3a..ac3001e40 100644
--- a/Translations/en/options.xml
+++ b/Translations/en/options.xml
@@ -21,6 +21,7 @@
<enable-game-mode-desc>Enable full-screen game mode</enable-game-mode-desc>
<disable-splash-screen-desc>Disable splash screen</disable-splash-screen-desc>
<enable-splash-screen-desc>Enable splash screen</enable-splash-screen-desc>
+ <restore-defaults-desc>Reset all user settings to their defaults (rendering options etc)</restore-defaults-desc>
<disable-save-on-exit>Don't save preferences upon program exit</disable-save-on-exit>
<enable-save-on-exit>Allow saving preferences at program exit</enable-save-on-exit>
<disable-intro-music-desc>Disable introduction music</disable-intro-music-desc>
@@ -30,6 +31,10 @@
<enable-mouse-pointer-desc n="1">(i.e. for full screen Voodoo based cards)</enable-mouse-pointer-desc>
<disable-random-objects-desc>Exclude random scenery objects</disable-random-objects-desc>
<enable-random-objects-desc>Include random scenery objects</enable-random-objects-desc>
+ <disable-random-vegetation-desc>Exclude random vegetation objects</disable-random-vegetation-desc>
+ <enable-random-vegetation-desc>Include random vegetation objects</enable-random-vegetation-desc>
+ <disable-random-buildings-desc>Exclude random buildings objects</disable-random-buildings-desc>
+ <enable-random-buildings-desc>Include random buildings objects</enable-random-buildings-desc>
<disable-real-weather-fetch-desc>Disable METAR based real weather fetching</disable-real-weather-fetch-desc>
<enable-real-weather-fetch-desc>Enable METAR based real weather fetching (this requires an open internet connection)</enable-real-weather-fetch-desc>
<metar-desc>Pass a METAR to set up static weather</metar-desc>
diff --git a/Translations/es/menu.xml b/Translations/es/menu.xml
index 42bcfeb8d..78ae5e48c 100644
--- a/Translations/es/menu.xml
+++ b/Translations/es/menu.xml
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- FlightGear menu: Spanish language resource -->
-
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear menu: Spanish language resource -->
+
<!-- ###
### This file is automatically synchronized with the master (=English language) resource.
### Please do not add comments, change order or restructure the file.
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,116 +17,117 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
### -->
<PropertyList>
<!-- File menu -->
<file>Archivo</file> <!-- English: "File" -->
<reset>Reset</reset> <!-- English: "Reset" -->
- <snap-shot>Fotograf�a</snap-shot> <!-- English: "Screenshot " -->
-<!-- <snap-shot-dir>???</snap-shot-dir> --> <!-- English: "Screenshot Directory" -->
-<!-- <sound-config>???</sound-config> --> <!-- English: "Sound Configuration" -->
- <exit>Salir</exit> <!-- English: "Quit " -->
+ <snap-shot>Capturar pantalla</snap-shot> <!-- English: "Screenshot " -->
+ <snap-shot-dir>Directorio capturas</snap-shot-dir> <!-- English: "Screenshot Directory" -->
+ <sound-config>Configurar sonido</sound-config> <!-- English: "Sound Configuration" -->
+ <exit>Salir </exit> <!-- English: "Quit " -->
<!-- View menu -->
- <view>Visualizar</view> <!-- English: "View" -->
-<!-- <display-options>???</display-options> --> <!-- English: "Display Options" -->
-<!-- <rendering-options>???</rendering-options> --> <!-- English: "Rendering Options" -->
-<!-- <view-options>???</view-options> --> <!-- English: "View Options" -->
-<!-- <cockpit-view-options>???</cockpit-view-options> --> <!-- English: "Cockpit View Options" -->
-<!-- <adjust-lod>???</adjust-lod> --> <!-- English: "Adjust LOD Ranges" -->
+ <view>Vista</view> <!-- English: "View" -->
+ <display-options>Opciones visualizaci�n</display-options> <!-- English: "Display Options" -->
+ <rendering-options>Opciones renderizado</rendering-options> <!-- English: "Rendering Options" -->
+ <view-options>Opciones de vistas</view-options> <!-- English: "View Options" -->
+ <cockpit-view-options>Opciones de vista de cabina</cockpit-view-options> <!-- English: "Cockpit View Options" -->
+ <adjust-lod>Nivel de detalle</adjust-lod> <!-- English: "Adjust LOD Ranges" -->
<pilot-offset>Posici�n del piloto</pilot-offset> <!-- English: "Adjust View Position" -->
-<!-- <adjust-hud>???</adjust-hud> --> <!-- English: "Adjust HUD Properties" -->
-<!-- <toggle-glide-slope>???</toggle-glide-slope> --> <!-- English: "Toggle Glide Slope Tunnel" -->
-<!-- <replay>???</replay> --> <!-- English: "Instant Replay" -->
-<!-- <stereoscopic-options>???</stereoscopic-options> --> <!-- English: "Stereoscopic View Options" -->
+ <adjust-hud>Cambiar Propiedades del HUD</adjust-hud> <!-- English: "Adjust HUD Properties" -->
+ <toggle-glide-slope>Activar senda de planeo</toggle-glide-slope> <!-- English: "Toggle Glide Slope Tunnel" -->
+ <replay>Replay instant�neo</replay> <!-- English: "Instant Replay" -->
+ <stereoscopic-options>Opciones vista estereosc�pica</stereoscopic-options> <!-- English: "Stereoscopic View Options" -->
<!-- Location menu -->
-<!-- <location>???</location> --> <!-- English: "Location" -->
-<!-- <position-on-ground>???</position-on-ground> --> <!-- English: "Position Aircraft On Ground" -->
-<!-- <position-in-air>???</position-in-air> --> <!-- English: "Position Aircraft In Air" -->
-<!-- <goto-airport>???</goto-airport> --> <!-- English: "Select Airport From List" -->
-<!-- <random-attitude>???</random-attitude> --> <!-- English: "Random Attitude" -->
-<!-- <tower-position>???</tower-position> --> <!-- English: "Tower Position" -->
+ <location>Localizaci�n</location> <!-- English: "Location" -->
+ <position-on-ground>Ubicar aeronave en tierra</position-on-ground> <!-- English: "Position Aircraft On Ground" -->
+ <position-in-air>Ubicar aeronave en vuelo</position-in-air> <!-- English: "Position Aircraft In Air" -->
+ <goto-airport>Seleccionar aeropuerto en listado</goto-airport> <!-- English: "Select Airport From List" -->
+ <random-attitude>Direcci�n al azar</random-attitude> <!-- English: "Random Attitude" -->
+ <tower-position>Posici�n de la torre</tower-position> <!-- English: "Tower Position" -->
<!-- Autopilot menu -->
<autopilot>Autopiloto</autopilot> <!-- English: "Autopilot" -->
-<!-- <autopilot-settings>???</autopilot-settings> --> <!-- English: "Autopilot Settings" -->
-<!-- <route-manager>???</route-manager> --> <!-- English: "Route Manager" -->
-<!-- <previous-waypoint>???</previous-waypoint> --> <!-- English: "Previous Waypoint" -->
-<!-- <next-waypoint>???</next-waypoint> --> <!-- English: "Next Waypoint" -->
+ <autopilot-settings>Configurar AP</autopilot-settings> <!-- English: "Autopilot Settings" -->
+ <route-manager>Configurar rutas</route-manager> <!-- English: "Route Manager" -->
+ <previous-waypoint>Waypoint previo</previous-waypoint> <!-- English: "Previous Waypoint" -->
+ <next-waypoint>Waypoint siguiente</next-waypoint> <!-- English: "Next Waypoint" -->
<!-- Environment menu -->
-<!-- <environment>???</environment> --> <!-- English: "Environment" -->
-<!-- <global-weather>???</global-weather> --> <!-- English: "Weather" -->
-<!-- <time-settings>???</time-settings> --> <!-- English: "Time Settings" -->
-<!-- <wildfire-settings>???</wildfire-settings> --> <!-- English: "Wildfire Settings" -->
-<!-- <terrasync>???</terrasync> --> <!-- English: "Scenery Download" -->
+ <environment>Ambiente</environment> <!-- English: "Environment" -->
+ <global-weather>Clima</global-weather> <!-- English: "Weather" -->
+ <time-settings>Configurar horario</time-settings> <!-- English: "Time Settings" -->
+ <wildfire-settings>Configurar incendios</wildfire-settings> <!-- English: "Wildfire Settings" -->
+ <terrasync>Descargar escenarios</terrasync> <!-- English: "Scenery Download" -->
<!-- Equipment menu -->
-<!-- <equipment>???</equipment> --> <!-- English: "Equipment" -->
-<!-- <map>???</map> --> <!-- English: "Map" -->
-<!-- <stopwatch>???</stopwatch> --> <!-- English: "Stopwatch" -->
-<!-- <fuel-and-payload>???</fuel-and-payload> --> <!-- English: "Fuel and Payload" -->
-<!-- <radio>???</radio> --> <!-- English: "Radio Settings" -->
-<!-- <gps>???</gps> --> <!-- English: "GPS Settings" -->
-<!-- <instrument-settings>???</instrument-settings> --> <!-- English: "Instrument Settings" -->
-<!-- <failure-submenu>???</failure-submenu> --> <!-- English: " -_- Failures -_-" -->
-<!-- <random-failures>???</random-failures> --> <!-- English: "Random Failures" -->
-<!-- <system-failures>???</system-failures> --> <!-- English: "System Failures" -->
-<!-- <instrument-failures>???</instrument-failures> --> <!-- English: "Instrument Failures" -->
+ <equipment>Equipamiento</equipment> <!-- English: "Equipment" -->
+ <map>Mapa</map> <!-- English: "Map" -->
+ <stopwatch>Cron�metro</stopwatch> <!-- English: "Stopwatch" -->
+ <fuel-and-payload>Combustible y cargamento</fuel-and-payload> <!-- English: "Fuel and Payload" -->
+ <radio>Configurar radio</radio> <!-- English: "Radio Settings" -->
+ <gps>Configurar GPS</gps> <!-- English: "GPS Settings" -->
+ <instrument-settings>Configurar instrumentos</instrument-settings> <!-- English: "Instrument Settings" -->
+ <failure-submenu> --- Fallas ---</failure-submenu> <!-- English: " -_- Failures -_-" -->
+ <random-failures>Fallas al azar</random-failures> <!-- English: "Random Failures" -->
+ <system-failures>Fallas de sistemas</system-failures> <!-- English: "System Failures" -->
+ <instrument-failures>Fallas de instrumental</instrument-failures> <!-- English: "Instrument Failures" -->
<!-- AI menu -->
-<!-- <ai>???</ai> --> <!-- English: "AI" -->
-<!-- <scenario>???</scenario> --> <!-- English: "Traffic and Scenario Settings" -->
-<!-- <atc-in-range>???</atc-in-range> --> <!-- English: "ATC Services in Range" -->
-<!-- <wingman>???</wingman> --> <!-- English: "Wingman Controls" -->
-<!-- <tanker>???</tanker> --> <!-- English: "Tanker Controls" -->
-<!-- <carrier>???</carrier> --> <!-- English: "Carrier Controls" -->
-<!-- <jetway>???</jetway> --> <!-- English: "Jetway Settings" -->
+ <ai>IA</ai> <!-- English: "AI" -->
+ <scenario>Configurar tr�fico y escenarios</scenario> <!-- English: "Traffic and Scenario Settings" -->
+ <atc-in-range>Servicios ATC en cercan�a</atc-in-range> <!-- English: "ATC Services in Range" -->
+ <wingman>Controles vuelo en formaci�n</wingman> <!-- English: "Wingman Controls" -->
+ <tanker>Controles reabastecimiento en vuelo</tanker> <!-- English: "Tanker Controls" -->
+ <carrier>Controles portaaviones</carrier> <!-- English: "Carrier Controls" -->
+ <jetway>Configurar manga</jetway> <!-- English: "Jetway Settings" -->
<!-- Multiplayer menu -->
-<!-- <multiplayer>???</multiplayer> --> <!-- English: "Multiplayer" -->
-<!-- <mp-settings>???</mp-settings> --> <!-- English: "Multiplayer Settings" -->
-<!-- <mp-chat>???</mp-chat> --> <!-- English: "Chat Dialog" -->
-<!-- <mp-chat-menu>???</mp-chat-menu> --> <!-- English: "Chat Menu" -->
-<!-- <mp-list>???</mp-list> --> <!-- English: "Pilot List" -->
-<!-- <mp-carrier>???</mp-carrier> --> <!-- English: "MPCarrier Selection" -->
+ <multiplayer>Multijugador</multiplayer> <!-- English: "Multiplayer" -->
+ <mp-settings>Configuraci�n multijugador</mp-settings> <!-- English: "Multiplayer Settings" -->
+ <mp-chat>Ventana de chat</mp-chat> <!-- English: "Chat Dialog" -->
+ <mp-chat-menu>Men� de chat</mp-chat-menu> <!-- English: "Chat Menu" -->
+ <mp-list>Lista de pilotos</mp-list> <!-- English: "Pilot List" -->
+ <mp-carrier>Selecci�n de portaaviones multijugador</mp-carrier> <!-- English: "MPCarrier Selection" -->
<!-- Debug menu -->
-<!-- <debug>???</debug> --> <!-- English: "Debug" -->
+ <debug>Debug</debug> <!-- English: "Debug" -->
<!-- Note: Debug menu items may not need to be translated
since these options are not useful to end users anyway. -->
-<!-- <reload-gui>???</reload-gui> --> <!-- English: "Reload GUI" -->
-<!-- <reload-input>???</reload-input> --> <!-- English: "Reload Input" -->
-<!-- <reload-hud>???</reload-hud> --> <!-- English: "Reload HUD" -->
-<!-- <reload-panel>???</reload-panel> --> <!-- English: "Reload Panel" -->
-<!-- <reload-autopilot>???</reload-autopilot> --> <!-- English: "Reload Autopilot" -->
-<!-- <reload-network>???</reload-network> --> <!-- English: "Reload Network" -->
-<!-- <nasal-console>???</nasal-console> --> <!-- English: "Nasal Console" -->
-<!-- <development-keys>???</development-keys> --> <!-- English: "Development Keys" -->
-<!-- <configure-dev-extension>???</configure-dev-extension> --> <!-- English: "Configure Development Extensions" -->
-<!-- <display-marker>???</display-marker> --> <!-- English: "Display Tutorial Marker" -->
-<!-- <dump-scene-graph>???</dump-scene-graph> --> <!-- English: "Dump Scene Graph" -->
-<!-- <print-rendering-statistics>???</print-rendering-statistics> --> <!-- English: "Print Rendering Statistics" -->
-<!-- <statistics-display>???</statistics-display> --> <!-- English: "Cycle On-Screen Statistics" -->
-<!-- <performance-monitor>???</performance-monitor> --> <!-- English: "Monitor System Performance" -->
-<!-- <property-browser>???</property-browser> --> <!-- English: "Browse Internal Properties" -->
-<!-- <logging>???</logging> --> <!-- English: "Logging" -->
-<!-- <local_weather>???</local_weather> --> <!-- English: "Local Weather (Test)" -->
-<!-- <print-scene-info>???</print-scene-info> --> <!-- English: "Print Visible Scene Info" -->
-<!-- <rendering-buffers>???</rendering-buffers> --> <!-- English: "Hide/Show Rendering Buffers" -->
-<!-- <rembrandt-buffers-choice>???</rembrandt-buffers-choice> --> <!-- English: "Select Rendering Buffers" -->
+ <reload-gui>Reiniciar interfaz gr�fica</reload-gui> <!-- English: "Reload GUI" -->
+ <reload-input>Reiniciar interfaz de control</reload-input> <!-- English: "Reload Input" -->
+ <reload-hud>Reiniciar HUD</reload-hud> <!-- English: "Reload HUD" -->
+ <reload-panel>Reiniciar panel</reload-panel> <!-- English: "Reload Panel" -->
+ <reload-autopilot>Reiniciar autopiloto</reload-autopilot> <!-- English: "Reload Autopilot" -->
+ <reload-network>Reiniciar conexi�n de red</reload-network> <!-- English: "Reload Network" -->
+ <reload-model>Recargar modelo de la aeronave</reload-model> <!-- English: "Reload Aircraft Model" -->
+ <nasal-console>Consola nasal</nasal-console> <!-- English: "Nasal Console" -->
+ <development-keys>Teclas de desarrollo</development-keys> <!-- English: "Development Keys" -->
+ <configure-dev-extension>Configurar extensiones de desarrollo</configure-dev-extension> <!-- English: "Configure Development Extensions" -->
+ <display-marker>Mostrar marcadores de tutorial</display-marker> <!-- English: "Display Tutorial Marker" -->
+ <dump-scene-graph>Mostrar datos escena gr�fica</dump-scene-graph> <!-- English: "Dump Scene Graph" -->
+ <print-rendering-statistics>Mostrar estad�sticas de renderizado</print-rendering-statistics> <!-- English: "Print Rendering Statistics" -->
+ <statistics-display>Mostrar estad�sticas en pantalla</statistics-display> <!-- English: "Cycle On-Screen Statistics" -->
+ <performance-monitor>Monitor de performance del sistema</performance-monitor> <!-- English: "Monitor System Performance" -->
+ <property-browser>Visor de propiedades internas</property-browser> <!-- English: "Browse Internal Properties" -->
+ <logging>Registro</logging> <!-- English: "Logging" -->
+ <local_weather>Clima local (pruebas)</local_weather> <!-- English: "Local Weather (Test)" -->
+ <print-scene-info>Informaci�n escena visible</print-scene-info> <!-- English: "Print Visible Scene Info" -->
+ <rendering-buffers>Ocultar/Mostrar buffers de renderizado</rendering-buffers> <!-- English: "Hide/Show Rendering Buffers" -->
+ <rembrandt-buffers-choice>Seleccionar buffers de renderizado</rembrandt-buffers-choice> <!-- English: "Select Rendering Buffers" -->
<!-- Help menu -->
<help>Ayuda</help> <!-- English: "Help" -->
-<!-- <help-browser>???</help-browser> --> <!-- English: "Help (opens in browser)" -->
-<!-- <aircraft-keys>???</aircraft-keys> --> <!-- English: "Aircraft Help" -->
-<!-- <common-keys>???</common-keys> --> <!-- English: "Common Aircraft Keys" -->
-<!-- <basic-keys>???</basic-keys> --> <!-- English: "Basic Simulator Keys" -->
-<!-- <joystick-info>???</joystick-info> --> <!-- English: "Joystick Information" -->
-<!-- <tutorial-start>???</tutorial-start> --> <!-- English: "Tutorials" -->
-<!-- <menu-about>???</menu-about> --> <!-- English: "About" -->
+ <help-browser>Ayuda (abre en el navegador)</help-browser> <!-- English: "Help (opens in browser)" -->
+ <aircraft-keys>Ayuda de aeronave</aircraft-keys> <!-- English: "Aircraft Help" -->
+ <common-keys>Teclas comunes a toda aeronave</common-keys> <!-- English: "Common Aircraft Keys" -->
+ <basic-keys>Teclas b�sicas del simulador</basic-keys> <!-- English: "Basic Simulator Keys" -->
+ <joystick-info>Informaci�n de joystick</joystick-info> <!-- English: "Joystick Information" -->
+ <tutorial-start>Tutoriales</tutorial-start> <!-- English: "Tutorials" -->
+ <menu-about>Acerca de</menu-about> <!-- English: "About" -->
</PropertyList>
diff --git a/Translations/es/options.xml b/Translations/es/options.xml
index d3a4f921b..4332f8c30 100644
--- a/Translations/es/options.xml
+++ b/Translations/es/options.xml
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- FlightGear options: Spanish language resource -->
-
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear options: Spanish language resource -->
+
<!-- ###
### This file is automatically synchronized with the master (=English language) resource.
### Please do not add comments, change order or restructure the file.
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,11 +17,11 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
- <usage>Usage: fgfs [ opci�n ... ]</usage> <!-- English: "Usage: fgfs [ option ... ]" -->
+ <usage>Modo de empleo: fgfs [ opci�n ... ]</usage> <!-- English: "Usage: fgfs [ option ... ]" -->
<verbose-help>Para una lista completa de opciones use --help --verbose</verbose-help> <!-- English: "For a complete list of options use -_help -_verbose" -->
<!-- General options -->
@@ -30,12 +32,13 @@
<fg-root-desc>Especifica la ruta b�sica a los datos</fg-root-desc> <!-- English: "Specify the root data path" -->
<fg-scenery-desc n="0">Especifica la ruta b�sica a las escenograf�as;</fg-scenery-desc> <!-- English: "Specify the scenery path(s);" -->
<fg-scenery-desc n="1">Por defecto falla a $FG_ROOT/Scenery</fg-scenery-desc> <!-- English: "Defaults to $FG_ROOT/Scenery" -->
-<!-- <fg-aircraft-desc>???</fg-aircraft-desc> --> <!-- English: "Specify additional aircraft directory path(s)" -->
+ <fg-aircraft-desc>Especifica la ruta a directorios de aeronaves adicionales</fg-aircraft-desc> <!-- English: "Specify additional aircraft directory path(s)" -->
<language-desc>Selecciona el idioma para esta sesi�n</language-desc> <!-- English: "Select the language for this session" -->
<disable-game-mode-desc>Desactiva el modo de pantalla completa</disable-game-mode-desc> <!-- English: "Disable full-screen game mode" -->
<enable-game-mode-desc>Activa el modo de pantalla completa</enable-game-mode-desc> <!-- English: "Enable full-screen game mode" -->
<disable-splash-screen-desc>Desactiva splash screen</disable-splash-screen-desc> <!-- English: "Disable splash screen" -->
<enable-splash-screen-desc>Activa splash screen</enable-splash-screen-desc> <!-- English: "Enable splash screen" -->
+ <restore-defaults-desc>Restaurar todas las configuraciones a las iniciales (opciones de renderizado, etc)</restore-defaults-desc> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
<disable-save-on-exit>No guardar las preferencias al salir del programa</disable-save-on-exit> <!-- English: "Don't save preferences upon program exit" -->
<enable-save-on-exit>Permitir guardar las preferencias al salir del programa</enable-save-on-exit> <!-- English: "Allow saving preferences at program exit" -->
<disable-intro-music-desc>Desactiva la introducci�n musical</disable-intro-music-desc> <!-- English: "Disable introduction music" -->
@@ -45,15 +48,19 @@
<enable-mouse-pointer-desc n="1">(p.ej. para tarjetas tipo Voodoo a pantalla completa)</enable-mouse-pointer-desc> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
<disable-random-objects-desc>Excluir objetos aleatorios de escenograf�a</disable-random-objects-desc> <!-- English: "Exclude random scenery objects" -->
<enable-random-objects-desc>Incluir objetos aleatorios de escenograf�a</enable-random-objects-desc> <!-- English: "Include random scenery objects" -->
+ <disable-random-vegetation-desc>Excluir objetos aleatorios de vegetaci�n</disable-random-vegetation-desc> <!-- English: "Exclude random vegetation objects" -->
+ <enable-random-vegetation-desc>Incluir objetos aleatorios de vegetaci�n</enable-random-vegetation-desc> <!-- English: "Include random vegetation objects" -->
+ <disable-random-buildings-desc>Excluir edificios aleatorios</disable-random-buildings-desc> <!-- English: "Exclude random buildings objects" -->
+ <enable-random-buildings-desc>Incluir edificios aleatorios</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
<disable-real-weather-fetch-desc>Desactiva la recogida de meteo real basada en METAR</disable-real-weather-fetch-desc> <!-- English: "Disable METAR based real weather fetching" -->
- <enable-real-weather-fetch-desc>Activa la recogida de meteo real basada en METAR(esto requiere una conexi�n abierta a internet)</enable-real-weather-fetch-desc> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
+ <enable-real-weather-fetch-desc>Activa la recogida de meteo real basada en METAR (esto requiere una conexi�n a Internet)</enable-real-weather-fetch-desc> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
<metar-desc>Pasar una METAR para establecer una meteo est�tica</metar-desc> <!-- English: "Pass a METAR to set up static weather" -->
<random-objects-desc>(edificios, etc.)</random-objects-desc> <!-- English: "(buildings, etc.)" -->
- <disable-ai-models-desc>Desactiva el subsistema de tr�fico artificial.</disable-ai-models-desc> <!-- English: "Deprecated option (disable internal AI subsystem)" -->
+ <disable-ai-models-desc>Opci�n en desuso mantenida por compatibilidad (Desactiva el subsistema de tr�fico artificial)</disable-ai-models-desc> <!-- English: "Deprecated option (disable internal AI subsystem)" -->
<enable-ai-models-desc>Activa el tr�fico artificial.</enable-ai-models-desc> <!-- English: "Enable AI subsystem (required for multi-player, AI traffic and many other animations)" -->
-<!-- <disable-ai-traffic-desc>???</disable-ai-traffic-desc> --> <!-- English: "Disable artificial traffic." -->
-<!-- <enable-ai-traffic-desc>???</enable-ai-traffic-desc> --> <!-- English: "Enable artificial traffic." -->
-<!-- <disable-ai-scenarios>???</disable-ai-scenarios> --> <!-- English: "Disable all AI scenarios." -->
+ <disable-ai-traffic-desc>Desactiva el tr�fico artificial.</disable-ai-traffic-desc> <!-- English: "Disable artificial traffic." -->
+ <enable-ai-traffic-desc>Activa el tr�fico artificial.</enable-ai-traffic-desc> <!-- English: "Enable artificial traffic." -->
+ <disable-ai-scenarios>Desactiva todos los escenarios AI</disable-ai-scenarios> <!-- English: "Disable all AI scenarios." -->
<ai-scenario>A�ade y activa un nuevo escenario. Se permite m�ltiples opciones.</ai-scenario> <!-- English: "Add and enable a new scenario. Multiple options are allowed." -->
<disable-freeze-desc>Comenzar en un estado arrancado</disable-freeze-desc> <!-- English: "Start in a running state" -->
<enable-freeze-desc>Comenzar en un estado congelado</enable-freeze-desc> <!-- English: "Start in a frozen state" -->
@@ -79,15 +86,15 @@
<enable-panel-desc>Activa el panel de instrumentos</enable-panel-desc> <!-- English: "Enable instrument panel" -->
<disable-anti-alias-hud-desc>Desactiva el HUD sin distorsi�n (anti-aliased)</disable-anti-alias-hud-desc> <!-- English: "Disable anti-aliased HUD" -->
<enable-anti-alias-hud-desc>Activa el HUD sin distorsi�n (anti-aliased)</enable-anti-alias-hud-desc> <!-- English: "Enable anti-aliased HUD" -->
- <disable-hud-3d-desc>Desactiva el 3D HUD</disable-hud-3d-desc> <!-- English: "Disable 3D HUD" -->
- <enable-hud-3d-desc>Activa el 3D HUD</enable-hud-3d-desc> <!-- English: "Enable 3D HUD" -->
+ <disable-hud-3d-desc>Desactiva el HUD 3D</disable-hud-3d-desc> <!-- English: "Disable 3D HUD" -->
+ <enable-hud-3d-desc>Activa el HUD 3D</enable-hud-3d-desc> <!-- English: "Enable 3D HUD" -->
<!-- Aircraft options -->
<aircraft-options>Aeronave</aircraft-options> <!-- English: "Aircraft" -->
<aircraft-desc>Selecciona un perfil de aeronave definido por el <nombre>-set.xml de nivel superior</aircraft-desc> <!-- English: "Select an aircraft profile as defined by a top level <name>-set.xml" -->
<show-aircraft-desc>Muestra una lista de los tipos de aeronaves actualmente disponibles</show-aircraft-desc> <!-- English: "Print a list of the currently available aircraft types" -->
<min-aircraft-status>Permite que definas un nivel de status m�nimo (=estado de desarollo) para todas las aeronaves listadas</min-aircraft-status> <!-- English: "Allows you to define a minimum status level (=development status) for all listed aircraft" -->
- <vehicle-desc>Selecciona un perfill de vehiculo definido por un <nombre>-set.xml de nivel superior</vehicle-desc> <!-- English: "Select an vehicle profile as defined by a top level <name>-set.xml" -->
+ <vehicle-desc>Selecciona un perfil de veh�culo definido por un <nombre>-set.xml de nivel superior</vehicle-desc> <!-- English: "Select an vehicle profile as defined by a top level <name>-set.xml" -->
<livery-desc>Selecciona la librea (insignia, emblema) de la aeronave</livery-desc> <!-- English: "Select aircraft livery" -->
<!-- Flight Dynamics Model options -->
@@ -103,13 +110,13 @@
<trim-desc n="1">(solo con fdm=jsbsim)</trim-desc> <!-- English: "(only with fdm=jsbsim)" -->
<on-ground-desc>Comenzar a nivel de tierra (por defecto)</on-ground-desc> <!-- English: "Start at ground level (default)" -->
<in-air-desc>Comenzar en el aire (implicado cuando se usa --altitude)</in-air-desc> <!-- English: "Start in air (implied when using -_altitude)" -->
- <wind-desc>Especifica el viento llagando desde DIRECCION (grados) at VELOCIDAD (nudos)</wind-desc> <!-- English: "Specify wind coming from DIR (degrees) at SPEED (knots)" -->
+ <wind-desc>Especifica el viento llegando desde DIRECCION (grados) a VELOCIDAD (nudos)</wind-desc> <!-- English: "Specify wind coming from DIR (degrees) at SPEED (knots)" -->
<random-wind-desc>Establece vientos de direccion y velocidad aleatorios</random-wind-desc> <!-- English: "Set up random wind direction and speed" -->
<turbulence-desc>Especifica turbulencias desde 0.0 (calmadas) to 1.0 (severas)</turbulence-desc> <!-- English: "Specify turbulence from 0.0 (calm) to 1.0 (severe)" -->
<ceiling-desc>Crear un techo encapotado, opcionalmente con un grosor espec�fico (por defecto a los 2000 pies).</ceiling-desc> <!-- English: "Create an overcast ceiling, optionally with a specific thickness (defaults to 2000 ft)." -->
<aircraft-dir-desc>Directorio de aeronaves relativo a la ruta del ejecutable</aircraft-dir-desc> <!-- English: "Aircraft directory relative to the path of the executable" -->
- <aircraft-model-options>Directorio de modelos de aeronaves(SOLO UIUC FDM)</aircraft-model-options> <!-- English: "Aircraft model directory (UIUC FDM ONLY)" -->
+ <aircraft-model-options>Directorio de modelos de aeronaves (SOLO UIUC FDM)</aircraft-model-options> <!-- English: "Aircraft model directory (UIUC FDM ONLY)" -->
<!-- Position and Orientation options -->
<position-options>posici�n y orientacion iniciales</position-options> <!-- English: "Initial Position and Orientation" -->
@@ -121,14 +128,14 @@
<!-- <vor-freq-desc>???</vor-freq-desc> --> <!-- English: "Specify the frequency of the VOR. Use with -_vor=ID" -->
<ndb-desc>Especifica la posici�n de comienzo relativa a un NDB</ndb-desc> <!-- English: "Specify starting position relative to an NDB" -->
<!-- <ndb-freq-desc>???</ndb-freq-desc> --> <!-- English: "Specify the frequency of the NDB. Use with -_ndb=ID" -->
- <fix-desc>Especificas la posici�n de comienzo relativa a un fijo</fix-desc> <!-- English: "Specify starting position relative to a fix" -->
- <runway-no-desc>Especificastarting runway (must also specify an airport)</runway-no-desc> <!-- English: "Specify starting runway (must also specify an airport)" -->
+ <fix-desc>Especifica la posici�n de comienzo relativa a un fijo</fix-desc> <!-- English: "Specify starting position relative to a fix" -->
+ <runway-no-desc>Especifica pista inicial (se debe especificar adem�s el aeropuerto)</runway-no-desc> <!-- English: "Specify starting runway (must also specify an airport)" -->
<offset-distance-desc>Especifica la distancia al punto de referencia (en millas estatutarias: statute miles)</offset-distance-desc> <!-- English: "Specify distance to reference point (statute miles)" -->
<offset-azimuth-desc>Especifica la direccion al punto de referencia</offset-azimuth-desc> <!-- English: "Specify heading to reference point" -->
<lon-desc>Longitud de comienzo (oeste = -)</lon-desc> <!-- English: "Starting longitude (west = -)" -->
<lat-desc>Latitud de comienzo (sur = -)</lat-desc> <!-- English: "Starting latitude (south = -)" -->
<altitude-desc>Altitud de comienzo</altitude-desc> <!-- English: "Starting altitude" -->
- <heading-desc>Especifica el �ngulo de la direccion (gi�ada) (Psi)</heading-desc> <!-- English: "Specify heading (yaw) angle (Psi)" -->
+ <heading-desc>Especifica el �ngulo de la direccion (gui�ada/yaw) (Psi)</heading-desc> <!-- English: "Specify heading (yaw) angle (Psi)" -->
<roll-desc>Especifica el �ngulo de alabeo (Phi)</roll-desc> <!-- English: "Specify roll angle (Phi)" -->
<pitch-desc>Especifica el �ngulo de cabeceo (Theta)</pitch-desc> <!-- English: "Specify pitch angle (Theta)" -->
<uBody-desc>Especifica la velocidad por el eje X del cuerpo</uBody-desc> <!-- English: "Specify velocity along the body X axis" -->
@@ -150,7 +157,7 @@
<sound-device-desc>Explicitamente especifica el dispositivo de audio a usar</sound-device-desc> <!-- English: "Explicitly specify the audio device to use" -->
<!-- Rendering options -->
- <rendering-options>Opciones de Renderizaci�n</rendering-options> <!-- English: "Rendering Options" -->
+ <rendering-options>Opciones de Renderizado</rendering-options> <!-- English: "Rendering Options" -->
<bpp-desc>Especifica los bits por pixel</bpp-desc> <!-- English: "Specify the bits per pixel" -->
<fog-disable-desc>Desactiva la niebla/bruma</fog-disable-desc> <!-- English: "Disable fog/haze" -->
<fog-fastest-desc>Activa la mas r�pida niebla/bruma</fog-fastest-desc> <!-- English: "Enable fastest fog/haze" -->
@@ -177,19 +184,19 @@
<enable-skyblend-desc>Activa el gradiente en el cielo</enable-skyblend-desc> <!-- English: "Enable sky blending" -->
<disable-textures-desc>Desactiva las texturas</disable-textures-desc> <!-- English: "Disable textures" -->
<enable-textures-desc>Activa las texturas</enable-textures-desc> <!-- English: "Enable textures" -->
-<!-- <materials-file-desc>???</materials-file-desc> --> <!-- English: "Specify the materials file used to render the scenery (default: materials.xml)" -->
+ <materials-file-desc>Especifica el archivo de materiales usado para renderizar el escenario (por defecto: materials.xml)</materials-file-desc> <!-- English: "Specify the materials file used to render the scenery (default: materials.xml)" -->
<texture-filtering-desc>Filtrado Anisotr�pico de Textura: los valores deberian ser 1 (defecto),2,4,8 o 16</texture-filtering-desc> <!-- English: "Anisotropic Texture Filtering: values should be 1 (default),2,4,8 or 16" -->
<disable-wireframe-desc>Desactiva el modo de dibujo de esqueletos</disable-wireframe-desc> <!-- English: "Disable wireframe drawing mode" -->
<enable-wireframe-desc>Activa el modo de dibujo de esqueletos</enable-wireframe-desc> <!-- English: "Enable wireframe drawing mode" -->
<geometry-desc>Especifica la geometr�a de ventanas(640x480, etc)</geometry-desc> <!-- English: "Specify window geometry (640x480, etc)" -->
- <view-offset-desc>Especifica la direcci�n por defecto de la vista hacia el frente como un incremento desde delante. Valores v�lidos son LEFT (izq.), RIGHT (dch.), CENTER (centro), o un n+umero dado de grados</view-offset-desc> <!-- English: "Specify the default forward view direction as an offset from straight ahead. Allowable values are LEFT, RIGHT, CENTER, or a specific number in degrees" -->
+ <view-offset-desc>Especifica la direcci�n por defecto de la vista hacia el frente como un incremento desde delante. Valores v�lidos son LEFT (izq.), RIGHT (dch.), CENTER (centro), o un n�mero dado de grados</view-offset-desc> <!-- English: "Specify the default forward view direction as an offset from straight ahead. Allowable values are LEFT, RIGHT, CENTER, or a specific number in degrees" -->
<visibility-desc>Especifica la visibilidad inicial</visibility-desc> <!-- English: "Specify initial visibility" -->
<visibility-miles-desc>Especifica la visibilidad inicial en millas</visibility-miles-desc> <!-- English: "Specify initial visibility in miles" -->
<!-- <max-fps-desc>???</max-fps-desc> --> <!-- English: "Maximum frame rate in Hz." -->
<!-- Hud options -->
<hud-options>Opciones del HUD</hud-options> <!-- English: "Hud Options" -->
- <hud-tris-desc>El HUD muestra muchos tri�ngulos renderizados</hud-tris-desc> <!-- English: "Hud displays number of triangles rendered" -->
+ <hud-tris-desc>El HUD muestra n�mero de tri�ngulos renderizados</hud-tris-desc> <!-- English: "Hud displays number of triangles rendered" -->
<hud-culled-desc>Hud muestra un porcentaje de los tri�ngulos entresacados</hud-culled-desc> <!-- English: "Hud displays percentage of triangles culled" -->
<!-- Time options -->
@@ -204,43 +211,43 @@
<!-- Network options -->
<network-options>Opciones de red</network-options> <!-- English: "Network Options" -->
<httpd-desc>Activa el servidor http en el puerto especificado</httpd-desc> <!-- English: "Enable http server on the specified port" -->
- <proxy-desc>Especifica qu� servidor proxy (y puerto)usar. El usuario y contrase�a son pocionales y deber�an de estar ya codificados con MD5. Esta opcion solo es �til cuando es usada conjuntamente con la opcion real-weather-fetch.</proxy-desc> <!-- English: "Specify which proxy server (and port) to use. The username and password are optional and should be MD5 encoded already. This option is only useful when used in conjunction with the real-weather-fetch option." -->
+ <proxy-desc>Especifica qu� servidor proxy (y puerto) usar. El usuario y contrase�a son opcionales y deber�an de estar ya codificados con MD5. Esta opcion solo es �til cuando es usada conjuntamente con la opcion real-weather-fetch.</proxy-desc> <!-- English: "Specify which proxy server (and port) to use. The username and password are optional and should be MD5 encoded already. This option is only useful when used in conjunction with the real-weather-fetch option." -->
<telnet-desc>Activa el servidor telnet en el puerto especificado</telnet-desc> <!-- English: "Enable telnet server on the specified port" -->
- <jpg-httpd-desc>Activa screen shoten elservidor http en el puerto especificado</jpg-httpd-desc> <!-- English: "Enable screen shot http server on the specified port" -->
-<!-- <disable-terrasync-desc>???</disable-terrasync-desc> --> <!-- English: "Disable automatic scenery downloads/updates" -->
-<!-- <enable-terrasync-desc>???</enable-terrasync-desc> --> <!-- English: "Enable automatic scenery downloads/updates" -->
-<!-- <terrasync-dir-desc>???</terrasync-dir-desc> --> <!-- English: "Set target directory for scenery downloads" -->
+ <jpg-httpd-desc>Activa screen shot en el servidor http en el puerto especificado</jpg-httpd-desc> <!-- English: "Enable screen shot http server on the specified port" -->
+ <disable-terrasync-desc>Desactiva la descarga/actualizaci�n autom�tica de escenarios</disable-terrasync-desc> <!-- English: "Disable automatic scenery downloads/updates" -->
+ <enable-terrasync-desc>Activa la descarga/actualizaci�n autom�tica de escenarios</enable-terrasync-desc> <!-- English: "Enable automatic scenery downloads/updates" -->
+ <terrasync-dir-desc>Especifica el directorio para descargas de escenarios</terrasync-dir-desc> <!-- English: "Set target directory for scenery downloads" -->
<!-- MultiPlayer options -->
<multiplayer-options>Opciones multijugador</multiplayer-options> <!-- English: "MultiPlayer Options" -->
- <multiplay-desc>Especifica la configuracion de comunicaci�nes multipiloto</multiplay-desc> <!-- English: "Specify multipilot communication settings" -->
+ <multiplay-desc>Especifica la configuraci�n de comunicaci�nes multipiloto</multiplay-desc> <!-- English: "Specify multipilot communication settings" -->
<callsign-desc>Asiigna un nombre �nico a un jugador</callsign-desc> <!-- English: "assign a unique name to a player" -->
<!-- Route/Way Point Options -->
<route-options>Opciones de Route/Way Point</route-options> <!-- English: "Route/Way Point Options" -->
- <wp-desc>Especificaa waypoint para el autopiloto GC;</wp-desc> <!-- English: "Specify a waypoint for the GC autopilot;" -->
+ <wp-desc>Especifica waypoint para el autopiloto GC;</wp-desc> <!-- English: "Specify a waypoint for the GC autopilot;" -->
<flight-plan-desc>Leer todos los waypoints desde un fichero</flight-plan-desc> <!-- English: "Read all waypoints from a file" -->
<!-- IO Options -->
<io-options>Opciones ES</io-options> <!-- English: "IO Options" -->
<AV400-desc>Emite el protocolo Garmin AV400 requerido para usar un GPS Garmin 196/296 series</AV400-desc> <!-- English: "Emit the Garmin AV400 protocol required to drive a Garmin 196/296 series GPS" -->
<AV400Sim-desc>Emite el conjunto de cadenas AV400 de texto requeridas para usar un GPS Garmin 400-series desde FlightGear</AV400Sim-desc> <!-- English: "Emit the set of AV400 strings required to drive a Garmin 400-series GPS from FlightGear" -->
- <atlas-desc>Abrir conexion usando el protocolo Atlas</atlas-desc> <!-- English: "Open connection using the Atlas protocol" -->
- <atcsim-desc>Abrir conexion usando el protocolo ATC sim(atc610x)</atcsim-desc> <!-- English: "Open connection using the ATC sim protocol (atc610x)" -->
- <garmin-desc>Abrir conexion usando el protocolo Garmin GPS</garmin-desc> <!-- English: "Open connection using the Garmin GPS protocol" -->
- <joyclient-desc>Abrir conexion a un joystick Agwagon</joyclient-desc> <!-- English: "Open connection to an Agwagon joystick" -->
- <jsclient-desc>Abrir conexion a un joystick remoto</jsclient-desc> <!-- English: "Open connection to a remote joystick" -->
- <native-ctrls-desc>Abrir conexion usando el protocolo FG Native Controls</native-ctrls-desc> <!-- English: "Open connection using the FG Native Controls protocol" -->
- <native-fdm-desc>Abrir conexion usando el protocolo FG Native FDM</native-fdm-desc> <!-- English: "Open connection using the FG Native FDM protocol" -->
- <native-gui-desc>Abrir conexion usando el protocolo FG Native GUI</native-gui-desc> <!-- English: "Open connection using the FG Native GUI protocol" -->
- <native-desc>Abrir conexion usando el protocolo FG Native</native-desc> <!-- English: "Open connection using the FG Native protocol" -->
- <nmea-desc>Abrir conexion usando el protocolo NMEA</nmea-desc> <!-- English: "Open connection using the NMEA protocol" -->
- <generic-desc>Abrir conexion usando una interfaz predefinida de comunicaci�n y un protocolo preseleccionado de comunicaci�n</generic-desc> <!-- English: "Open connection using a predefined communication interface and a preselected communication protocol" -->
- <opengc-desc>Abrir conexion usando el protocolo OpenGC</opengc-desc> <!-- English: "Open connection using the OpenGC protocol" -->
- <props-desc>Abrir conexion usando el gestor interactivo de propiedades</props-desc> <!-- English: "Open connection using the interactive property manager" -->
- <pve-desc>Abrir conexion usando el protocolo PVE</pve-desc> <!-- English: "Open connection using the PVE protocol" -->
- <ray-desc>Abrir conexion usando el protocolo Ray Woodworth motion chair</ray-desc> <!-- English: "Open connection using the Ray Woodworth motion chair protocol" -->
- <rul-desc>Abrir conexion usando el protocol RUL</rul-desc> <!-- English: "Open connection using the RUL protocol" -->
+ <atlas-desc>Abrir conexi�n usando el protocolo Atlas</atlas-desc> <!-- English: "Open connection using the Atlas protocol" -->
+ <atcsim-desc>Abrir conexi�n usando el protocolo ATC sim(atc610x)</atcsim-desc> <!-- English: "Open connection using the ATC sim protocol (atc610x)" -->
+ <garmin-desc>Abrir conexi�n usando el protocolo Garmin GPS</garmin-desc> <!-- English: "Open connection using the Garmin GPS protocol" -->
+ <joyclient-desc>Abrir conexi�n a un joystick Agwagon</joyclient-desc> <!-- English: "Open connection to an Agwagon joystick" -->
+ <jsclient-desc>Abrir conexi�n a un joystick remoto</jsclient-desc> <!-- English: "Open connection to a remote joystick" -->
+ <native-ctrls-desc>Abrir conexi�n usando el protocolo FG Native Controls</native-ctrls-desc> <!-- English: "Open connection using the FG Native Controls protocol" -->
+ <native-fdm-desc>Abrir conexi�n usando el protocolo FG Native FDM</native-fdm-desc> <!-- English: "Open connection using the FG Native FDM protocol" -->
+ <native-gui-desc>Abrir conexi�n usando el protocolo FG Native GUI</native-gui-desc> <!-- English: "Open connection using the FG Native GUI protocol" -->
+ <native-desc>Abrir conexi�n usando el protocolo FG Native</native-desc> <!-- English: "Open connection using the FG Native protocol" -->
+ <nmea-desc>Abrir conexi�n usando el protocolo NMEA</nmea-desc> <!-- English: "Open connection using the NMEA protocol" -->
+ <generic-desc>Abrir conexi�n usando una interfaz predefinida de comunicaci�n y un protocolo preseleccionado de comunicaci�n</generic-desc> <!-- English: "Open connection using a predefined communication interface and a preselected communication protocol" -->
+ <opengc-desc>Abrir conexi�n usando el protocolo OpenGC</opengc-desc> <!-- English: "Open connection using the OpenGC protocol" -->
+ <props-desc>Abrir conexi�n usando el gestor interactivo de propiedades</props-desc> <!-- English: "Open connection using the interactive property manager" -->
+ <pve-desc>Abrir conexi�n usando el protocolo PVE</pve-desc> <!-- English: "Open connection using the PVE protocol" -->
+ <ray-desc>Abrir conexi�n usando el protocolo Ray Woodworth motion chair</ray-desc> <!-- English: "Open connection using the Ray Woodworth motion chair protocol" -->
+ <rul-desc>Abrir conexi�n usando el protocol RUL</rul-desc> <!-- English: "Open connection using the RUL protocol" -->
<!-- Avionics Options -->
<avionics-options>Opciones de avi�nica</avionics-options> <!-- English: "Avionics Options" -->
@@ -248,20 +255,20 @@
<com2-desc>Establece la radio frecuencia de COM2</com2-desc> <!-- English: "Set the COM2 radio frequency" -->
<nav1-desc>Establece la radio frecuencia de NAV1, opcionalmente precedida por un radial.</nav1-desc> <!-- English: "Set the NAV1 radio frequency, optionally preceded by a radial." -->
<nav2-desc>Establece la radio frecuencia de NAV2, opcionalmente precedida por un radial.</nav2-desc> <!-- English: "Set the NAV2 radio frequency, optionally preceded by a radial." -->
- <adf1-desc>Establece la radio frecuencia de ADF1, opcionalmente precedida por una rotacionde carta.</adf1-desc> <!-- English: "Set the ADF1 radio frequency, optionally preceded by a card rotation." -->
- <adf2-desc>Establece la radio frecuencia de ADF2, opcionalmente precedida por una rotacionde carta.</adf2-desc> <!-- English: "Set the ADF2 radio frequency, optionally preceded by a card rotation." -->
+ <adf1-desc>Establece la radio frecuencia de ADF1, opcionalmente precedida por una rotaci�n de carta.</adf1-desc> <!-- English: "Set the ADF1 radio frequency, optionally preceded by a card rotation." -->
+ <adf2-desc>Establece la radio frecuencia de ADF2, opcionalmente precedida por una rotaci�n de carta.</adf2-desc> <!-- English: "Set the ADF2 radio frequency, optionally preceded by a card rotation." -->
<dme-desc>Esclaviza la ADF a una de las radios NAV, o establece su frecuencia interna.</dme-desc> <!-- English: "Slave the ADF to one of the NAV radios, or set its internal frequency." -->
<situation-options>Opciones de emergencias</situation-options> <!-- English: "Situation Options" -->
- <failure-desc>Fallo del sistema de pitot, estatica, vac�o, or electrico (repetir la opci�n para multiples fallos del sistema).</failure-desc> <!-- English: "Fail the pitot, static, vacuum, or electrical system (repeat the option for multiple system failures)." -->
+ <failure-desc>Fallo del sistema de pitot, est�tica, vac�o, o el�ctrico (repetir la opci�n para multiples fallos del sistema).</failure-desc> <!-- English: "Fail the pitot, static, vacuum, or electrical system (repeat the option for multiple system failures)." -->
<!-- Debugging Options -->
<debugging-options>Opciones de depuraci�n</debugging-options> <!-- English: "Debugging Options" -->
- <fpe-desc>Abortar al encontrar una excepcion depunto flotante;</fpe-desc> <!-- English: "Abort on encountering a floating point exception;" -->
+ <fpe-desc>Abortar al encontrar una excepci�n depunto flotante;</fpe-desc> <!-- English: "Abort on encountering a floating point exception;" -->
<fgviewer-desc>Usar un visor de modelos en vez de cargar todo el simulador;</fgviewer-desc> <!-- English: "Use a model viewer rather than load the entire simulator;" -->
<trace-read-desc>Trazar las lecturas para una propiedad;</trace-read-desc> <!-- English: "Trace the reads for a property;" -->
<trace-write-desc>Trazar las escrituras para una propiedad;</trace-write-desc> <!-- English: "Trace the writes for a property;" -->
<log-level-desc>Especifica qu� nivel de registro usar</log-level-desc> <!-- English: "Specify which logging level to use" -->
-<!-- <log-class-desc>???</log-class-desc> --> <!-- English: "Specify which logging class(es) to use" -->
+ <log-class-desc>Especifica qu� clase (o clases) de registro usar</log-class-desc> <!-- English: "Specify which logging class(es) to use" -->
</PropertyList>
diff --git a/Translations/fr/menu.xml b/Translations/fr/menu.xml
index a73fcd7d1..3c16ee096 100644
--- a/Translations/fr/menu.xml
+++ b/Translations/fr/menu.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-10 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -102,6 +104,7 @@
<reload-panel>Relancer le panneau</reload-panel> <!-- English: "Reload Panel" -->
<reload-autopilot>Relancer le pilote automatique</reload-autopilot> <!-- English: "Reload Autopilot" -->
<reload-network>Relancer le r�seau</reload-network> <!-- English: "Reload Network" -->
+<!-- <reload-model>???</reload-model> --> <!-- English: "Reload Aircraft Model" -->
<nasal-console>Console Nasal</nasal-console> <!-- English: "Nasal Console" -->
<development-keys>Touches de d�veloppement</development-keys> <!-- English: "Development Keys" -->
<configure-dev-extension>Configurer les extensions de d�veloppement</configure-dev-extension> <!-- English: "Configure Development Extensions" -->
diff --git a/Translations/fr/options.xml b/Translations/fr/options.xml
index 889f6c04b..8a5d998c4 100644
--- a/Translations/fr/options.xml
+++ b/Translations/fr/options.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-10 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -36,6 +38,7 @@
<enable-game-mode-desc>Active le mode de jeu plein �cran.</enable-game-mode-desc> <!-- English: "Enable full-screen game mode" -->
<disable-splash-screen-desc>D�sactive l'�cran d'accueil.</disable-splash-screen-desc> <!-- English: "Disable splash screen" -->
<enable-splash-screen-desc>Active l'�cran d'accueil.</enable-splash-screen-desc> <!-- English: "Enable splash screen" -->
+<!-- <restore-defaults-desc>???</restore-defaults-desc> --> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
<disable-save-on-exit>Ne sauvegarde pas les pr�f�rences lors de la sortie du programme.</disable-save-on-exit> <!-- English: "Don't save preferences upon program exit" -->
<enable-save-on-exit>Autorise la sauvegarde des pr�f�rences � la sortie du programme.</enable-save-on-exit> <!-- English: "Allow saving preferences at program exit" -->
<disable-intro-music-desc>D�sactive la musique d'introduction.</disable-intro-music-desc> <!-- English: "Disable introduction music" -->
@@ -45,6 +48,10 @@
<enable-mouse-pointer-desc n="1">(c'est-�-dire pour l'affichage plein �cran avec des cartes � base de Voodoo)</enable-mouse-pointer-desc> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
<disable-random-objects-desc>Exclut les objets al�atoires des sc�nes.</disable-random-objects-desc> <!-- English: "Exclude random scenery objects" -->
<enable-random-objects-desc>Inclut les objets al�atoires dans les sc�nes.</enable-random-objects-desc> <!-- English: "Include random scenery objects" -->
+<!-- <disable-random-vegetation-desc>???</disable-random-vegetation-desc> --> <!-- English: "Exclude random vegetation objects" -->
+<!-- <enable-random-vegetation-desc>???</enable-random-vegetation-desc> --> <!-- English: "Include random vegetation objects" -->
+<!-- <disable-random-buildings-desc>???</disable-random-buildings-desc> --> <!-- English: "Exclude random buildings objects" -->
+<!-- <enable-random-buildings-desc>???</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
<disable-real-weather-fetch-desc>D�sactive la r�cup�ration de la m�t�o en temps r�el se basant sur les METAR.</disable-real-weather-fetch-desc> <!-- English: "Disable METAR based real weather fetching" -->
<enable-real-weather-fetch-desc>Active la r�cup�ration de la m�t�o en temps r�el se basant sur les METAR (n�cessite une connection Internet active).</enable-real-weather-fetch-desc> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
<metar-desc>Passe un METAR pour concevoir la m�t�o statique.</metar-desc> <!-- English: "Pass a METAR to set up static weather" -->
diff --git a/Translations/it/menu.xml b/Translations/it/menu.xml
index 32d36ebf7..afa68ae3f 100644
--- a/Translations/it/menu.xml
+++ b/Translations/it/menu.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-10 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -102,6 +104,7 @@
<!-- <reload-panel>???</reload-panel> --> <!-- English: "Reload Panel" -->
<!-- <reload-autopilot>???</reload-autopilot> --> <!-- English: "Reload Autopilot" -->
<!-- <reload-network>???</reload-network> --> <!-- English: "Reload Network" -->
+<!-- <reload-model>???</reload-model> --> <!-- English: "Reload Aircraft Model" -->
<!-- <nasal-console>???</nasal-console> --> <!-- English: "Nasal Console" -->
<!-- <development-keys>???</development-keys> --> <!-- English: "Development Keys" -->
<!-- <configure-dev-extension>???</configure-dev-extension> --> <!-- English: "Configure Development Extensions" -->
diff --git a/Translations/it/options.xml b/Translations/it/options.xml
index b10b07b8a..47db52bd2 100644
--- a/Translations/it/options.xml
+++ b/Translations/it/options.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,253 +17,258 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
-<!-- <usage>???</usage> --> <!-- English: "Usage: fgfs [ option ... ]" -->
-<!-- <verbose-help>???</verbose-help> --> <!-- English: "For a complete list of options use -_help -_verbose" -->
+ <usage>Uso: fgfs [ option ... ]</usage> <!-- English: "Usage: fgfs [ option ... ]" -->
+ <verbose-help>Per una complete lista delle opzioni usa --help--verbose </verbose-help> <!-- English: "For a complete list of options use -_help -_verbose" -->
<!-- General options -->
-<!-- <general-options>???</general-options> --> <!-- English: "General Options" -->
-<!-- <help-desc>???</help-desc> --> <!-- English: "Show the most relevant command line options" -->
-<!-- <verbose-desc>???</verbose-desc> --> <!-- English: "Show all command line options when combined with -_help or -h" -->
-<!-- <version-desc>???</version-desc> --> <!-- English: "Display the current FlightGear version" -->
-<!-- <fg-root-desc>???</fg-root-desc> --> <!-- English: "Specify the root data path" -->
-<!-- <fg-scenery-desc n="0">???</fg-scenery-desc> --> <!-- English: "Specify the scenery path(s);" -->
-<!-- <fg-scenery-desc n="1">???</fg-scenery-desc> --> <!-- English: "Defaults to $FG_ROOT/Scenery" -->
-<!-- <fg-aircraft-desc>???</fg-aircraft-desc> --> <!-- English: "Specify additional aircraft directory path(s)" -->
-<!-- <language-desc>???</language-desc> --> <!-- English: "Select the language for this session" -->
-<!-- <disable-game-mode-desc>???</disable-game-mode-desc> --> <!-- English: "Disable full-screen game mode" -->
-<!-- <enable-game-mode-desc>???</enable-game-mode-desc> --> <!-- English: "Enable full-screen game mode" -->
-<!-- <disable-splash-screen-desc>???</disable-splash-screen-desc> --> <!-- English: "Disable splash screen" -->
-<!-- <enable-splash-screen-desc>???</enable-splash-screen-desc> --> <!-- English: "Enable splash screen" -->
-<!-- <disable-save-on-exit>???</disable-save-on-exit> --> <!-- English: "Don't save preferences upon program exit" -->
-<!-- <enable-save-on-exit>???</enable-save-on-exit> --> <!-- English: "Allow saving preferences at program exit" -->
-<!-- <disable-intro-music-desc>???</disable-intro-music-desc> --> <!-- English: "Disable introduction music" -->
-<!-- <enable-intro-music-desc>???</enable-intro-music-desc> --> <!-- English: "Enable introduction music" -->
-<!-- <disable-mouse-pointer-desc>???</disable-mouse-pointer-desc> --> <!-- English: "Disable extra mouse pointer" -->
-<!-- <enable-mouse-pointer-desc n="0">???</enable-mouse-pointer-desc> --> <!-- English: "Enable extra mouse pointer" -->
-<!-- <enable-mouse-pointer-desc n="1">???</enable-mouse-pointer-desc> --> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
-<!-- <disable-random-objects-desc>???</disable-random-objects-desc> --> <!-- English: "Exclude random scenery objects" -->
-<!-- <enable-random-objects-desc>???</enable-random-objects-desc> --> <!-- English: "Include random scenery objects" -->
-<!-- <disable-real-weather-fetch-desc>???</disable-real-weather-fetch-desc> --> <!-- English: "Disable METAR based real weather fetching" -->
-<!-- <enable-real-weather-fetch-desc>???</enable-real-weather-fetch-desc> --> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
-<!-- <metar-desc>???</metar-desc> --> <!-- English: "Pass a METAR to set up static weather" -->
-<!-- <random-objects-desc>???</random-objects-desc> --> <!-- English: "(buildings, etc.)" -->
-<!-- <disable-ai-models-desc>???</disable-ai-models-desc> --> <!-- English: "Deprecated option (disable internal AI subsystem)" -->
-<!-- <enable-ai-models-desc>???</enable-ai-models-desc> --> <!-- English: "Enable AI subsystem (required for multi-player, AI traffic and many other animations)" -->
-<!-- <disable-ai-traffic-desc>???</disable-ai-traffic-desc> --> <!-- English: "Disable artificial traffic." -->
-<!-- <enable-ai-traffic-desc>???</enable-ai-traffic-desc> --> <!-- English: "Enable artificial traffic." -->
-<!-- <disable-ai-scenarios>???</disable-ai-scenarios> --> <!-- English: "Disable all AI scenarios." -->
-<!-- <ai-scenario>???</ai-scenario> --> <!-- English: "Add and enable a new scenario. Multiple options are allowed." -->
-<!-- <disable-freeze-desc>???</disable-freeze-desc> --> <!-- English: "Start in a running state" -->
-<!-- <enable-freeze-desc>???</enable-freeze-desc> --> <!-- English: "Start in a frozen state" -->
-<!-- <disable-fuel-freeze-desc>???</disable-fuel-freeze-desc> --> <!-- English: "Fuel is consumed normally" -->
-<!-- <enable-fuel-freeze-desc>???</enable-fuel-freeze-desc> --> <!-- English: "Fuel tank quantity forced to remain constant" -->
-<!-- <disable-clock-freeze-desc>???</disable-clock-freeze-desc> --> <!-- English: "Clock advances normally" -->
-<!-- <enable-clock-freeze-desc>???</enable-clock-freeze-desc> --> <!-- English: "Do not advance clock" -->
-<!-- <control-desc>???</control-desc> --> <!-- English: "Primary control mode (joystick, keyboard, mouse)" -->
-<!-- <enable-auto-coordination-desc>???</enable-auto-coordination-desc> --> <!-- English: "Enable auto coordination" -->
-<!-- <disable-auto-coordination-desc>???</disable-auto-coordination-desc> --> <!-- English: "Disable auto coordination" -->
-<!-- <browser-app-desc>???</browser-app-desc> --> <!-- English: "Specify path to your web browser" -->
-<!-- <prop-desc>???</prop-desc> --> <!-- English: "Set property <name> to <value>. <type> can be one of string, double, float, long, int, or bool." -->
-<!-- <config-desc>???</config-desc> --> <!-- English: "Load additional properties from path" -->
-<!-- <units-feet-desc>???</units-feet-desc> --> <!-- English: "Use feet for distances" -->
-<!-- <units-meters-desc>???</units-meters-desc> --> <!-- English: "Use meters for distances" -->
+ <general-options>Opzioni generali</general-options> <!-- English: "General Options" -->
+ <help-desc>Mostra le piu' rilevanti opzione delle linee di comando</help-desc> <!-- English: "Show the most relevant command line options" -->
+ <verbose-desc>Mostra tutte le opzioni delle linee di comando quando vengono combinate con --help o -h </verbose-desc> <!-- English: "Show all command line options when combined with -_help or -h" -->
+ <version-desc>Mostra la versione corrente di FlightGear</version-desc> <!-- English: "Display the current FlightGear version" -->
+ <fg-root-desc>Specifica la radice del percorso dati</fg-root-desc> <!-- English: "Specify the root data path" -->
+ <fg-scenery-desc n="0">Specifica il percorso del scenario(s);</fg-scenery-desc> <!-- English: "Specify the scenery path(s);" -->
+ <fg-scenery-desc n="1">Default a $FG_ROOT/Scenario</fg-scenery-desc> <!-- English: "Defaults to $FG_ROOT/Scenery" -->
+ <fg-aircraft-desc>Specifica percorso del catalogo per addizionali aerei </fg-aircraft-desc> <!-- English: "Specify additional aircraft directory path(s)" -->
+ <language-desc>Seleziona la lingua per questa sessione</language-desc> <!-- English: "Select the language for this session" -->
+ <disable-game-mode-desc>disabilita modalita' di gioco a schermo pieno -desc</disable-game-mode-desc> <!-- English: "Disable full-screen game mode" -->
+ <enable-game-mode-desc>abilita modalita'di gioco a schermo pieno </enable-game-mode-desc> <!-- English: "Enable full-screen game mode" -->
+ <disable-splash-screen-desc>Disabilita schermo splash</disable-splash-screen-desc> <!-- English: "Disable splash screen" -->
+ <enable-splash-screen-desc>Abilita schermo splash</enable-splash-screen-desc> <!-- English: "Enable splash screen" -->
+<!-- <restore-defaults-desc>???</restore-defaults-desc> --> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
+ <disable-save-on-exit>Non salvare le impostazioni all'uscita del programma</disable-save-on-exit> <!-- English: "Don't save preferences upon program exit" -->
+ <enable-save-on-exit>Salva le impostazioni all'uscita del programma</enable-save-on-exit> <!-- English: "Allow saving preferences at program exit" -->
+ <disable-intro-music-desc>Disabilita musica introduttiva</disable-intro-music-desc> <!-- English: "Disable introduction music" -->
+ <enable-intro-music-desc>Abilita musica introduttiva</enable-intro-music-desc> <!-- English: "Enable introduction music" -->
+ <disable-mouse-pointer-desc>Disabilita extra puntatore di mouse</disable-mouse-pointer-desc> <!-- English: "Disable extra mouse pointer" -->
+ <enable-mouse-pointer-desc n="0">Abilita extra puntatore di mouse</enable-mouse-pointer-desc> <!-- English: "Enable extra mouse pointer" -->
+ <enable-mouse-pointer-desc n="1">(i.e per schermo pieno basato su carte Vodoo)</enable-mouse-pointer-desc> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
+ <disable-random-objects-desc>Escludi casuali oggetti di scenario</disable-random-objects-desc> <!-- English: "Exclude random scenery objects" -->
+ <enable-random-objects-desc>Includi casuali oggetti di scenario</enable-random-objects-desc> <!-- English: "Include random scenery objects" -->
+<!-- <disable-random-vegetation-desc>???</disable-random-vegetation-desc> --> <!-- English: "Exclude random vegetation objects" -->
+<!-- <enable-random-vegetation-desc>???</enable-random-vegetation-desc> --> <!-- English: "Include random vegetation objects" -->
+<!-- <disable-random-buildings-desc>???</disable-random-buildings-desc> --> <!-- English: "Exclude random buildings objects" -->
+<!-- <enable-random-buildings-desc>???</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
+ <disable-real-weather-fetch-desc>Disabilita raccoglimento meteo in tempo reale basato su METAR </disable-real-weather-fetch-desc> <!-- English: "Disable METAR based real weather fetching" -->
+ <enable-real-weather-fetch-desc>Abilita raccoglimento meteo in tempo reale basato su METAR (questo richiede una connessione a internet aperta) </enable-real-weather-fetch-desc> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
+ <metar-desc>Passa a METAR per configurare meteo statico</metar-desc> <!-- English: "Pass a METAR to set up static weather" -->
+ <random-objects-desc>costruzioni, ecc.</random-objects-desc> <!-- English: "(buildings, etc.)" -->
+ <disable-ai-models-desc>Disabilita sotto-sistema AI</disable-ai-models-desc> <!-- English: "Deprecated option (disable internal AI subsystem)" -->
+ <enable-ai-models-desc>Abilita sotto-sistema AI (richiesto per gioco multigiocatore, traffico AI e molte altre animazioni)</enable-ai-models-desc> <!-- English: "Enable AI subsystem (required for multi-player, AI traffic and many other animations)" -->
+ <disable-ai-traffic-desc>Disabilita traffico artificiale</disable-ai-traffic-desc> <!-- English: "Disable artificial traffic." -->
+ <enable-ai-traffic-desc>Abilita traffico artificiale</enable-ai-traffic-desc> <!-- English: "Enable artificial traffic." -->
+ <disable-ai-scenarios>Disabilita tutti i scenari AI</disable-ai-scenarios> <!-- English: "Disable all AI scenarios." -->
+ <ai-scenario>Aggiungi e abilita un nuo scenario. Multiple opzioni sono permesse.</ai-scenario> <!-- English: "Add and enable a new scenario. Multiple options are allowed." -->
+ <disable-freeze-desc>Inizia in modalita' attiva</disable-freeze-desc> <!-- English: "Start in a running state" -->
+ <enable-freeze-desc>Inizia in modalita' congelata</enable-freeze-desc> <!-- English: "Start in a frozen state" -->
+ <disable-fuel-freeze-desc>Benzina e' consumata normalmente</disable-fuel-freeze-desc> <!-- English: "Fuel is consumed normally" -->
+ <enable-fuel-freeze-desc>La quantita' di benzina nel contenitore forzata a rimanere constante</enable-fuel-freeze-desc> <!-- English: "Fuel tank quantity forced to remain constant" -->
+ <disable-clock-freeze-desc>Orario avanza normalmente</disable-clock-freeze-desc> <!-- English: "Clock advances normally" -->
+ <enable-clock-freeze-desc>Ferma l'orario</enable-clock-freeze-desc> <!-- English: "Do not advance clock" -->
+ <control-desc>Modalita' controllo primario (joystick, tastiera, mouse)</control-desc> <!-- English: "Primary control mode (joystick, keyboard, mouse)" -->
+ <enable-auto-coordination-desc>Abilita coordinazione automatica</enable-auto-coordination-desc> <!-- English: "Enable auto coordination" -->
+ <disable-auto-coordination-desc>disabilita coordinazione automatica</disable-auto-coordination-desc> <!-- English: "Disable auto coordination" -->
+ <browser-app-desc>Specifica il perocorso per il tuo programma di ricerca rete </browser-app-desc> <!-- English: "Specify path to your web browser" -->
+ <prop-desc>Imposta la proprieta <name> a <value>. <type> la quale puo' essere una string, double, float, long, int, o bool.' </prop-desc> <!-- English: "Set property <name> to <value>. <type> can be one of string, double, float, long, int, or bool." -->
+ <config-desc>Carica proprieta' addizionali dalla percorso</config-desc> <!-- English: "Load additional properties from path" -->
+ <units-feet-desc>Usa piedi sistema anglossassone per le distanze</units-feet-desc> <!-- English: "Use feet for distances" -->
+ <units-meters-desc>Usa sistema metrico per le distanze </units-meters-desc> <!-- English: "Use meters for distances" -->
<!-- Features options -->
-<!-- <environment-options>???</environment-options> --> <!-- English: "Environment Options" -->
-<!-- <features-options>???</features-options> --> <!-- English: "Features" -->
-<!-- <disable-hud-desc>???</disable-hud-desc> --> <!-- English: "Disable Heads Up Display (HUD)" -->
-<!-- <enable-hud-desc>???</enable-hud-desc> --> <!-- English: "Enable Heads Up Display (HUD)" -->
-<!-- <disable-panel-desc>???</disable-panel-desc> --> <!-- English: "Disable instrument panel" -->
-<!-- <enable-panel-desc>???</enable-panel-desc> --> <!-- English: "Enable instrument panel" -->
-<!-- <disable-anti-alias-hud-desc>???</disable-anti-alias-hud-desc> --> <!-- English: "Disable anti-aliased HUD" -->
-<!-- <enable-anti-alias-hud-desc>???</enable-anti-alias-hud-desc> --> <!-- English: "Enable anti-aliased HUD" -->
-<!-- <disable-hud-3d-desc>???</disable-hud-3d-desc> --> <!-- English: "Disable 3D HUD" -->
-<!-- <enable-hud-3d-desc>???</enable-hud-3d-desc> --> <!-- English: "Enable 3D HUD" -->
+ <environment-options>Opzioni ambientali</environment-options> <!-- English: "Environment Options" -->
+ <features-options>Caratteristiche</features-options> <!-- English: "Features" -->
+ <disable-hud-desc>Disabilita HUD</disable-hud-desc> <!-- English: "Disable Heads Up Display (HUD)" -->
+ <enable-hud-desc>Abilita HUD</enable-hud-desc> <!-- English: "Enable Heads Up Display (HUD)" -->
+ <disable-panel-desc>Disabilita il pannello degli strumenti</disable-panel-desc> <!-- English: "Disable instrument panel" -->
+ <enable-panel-desc>Abilita il pannello degli strumenti</enable-panel-desc> <!-- English: "Enable instrument panel" -->
+ <disable-anti-alias-hud-desc>Disabilita l'anti-aliasing HUD</disable-anti-alias-hud-desc> <!-- English: "Disable anti-aliased HUD" -->
+ <enable-anti-alias-hud-desc>Abilita l'anti-aliasing HUD</enable-anti-alias-hud-desc> <!-- English: "Enable anti-aliased HUD" -->
+ <disable-hud-3d-desc>Disabilita 3D HUD</disable-hud-3d-desc> <!-- English: "Disable 3D HUD" -->
+ <enable-hud-3d-desc>Abilita 3D HUD</enable-hud-3d-desc> <!-- English: "Enable 3D HUD" -->
<!-- Aircraft options -->
-<!-- <aircraft-options>???</aircraft-options> --> <!-- English: "Aircraft" -->
-<!-- <aircraft-desc>???</aircraft-desc> --> <!-- English: "Select an aircraft profile as defined by a top level <name>-set.xml" -->
-<!-- <show-aircraft-desc>???</show-aircraft-desc> --> <!-- English: "Print a list of the currently available aircraft types" -->
-<!-- <min-aircraft-status>???</min-aircraft-status> --> <!-- English: "Allows you to define a minimum status level (=development status) for all listed aircraft" -->
-<!-- <vehicle-desc>???</vehicle-desc> --> <!-- English: "Select an vehicle profile as defined by a top level <name>-set.xml" -->
-<!-- <livery-desc>???</livery-desc> --> <!-- English: "Select aircraft livery" -->
+ <aircraft-options>Aereo</aircraft-options> <!-- English: "Aircraft" -->
+ <aircraft-desc>Seleziona un profilo dell'aereo come definito dal livello principale <name>-set.xml</aircraft-desc> <!-- English: "Select an aircraft profile as defined by a top level <name>-set.xml" -->
+ <show-aircraft-desc>Stampa una lista dei tipi di aerei attualmente disponibili</show-aircraft-desc> <!-- English: "Print a list of the currently available aircraft types" -->
+ <min-aircraft-status>Ti permette di definire un minimo livello di stato</min-aircraft-status> <!-- English: "Allows you to define a minimum status level (=development status) for all listed aircraft" -->
+ <vehicle-desc>Seleziona un profilo del veicolo come definito dal livello principale <name>-set.xml </vehicle-desc> <!-- English: "Select an vehicle profile as defined by a top level <name>-set.xml" -->
+ <livery-desc>Seleziona l'aspetto dell'aereo</livery-desc> <!-- English: "Select aircraft livery" -->
<!-- Flight Dynamics Model options -->
-<!-- <fdm-options>???</fdm-options> --> <!-- English: "Flight Model" -->
-<!-- <fdm-desc n="0">???</fdm-desc> --> <!-- English: "Select the core flight dynamics model" -->
-<!-- <fdm-desc n="1">???</fdm-desc> --> <!-- English: "Can be one of jsb, larcsim, yasim, magic, balloon, ada, external, or null" -->
-<!-- <aero-desc>???</aero-desc> --> <!-- English: "Select aircraft aerodynamics model to load" -->
-<!-- <model-hz-desc>???</model-hz-desc> --> <!-- English: "Run the FDM this rate (iterations per second)" -->
-<!-- <speed-desc>???</speed-desc> --> <!-- English: "Run the FDM 'n' times faster than real time" -->
-<!-- <notrim-desc n="0">???</notrim-desc> --> <!-- English: "Do NOT attempt to trim the model" -->
-<!-- <notrim-desc n="1">???</notrim-desc> --> <!-- English: "(only with fdm=jsbsim)" -->
-<!-- <trim-desc n="0">???</trim-desc> --> <!-- English: "Trim the model" -->
-<!-- <trim-desc n="1">???</trim-desc> --> <!-- English: "(only with fdm=jsbsim)" -->
-<!-- <on-ground-desc>???</on-ground-desc> --> <!-- English: "Start at ground level (default)" -->
-<!-- <in-air-desc>???</in-air-desc> --> <!-- English: "Start in air (implied when using -_altitude)" -->
-<!-- <wind-desc>???</wind-desc> --> <!-- English: "Specify wind coming from DIR (degrees) at SPEED (knots)" -->
-<!-- <random-wind-desc>???</random-wind-desc> --> <!-- English: "Set up random wind direction and speed" -->
-<!-- <turbulence-desc>???</turbulence-desc> --> <!-- English: "Specify turbulence from 0.0 (calm) to 1.0 (severe)" -->
-<!-- <ceiling-desc>???</ceiling-desc> --> <!-- English: "Create an overcast ceiling, optionally with a specific thickness (defaults to 2000 ft)." -->
-<!-- <aircraft-dir-desc>???</aircraft-dir-desc> --> <!-- English: "Aircraft directory relative to the path of the executable" -->
+ <fdm-options>Modello di Volo</fdm-options> <!-- English: "Flight Model" -->
+ <fdm-desc n="0">Seleziona il modello principale dinamico di volo</fdm-desc> <!-- English: "Select the core flight dynamics model" -->
+ <fdm-desc n="1">Puo essere uno di jsb, larcsim, yasim, magico, pallone, ada, esterno, o nullo </fdm-desc> <!-- English: "Can be one of jsb, larcsim, yasim, magic, balloon, ada, external, or null" -->
+ <aero-desc>Seleziona modello aerodinamico dell'aereo da caricare</aero-desc> <!-- English: "Select aircraft aerodynamics model to load" -->
+ <model-hz-desc>Procedi il FDM a questa rata (iterazioni al secondo)</model-hz-desc> <!-- English: "Run the FDM this rate (iterations per second)" -->
+ <speed-desc>Procedi il FDM 'n' volte piu' veloce del tempo reale</speed-desc> <!-- English: "Run the FDM 'n' times faster than real time" -->
+ <notrim-desc n="0">NON provare a aggiustare il modello</notrim-desc> <!-- English: "Do NOT attempt to trim the model" -->
+ <notrim-desc n="1">(solo con fdm=jsbsim)</notrim-desc> <!-- English: "(only with fdm=jsbsim)" -->
+ <trim-desc n="0">Aggiusta il modello</trim-desc> <!-- English: "Trim the model" -->
+ <trim-desc n="1">(solo con fdm=jsbsim)</trim-desc> <!-- English: "(only with fdm=jsbsim)" -->
+ <on-ground-desc>Inizia al livello terra</on-ground-desc> <!-- English: "Start at ground level (default)" -->
+ <in-air-desc>Inizia in aria(quando l'uso implica --altitudine)</in-air-desc> <!-- English: "Start in air (implied when using -_altitude)" -->
+ <wind-desc>Specifica l'arrivo del vento da GRD (gradi) a VELOCITA' (nodi)</wind-desc> <!-- English: "Specify wind coming from DIR (degrees) at SPEED (knots)" -->
+ <random-wind-desc>Imposta direzione e velocita' del vento in modo casuale</random-wind-desc> <!-- English: "Set up random wind direction and speed" -->
+ <turbulence-desc>Specifica la turbolenza da 0.0 (minima) a 1.0 (severa)</turbulence-desc> <!-- English: "Specify turbulence from 0.0 (calm) to 1.0 (severe)" -->
+ <ceiling-desc>Crea un cielo coperto, con uno specifico spessore opzionale (default a 2000 piedi)</ceiling-desc> <!-- English: "Create an overcast ceiling, optionally with a specific thickness (defaults to 2000 ft)." -->
+ <aircraft-dir-desc>Il catalogo dell'aereo relativo al percorso eseguibile</aircraft-dir-desc> <!-- English: "Aircraft directory relative to the path of the executable" -->
-<!-- <aircraft-model-options>???</aircraft-model-options> --> <!-- English: "Aircraft model directory (UIUC FDM ONLY)" -->
+ <aircraft-model-options>Il catalogo del modello dell'aereo(solo UIUC FDM) </aircraft-model-options> <!-- English: "Aircraft model directory (UIUC FDM ONLY)" -->
<!-- Position and Orientation options -->
-<!-- <position-options>???</position-options> --> <!-- English: "Initial Position and Orientation" -->
-<!-- <airport-desc>???</airport-desc> --> <!-- English: "Specify starting position relative to an airport" -->
-<!-- <parking-id-desc>???</parking-id-desc> --> <!-- English: "Specify parking position at an airport (must also specify an airport)" -->
-<!-- <carrier-desc>???</carrier-desc> --> <!-- English: "Specify starting position on an AI carrier" -->
-<!-- <parkpos-desc>???</parkpos-desc> --> <!-- English: "Specify which starting position on an AI carrier (must also specify a carrier)" -->
-<!-- <vor-desc>???</vor-desc> --> <!-- English: "Specify starting position relative to a VOR" -->
-<!-- <vor-freq-desc>???</vor-freq-desc> --> <!-- English: "Specify the frequency of the VOR. Use with -_vor=ID" -->
-<!-- <ndb-desc>???</ndb-desc> --> <!-- English: "Specify starting position relative to an NDB" -->
-<!-- <ndb-freq-desc>???</ndb-freq-desc> --> <!-- English: "Specify the frequency of the NDB. Use with -_ndb=ID" -->
-<!-- <fix-desc>???</fix-desc> --> <!-- English: "Specify starting position relative to a fix" -->
-<!-- <runway-no-desc>???</runway-no-desc> --> <!-- English: "Specify starting runway (must also specify an airport)" -->
-<!-- <offset-distance-desc>???</offset-distance-desc> --> <!-- English: "Specify distance to reference point (statute miles)" -->
-<!-- <offset-azimuth-desc>???</offset-azimuth-desc> --> <!-- English: "Specify heading to reference point" -->
-<!-- <lon-desc>???</lon-desc> --> <!-- English: "Starting longitude (west = -)" -->
-<!-- <lat-desc>???</lat-desc> --> <!-- English: "Starting latitude (south = -)" -->
-<!-- <altitude-desc>???</altitude-desc> --> <!-- English: "Starting altitude" -->
-<!-- <heading-desc>???</heading-desc> --> <!-- English: "Specify heading (yaw) angle (Psi)" -->
-<!-- <roll-desc>???</roll-desc> --> <!-- English: "Specify roll angle (Phi)" -->
-<!-- <pitch-desc>???</pitch-desc> --> <!-- English: "Specify pitch angle (Theta)" -->
-<!-- <uBody-desc>???</uBody-desc> --> <!-- English: "Specify velocity along the body X axis" -->
-<!-- <vBody-desc>???</vBody-desc> --> <!-- English: "Specify velocity along the body Y axis" -->
-<!-- <wBody-desc>???</wBody-desc> --> <!-- English: "Specify velocity along the body Z axis" -->
-<!-- <vNorth-desc>???</vNorth-desc> --> <!-- English: "Specify velocity along a South-North axis" -->
-<!-- <vEast-desc>???</vEast-desc> --> <!-- English: "Specify velocity along a West-East axis" -->
-<!-- <vDown-desc>???</vDown-desc> --> <!-- English: "Specify velocity along a vertical axis" -->
-<!-- <vc-desc>???</vc-desc> --> <!-- English: "Specify initial airspeed" -->
-<!-- <mach-desc>???</mach-desc> --> <!-- English: "Specify initial mach number" -->
-<!-- <glideslope-desc>???</glideslope-desc> --> <!-- English: "Specify flight path angle (can be positive)" -->
-<!-- <roc-desc>???</roc-desc> --> <!-- English: "Specify initial climb rate (can be negative)" -->
+ <position-options>Iniziale posizione e orientamento</position-options> <!-- English: "Initial Position and Orientation" -->
+ <airport-desc>Specifica posizione iniziale relativo a un aeroporto</airport-desc> <!-- English: "Specify starting position relative to an airport" -->
+ <parking-id-desc>Specifica il parcheggio a un aeroporto (deve essere specifico all'aeroporto)</parking-id-desc> <!-- English: "Specify parking position at an airport (must also specify an airport)" -->
+ <carrier-desc>Specifica la posizione iniziale sul portaereo AI</carrier-desc> <!-- English: "Specify starting position on an AI carrier" -->
+ <parkpos-desc>Specifica quale posizione iniziale sul portaereo AI (deve essere anche specifica a un portaereo)</parkpos-desc> <!-- English: "Specify which starting position on an AI carrier (must also specify a carrier)" -->
+ <vor-desc>Specifica la posizione iniziale relativa a un VOR</vor-desc> <!-- English: "Specify starting position relative to a VOR" -->
+ <vor-freq-desc>Specifica la fequenza di un VOR. Uso con --vor=ID</vor-freq-desc> <!-- English: "Specify the frequency of the VOR. Use with -_vor=ID" -->
+ <ndb-desc>Specifica la posizione iniziale relativa a un NDB</ndb-desc> <!-- English: "Specify starting position relative to an NDB" -->
+ <ndb-freq-desc>Specifica la frequenza di un NDB. Uso con --ndb=ID</ndb-freq-desc> <!-- English: "Specify the frequency of the NDB. Use with -_ndb=ID" -->
+ <fix-desc>Specifica la posizione relativa a posizione fissa</fix-desc> <!-- English: "Specify starting position relative to a fix" -->
+ <runway-no-desc>Specifica la pista iniziale</runway-no-desc> <!-- English: "Specify starting runway (must also specify an airport)" -->
+ <offset-distance-desc>Specifica la distanza dal punto di riferimento(miglia di stato)</offset-distance-desc> <!-- English: "Specify distance to reference point (statute miles)" -->
+ <offset-azimuth-desc>Specifica la direzione dal punto di riferimento</offset-azimuth-desc> <!-- English: "Specify heading to reference point" -->
+ <lon-desc>Longitudine iniziale (ovest = -)</lon-desc> <!-- English: "Starting longitude (west = -)" -->
+ <lat-desc>Latitudine iniziale (sud = -)</lat-desc> <!-- English: "Starting latitude (south = -)" -->
+ <altitude-desc>Altitudine iniziale</altitude-desc> <!-- English: "Starting altitude" -->
+ <heading-desc>Specifica l'angolo di imbardata (yaw) angolo(Psi)</heading-desc> <!-- English: "Specify heading (yaw) angle (Psi)" -->
+ <roll-desc>Specifia l'angolo di rollio (Phi)</roll-desc> <!-- English: "Specify roll angle (Phi)" -->
+ <pitch-desc>Specifica l'angolo di beccheggio</pitch-desc> <!-- English: "Specify pitch angle (Theta)" -->
+ <uBody-desc>Specifica la velocita' secondo l'asse X</uBody-desc> <!-- English: "Specify velocity along the body X axis" -->
+ <vBody-desc>Specifica la velocita' secondo l'asse Y </vBody-desc> <!-- English: "Specify velocity along the body Y axis" -->
+ <wBody-desc>Specifica la velocita' secondo l'asse Z </wBody-desc> <!-- English: "Specify velocity along the body Z axis" -->
+ <vNorth-desc>Specifica la velocita' secondo l'asse Sud-Nord </vNorth-desc> <!-- English: "Specify velocity along a South-North axis" -->
+ <vEast-desc>Specifica la velocita' secondo l'asse Ovest-Est </vEast-desc> <!-- English: "Specify velocity along a West-East axis" -->
+ <vDown-desc>Specifica la velocita' secondo l'asse verticale</vDown-desc> <!-- English: "Specify velocity along a vertical axis" -->
+ <vc-desc>Specifica l'iniziale velocita' dell'aria</vc-desc> <!-- English: "Specify initial airspeed" -->
+ <mach-desc>Specifica l'iniziale numero Mach</mach-desc> <!-- English: "Specify initial mach number" -->
+ <glideslope-desc>Specifica l'angolo del percorso di volo (puo' essere positivo)</glideslope-desc> <!-- English: "Specify flight path angle (can be positive)" -->
+ <roc-desc>Specifica l'iniziale angolo di salita (puo' essere negativo)</roc-desc> <!-- English: "Specify initial climb rate (can be negative)" -->
<!-- sound options -->
-<!-- <audio-options>???</audio-options> --> <!-- English: "Audio Options" -->
-<!-- <disable-sound-desc>???</disable-sound-desc> --> <!-- English: "Disable sound effects" -->
-<!-- <enable-sound-desc>???</enable-sound-desc> --> <!-- English: "Enable sound effects" -->
-<!-- <show-sound-devices-desc>???</show-sound-devices-desc> --> <!-- English: "Show a list of available audio device" -->
-<!-- <sound-device-desc>???</sound-device-desc> --> <!-- English: "Explicitly specify the audio device to use" -->
+ <audio-options>Opzioni audio</audio-options> <!-- English: "Audio Options" -->
+ <disable-sound-desc>Disabilita effetti sonori</disable-sound-desc> <!-- English: "Disable sound effects" -->
+ <enable-sound-desc>Abilita effetti sonori</enable-sound-desc> <!-- English: "Enable sound effects" -->
+ <show-sound-devices-desc>Mostra una lista dei dispositi audio disponibili</show-sound-devices-desc> <!-- English: "Show a list of available audio device" -->
+ <sound-device-desc>Specifica in modo esplicito il dispositivo audio da utilizzare</sound-device-desc> <!-- English: "Explicitly specify the audio device to use" -->
<!-- Rendering options -->
-<!-- <rendering-options>???</rendering-options> --> <!-- English: "Rendering Options" -->
-<!-- <bpp-desc>???</bpp-desc> --> <!-- English: "Specify the bits per pixel" -->
-<!-- <fog-disable-desc>???</fog-disable-desc> --> <!-- English: "Disable fog/haze" -->
-<!-- <fog-fastest-desc>???</fog-fastest-desc> --> <!-- English: "Enable fastest fog/haze" -->
-<!-- <fog-nicest-desc>???</fog-nicest-desc> --> <!-- English: "Enable nicest fog/haze" -->
-<!-- <disable-horizon-effect>???</disable-horizon-effect> --> <!-- English: "Disable celestial body growth illusion near the horizon" -->
-<!-- <enable-horizon-effect>???</enable-horizon-effect> --> <!-- English: "Enable celestial body growth illusion near the horizon" -->
-<!-- <disable-enhanced-lighting>???</disable-enhanced-lighting> --> <!-- English: "Disable enhanced runway lighting" -->
-<!-- <enable-enhanced-lighting>???</enable-enhanced-lighting> --> <!-- English: "Enable enhanced runway lighting" -->
-<!-- <disable-distance-attenuation>???</disable-distance-attenuation> --> <!-- English: "Disable runway light distance attenuation" -->
-<!-- <enable-distance-attenuation>???</enable-distance-attenuation> --> <!-- English: "Enable runway light distance attenuation" -->
-<!-- <disable-specular-highlight>???</disable-specular-highlight> --> <!-- English: "Disable specular reflections on textured objects" -->
-<!-- <enable-specular-highlight>???</enable-specular-highlight> --> <!-- English: "Enable specular reflections on textured objects" -->
-<!-- <enable-clouds-desc>???</enable-clouds-desc> --> <!-- English: "Enable 2D (flat) cloud layers" -->
-<!-- <disable-clouds-desc>???</disable-clouds-desc> --> <!-- English: "Disable 2D (flat) cloud layers" -->
-<!-- <enable-clouds3d-desc>???</enable-clouds3d-desc> --> <!-- English: "Enable 3D (volumetric) cloud layers" -->
-<!-- <disable-clouds3d-desc>???</disable-clouds3d-desc> --> <!-- English: "Disable 3D (volumetric) cloud layers" -->
-<!-- <fov-desc>???</fov-desc> --> <!-- English: "Specify field of view angle" -->
-<!-- <arm-desc>???</arm-desc> --> <!-- English: "Specify a multiplier for the aspect ratio." -->
-<!-- <disable-fullscreen-desc>???</disable-fullscreen-desc> --> <!-- English: "Disable fullscreen mode" -->
-<!-- <enable-fullscreen-desc>???</enable-fullscreen-desc> --> <!-- English: "Enable fullscreen mode" -->
-<!-- <shading-flat-desc>???</shading-flat-desc> --> <!-- English: "Enable flat shading" -->
-<!-- <shading-smooth-desc>???</shading-smooth-desc> --> <!-- English: "Enable smooth shading" -->
-<!-- <disable-skyblend-desc>???</disable-skyblend-desc> --> <!-- English: "Disable sky blending" -->
-<!-- <enable-skyblend-desc>???</enable-skyblend-desc> --> <!-- English: "Enable sky blending" -->
-<!-- <disable-textures-desc>???</disable-textures-desc> --> <!-- English: "Disable textures" -->
-<!-- <enable-textures-desc>???</enable-textures-desc> --> <!-- English: "Enable textures" -->
-<!-- <materials-file-desc>???</materials-file-desc> --> <!-- English: "Specify the materials file used to render the scenery (default: materials.xml)" -->
-<!-- <texture-filtering-desc>???</texture-filtering-desc> --> <!-- English: "Anisotropic Texture Filtering: values should be 1 (default),2,4,8 or 16" -->
-<!-- <disable-wireframe-desc>???</disable-wireframe-desc> --> <!-- English: "Disable wireframe drawing mode" -->
-<!-- <enable-wireframe-desc>???</enable-wireframe-desc> --> <!-- English: "Enable wireframe drawing mode" -->
-<!-- <geometry-desc>???</geometry-desc> --> <!-- English: "Specify window geometry (640x480, etc)" -->
-<!-- <view-offset-desc>???</view-offset-desc> --> <!-- English: "Specify the default forward view direction as an offset from straight ahead. Allowable values are LEFT, RIGHT, CENTER, or a specific number in degrees" -->
-<!-- <visibility-desc>???</visibility-desc> --> <!-- English: "Specify initial visibility" -->
-<!-- <visibility-miles-desc>???</visibility-miles-desc> --> <!-- English: "Specify initial visibility in miles" -->
-<!-- <max-fps-desc>???</max-fps-desc> --> <!-- English: "Maximum frame rate in Hz." -->
+ <rendering-options>Opzioni Rendering</rendering-options> <!-- English: "Rendering Options" -->
+ <bpp-desc>Specifica i frammenti per pixel</bpp-desc> <!-- English: "Specify the bits per pixel" -->
+ <fog-disable-desc>Disabilita nebbia/foschia</fog-disable-desc> <!-- English: "Disable fog/haze" -->
+ <fog-fastest-desc>Abilita nebbia/foschia piu' veloce</fog-fastest-desc> <!-- English: "Enable fastest fog/haze" -->
+ <fog-nicest-desc>Abilita la migliore nebbia/foschia</fog-nicest-desc> <!-- English: "Enable nicest fog/haze" -->
+ <disable-horizon-effect>Disabilita l'illusione della crescita dei corpi celestiali vicino all'orizzonte</disable-horizon-effect> <!-- English: "Disable celestial body growth illusion near the horizon" -->
+ <enable-horizon-effect>Abilita l'illusione della crescita dei corpi celestiali vicino all'orizzonte </enable-horizon-effect> <!-- English: "Enable celestial body growth illusion near the horizon" -->
+ <disable-enhanced-lighting>Disabilita l'aumento della luce sulla pista</disable-enhanced-lighting> <!-- English: "Disable enhanced runway lighting" -->
+ <enable-enhanced-lighting>Abilita l'aumento della luce sulla pista </enable-enhanced-lighting> <!-- English: "Enable enhanced runway lighting" -->
+ <disable-distance-attenuation>Disabilita l'attenuazione della luce sulla pista in distanza</disable-distance-attenuation> <!-- English: "Disable runway light distance attenuation" -->
+ <enable-distance-attenuation>Abilita l'attenuazione della luce sulla pista in distanza </enable-distance-attenuation> <!-- English: "Enable runway light distance attenuation" -->
+ <disable-specular-highlight>Disabilita riflessione speculare sulla struttura degli oggetti </disable-specular-highlight> <!-- English: "Disable specular reflections on textured objects" -->
+ <enable-specular-highlight>Abilita riflessione speculare sulla struttura degli oggetti </enable-specular-highlight> <!-- English: "Enable specular reflections on textured objects" -->
+ <enable-clouds-desc>Abilita 2D (piatti) strati di nuvola</enable-clouds-desc> <!-- English: "Enable 2D (flat) cloud layers" -->
+ <disable-clouds-desc>Disabilita 2D (piatti) strati di nuvola </disable-clouds-desc> <!-- English: "Disable 2D (flat) cloud layers" -->
+ <enable-clouds3d-desc>Abilita 3D (volumetrico) strati di nuvola </enable-clouds3d-desc> <!-- English: "Enable 3D (volumetric) cloud layers" -->
+ <disable-clouds3d-desc>Disabilita 3D (volumetrico) strati di nuvola </disable-clouds3d-desc> <!-- English: "Disable 3D (volumetric) cloud layers" -->
+ <fov-desc>Specifica l'angolo del campo visuale </fov-desc> <!-- English: "Specify field of view angle" -->
+ <arm-desc>Specifica un moltiplicatore per l'allungamento alare</arm-desc> <!-- English: "Specify a multiplier for the aspect ratio." -->
+ <disable-fullscreen-desc>Disabilita modalita' a schermo pieno</disable-fullscreen-desc> <!-- English: "Disable fullscreen mode" -->
+ <enable-fullscreen-desc>Abilita modalita' a schermo pieno </enable-fullscreen-desc> <!-- English: "Enable fullscreen mode" -->
+ <shading-flat-desc>Abilita piatta ombreggiattura</shading-flat-desc> <!-- English: "Enable flat shading" -->
+ <shading-smooth-desc>Abilita liscia ombreggiatura</shading-smooth-desc> <!-- English: "Enable smooth shading" -->
+ <disable-skyblend-desc>Disabilita mescolamento del cielo</disable-skyblend-desc> <!-- English: "Disable sky blending" -->
+ <enable-skyblend-desc>Abilita mescolamento del cielo </enable-skyblend-desc> <!-- English: "Enable sky blending" -->
+ <disable-textures-desc>Disabilita texture</disable-textures-desc> <!-- English: "Disable textures" -->
+ <enable-textures-desc>Abilita texture</enable-textures-desc> <!-- English: "Enable textures" -->
+ <materials-file-desc>Specifica i file materiali usati per creare lo scenario (default:materiali.xml)</materials-file-desc> <!-- English: "Specify the materials file used to render the scenery (default: materials.xml)" -->
+ <texture-filtering-desc>Anisotropo Texture Filtro:valori dovrebbero essere 1 (default), 2, 4, 8 o 16</texture-filtering-desc> <!-- English: "Anisotropic Texture Filtering: values should be 1 (default),2,4,8 or 16" -->
+ <disable-wireframe-desc>Disabilita modalita' disegno wireframe</disable-wireframe-desc> <!-- English: "Disable wireframe drawing mode" -->
+ <enable-wireframe-desc>Abilita modalita' disegno wireframe</enable-wireframe-desc> <!-- English: "Enable wireframe drawing mode" -->
+ <geometry-desc>Specifica la grandezza della finestra (640x480 ecc.)</geometry-desc> <!-- English: "Specify window geometry (640x480, etc)" -->
+ <view-offset-desc>Specifica la direzione frontale di vista default come uno offset da punto do frontale. Permesse valori sono SINISTRA,DESTRA,CENTRO, o uno specific numero di gradi</view-offset-desc> <!-- English: "Specify the default forward view direction as an offset from straight ahead. Allowable values are LEFT, RIGHT, CENTER, or a specific number in degrees" -->
+ <visibility-desc>Specifica l'iniziale visibilita'</visibility-desc> <!-- English: "Specify initial visibility" -->
+ <visibility-miles-desc>Specifica l'iniziale visibilita' in miglia</visibility-miles-desc> <!-- English: "Specify initial visibility in miles" -->
+ <max-fps-desc>Massima frame rate in Hz</max-fps-desc> <!-- English: "Maximum frame rate in Hz." -->
<!-- Hud options -->
-<!-- <hud-options>???</hud-options> --> <!-- English: "Hud Options" -->
-<!-- <hud-tris-desc>???</hud-tris-desc> --> <!-- English: "Hud displays number of triangles rendered" -->
-<!-- <hud-culled-desc>???</hud-culled-desc> --> <!-- English: "Hud displays percentage of triangles culled" -->
+ <hud-options>Opzioni HUD</hud-options> <!-- English: "Hud Options" -->
+ <hud-tris-desc>Hud mostra un numero di triangoli creati</hud-tris-desc> <!-- English: "Hud displays number of triangles rendered" -->
+ <hud-culled-desc>Hud mostra una percentuale di triangoli raccolti</hud-culled-desc> <!-- English: "Hud displays percentage of triangles culled" -->
<!-- Time options -->
-<!-- <time-options>???</time-options> --> <!-- English: "Time Options" -->
-<!-- <timeofday-desc>???</timeofday-desc> --> <!-- English: "Specify a time of day" -->
-<!-- <season-desc>???</season-desc> --> <!-- English: "Specify the startup season" -->
-<!-- <time-offset-desc>???</time-offset-desc> --> <!-- English: "Add this time offset" -->
-<!-- <time-match-real-desc>???</time-match-real-desc> --> <!-- English: "Synchronize time with real-world time" -->
-<!-- <time-match-local-desc>???</time-match-local-desc> --> <!-- English: "Synchronize time with local real-world time" -->
-<!-- <start-date-desc>???</start-date-desc> --> <!-- English: "Specify a starting date/time with respect to" -->
+ <time-options>Opzioni Orario</time-options> <!-- English: "Time Options" -->
+ <timeofday-desc>Specifica un orario del giorno</timeofday-desc> <!-- English: "Specify a time of day" -->
+ <season-desc>Specifica la stagione all'avvio</season-desc> <!-- English: "Specify the startup season" -->
+ <time-offset-desc>Aggiungi un ritardo a questo orario</time-offset-desc> <!-- English: "Add this time offset" -->
+ <time-match-real-desc>Sincronizza orario con orario del mondo in tempo reale</time-match-real-desc> <!-- English: "Synchronize time with real-world time" -->
+ <time-match-local-desc>Sincronizza orario con il locale orario del mondo in tempo reale</time-match-local-desc> <!-- English: "Synchronize time with local real-world time" -->
+ <start-date-desc>Specifica un iniziale data/ora in rispetto a </start-date-desc> <!-- English: "Specify a starting date/time with respect to" -->
<!-- Network options -->
-<!-- <network-options>???</network-options> --> <!-- English: "Network Options" -->
-<!-- <httpd-desc>???</httpd-desc> --> <!-- English: "Enable http server on the specified port" -->
-<!-- <proxy-desc>???</proxy-desc> --> <!-- English: "Specify which proxy server (and port) to use. The username and password are optional and should be MD5 encoded already. This option is only useful when used in conjunction with the real-weather-fetch option." -->
-<!-- <telnet-desc>???</telnet-desc> --> <!-- English: "Enable telnet server on the specified port" -->
-<!-- <jpg-httpd-desc>???</jpg-httpd-desc> --> <!-- English: "Enable screen shot http server on the specified port" -->
-<!-- <disable-terrasync-desc>???</disable-terrasync-desc> --> <!-- English: "Disable automatic scenery downloads/updates" -->
-<!-- <enable-terrasync-desc>???</enable-terrasync-desc> --> <!-- English: "Enable automatic scenery downloads/updates" -->
-<!-- <terrasync-dir-desc>???</terrasync-dir-desc> --> <!-- English: "Set target directory for scenery downloads" -->
+ <network-options>Opzioni di Rete</network-options> <!-- English: "Network Options" -->
+ <httpd-desc>Abilita http server sulla porta specifica</httpd-desc> <!-- English: "Enable http server on the specified port" -->
+ <proxy-desc>Specifica quale proxy server (e uscita) da usare. Il nome utente e password sono opzionali e dovrebbero essere codificati in MD5.Questa opzione e' utile solo quando e' usata un congiunzione con il raccoglimento meteo in tempo reale.</proxy-desc> <!-- English: "Specify which proxy server (and port) to use. The username and password are optional and should be MD5 encoded already. This option is only useful when used in conjunction with the real-weather-fetch option." -->
+ <telnet-desc>Abilita il server telnet sull'uscita specificata</telnet-desc> <!-- English: "Enable telnet server on the specified port" -->
+ <jpg-httpd-desc>Abilita cattura dello schermo http server sull'uscita specificata</jpg-httpd-desc> <!-- English: "Enable screen shot http server on the specified port" -->
+ <disable-terrasync-desc>Disabilita download/aggiornamenti automatici del scenario</disable-terrasync-desc> <!-- English: "Disable automatic scenery downloads/updates" -->
+ <enable-terrasync-desc>Abilita download/aggiornamenti automatici del scenario </enable-terrasync-desc> <!-- English: "Enable automatic scenery downloads/updates" -->
+ <terrasync-dir-desc>Imposta la locazione per I download di scenario</terrasync-dir-desc> <!-- English: "Set target directory for scenery downloads" -->
<!-- MultiPlayer options -->
-<!-- <multiplayer-options>???</multiplayer-options> --> <!-- English: "MultiPlayer Options" -->
-<!-- <multiplay-desc>???</multiplay-desc> --> <!-- English: "Specify multipilot communication settings" -->
-<!-- <callsign-desc>???</callsign-desc> --> <!-- English: "assign a unique name to a player" -->
+ <multiplayer-options>Opzioni Multigiocatore</multiplayer-options> <!-- English: "MultiPlayer Options" -->
+ <multiplay-desc>Specifica impostazioni di comunicazione multipilota</multiplay-desc> <!-- English: "Specify multipilot communication settings" -->
+ <callsign-desc>Assegna un nome unico a un giocatore</callsign-desc> <!-- English: "assign a unique name to a player" -->
<!-- Route/Way Point Options -->
-<!-- <route-options>???</route-options> --> <!-- English: "Route/Way Point Options" -->
-<!-- <wp-desc>???</wp-desc> --> <!-- English: "Specify a waypoint for the GC autopilot;" -->
-<!-- <flight-plan-desc>???</flight-plan-desc> --> <!-- English: "Read all waypoints from a file" -->
+ <route-options>Opzioni Percorso/Punto di locazione</route-options> <!-- English: "Route/Way Point Options" -->
+ <wp-desc>Specifica il punto di locazione per l'autopilota GC</wp-desc> <!-- English: "Specify a waypoint for the GC autopilot;" -->
+ <flight-plan-desc>Leggi tutti i punti di locazione da un file</flight-plan-desc> <!-- English: "Read all waypoints from a file" -->
<!-- IO Options -->
-<!-- <io-options>???</io-options> --> <!-- English: "IO Options" -->
-<!-- <AV400-desc>???</AV400-desc> --> <!-- English: "Emit the Garmin AV400 protocol required to drive a Garmin 196/296 series GPS" -->
-<!-- <AV400Sim-desc>???</AV400Sim-desc> --> <!-- English: "Emit the set of AV400 strings required to drive a Garmin 400-series GPS from FlightGear" -->
-<!-- <atlas-desc>???</atlas-desc> --> <!-- English: "Open connection using the Atlas protocol" -->
-<!-- <atcsim-desc>???</atcsim-desc> --> <!-- English: "Open connection using the ATC sim protocol (atc610x)" -->
-<!-- <garmin-desc>???</garmin-desc> --> <!-- English: "Open connection using the Garmin GPS protocol" -->
-<!-- <joyclient-desc>???</joyclient-desc> --> <!-- English: "Open connection to an Agwagon joystick" -->
-<!-- <jsclient-desc>???</jsclient-desc> --> <!-- English: "Open connection to a remote joystick" -->
-<!-- <native-ctrls-desc>???</native-ctrls-desc> --> <!-- English: "Open connection using the FG Native Controls protocol" -->
-<!-- <native-fdm-desc>???</native-fdm-desc> --> <!-- English: "Open connection using the FG Native FDM protocol" -->
-<!-- <native-gui-desc>???</native-gui-desc> --> <!-- English: "Open connection using the FG Native GUI protocol" -->
-<!-- <native-desc>???</native-desc> --> <!-- English: "Open connection using the FG Native protocol" -->
-<!-- <nmea-desc>???</nmea-desc> --> <!-- English: "Open connection using the NMEA protocol" -->
-<!-- <generic-desc>???</generic-desc> --> <!-- English: "Open connection using a predefined communication interface and a preselected communication protocol" -->
-<!-- <opengc-desc>???</opengc-desc> --> <!-- English: "Open connection using the OpenGC protocol" -->
-<!-- <props-desc>???</props-desc> --> <!-- English: "Open connection using the interactive property manager" -->
-<!-- <pve-desc>???</pve-desc> --> <!-- English: "Open connection using the PVE protocol" -->
-<!-- <ray-desc>???</ray-desc> --> <!-- English: "Open connection using the Ray Woodworth motion chair protocol" -->
-<!-- <rul-desc>???</rul-desc> --> <!-- English: "Open connection using the RUL protocol" -->
+ <io-options>Opzioni IO</io-options> <!-- English: "IO Options" -->
+ <AV400-desc>Emetti il protocollo Garmin AV400 richiesto per guidare un Garmin serie 196/296 GPS</AV400-desc> <!-- English: "Emit the Garmin AV400 protocol required to drive a Garmin 196/296 series GPS" -->
+ <AV400Sim-desc>Emetti una serie do stringhe AV400 richieste per guidare un Garmin serie-400 GPS da FlightGear</AV400Sim-desc> <!-- English: "Emit the set of AV400 strings required to drive a Garmin 400-series GPS from FlightGear" -->
+ <atlas-desc>Apri connessione usando il protocollo Atlante</atlas-desc> <!-- English: "Open connection using the Atlas protocol" -->
+ <atcsim-desc>Apri una connessione usando il protocollo sim ATC </atcsim-desc> <!-- English: "Open connection using the ATC sim protocol (atc610x)" -->
+ <garmin-desc>Apri una connessione usando il protocollo Garmin GPS</garmin-desc> <!-- English: "Open connection using the Garmin GPS protocol" -->
+ <joyclient-desc>Apri una connessione a un joystiq Agwagon </joyclient-desc> <!-- English: "Open connection to an Agwagon joystick" -->
+ <jsclient-desc>Apri una connessione a un joystiq remoto</jsclient-desc> <!-- English: "Open connection to a remote joystick" -->
+ <native-ctrls-desc>Apri una connessione usando il protocollo FG Controlli Nativo</native-ctrls-desc> <!-- English: "Open connection using the FG Native Controls protocol" -->
+ <native-fdm-desc>Apri una connessione usando il Nativo FG protocollo FDM</native-fdm-desc> <!-- English: "Open connection using the FG Native FDM protocol" -->
+ <native-gui-desc>Apri una connessione usando il Nativo FG GUI protocollo </native-gui-desc> <!-- English: "Open connection using the FG Native GUI protocol" -->
+ <native-desc>Apri una connessione usando il Nativo protocollo FG </native-desc> <!-- English: "Open connection using the FG Native protocol" -->
+ <nmea-desc>Apri una connessione usando il protocollo NMEA </nmea-desc> <!-- English: "Open connection using the NMEA protocol" -->
+ <generic-desc>Apri una connessione usando una predefinita interfaccia di comunicazione e un protocollo di comunicazione preselezionato</generic-desc> <!-- English: "Open connection using a predefined communication interface and a preselected communication protocol" -->
+ <opengc-desc>Apri una connessione usando il protocollo OpenGC </opengc-desc> <!-- English: "Open connection using the OpenGC protocol" -->
+ <props-desc>Apri una connessione usando il controllo proprieta' interattivo</props-desc> <!-- English: "Open connection using the interactive property manager" -->
+ <pve-desc>Apri una connessione usando il protocollo PVE</pve-desc> <!-- English: "Open connection using the PVE protocol" -->
+ <ray-desc>Apri una connessione usando il protocollo sedile mobile Ray Woodworth</ray-desc> <!-- English: "Open connection using the Ray Woodworth motion chair protocol" -->
+ <rul-desc>Apri una connessione usando il protocollo RUL</rul-desc> <!-- English: "Open connection using the RUL protocol" -->
<!-- Avionics Options -->
-<!-- <avionics-options>???</avionics-options> --> <!-- English: "Avionics Options" -->
-<!-- <com1-desc>???</com1-desc> --> <!-- English: "Set the COM1 radio frequency" -->
-<!-- <com2-desc>???</com2-desc> --> <!-- English: "Set the COM2 radio frequency" -->
-<!-- <nav1-desc>???</nav1-desc> --> <!-- English: "Set the NAV1 radio frequency, optionally preceded by a radial." -->
-<!-- <nav2-desc>???</nav2-desc> --> <!-- English: "Set the NAV2 radio frequency, optionally preceded by a radial." -->
-<!-- <adf1-desc>???</adf1-desc> --> <!-- English: "Set the ADF1 radio frequency, optionally preceded by a card rotation." -->
-<!-- <adf2-desc>???</adf2-desc> --> <!-- English: "Set the ADF2 radio frequency, optionally preceded by a card rotation." -->
-<!-- <dme-desc>???</dme-desc> --> <!-- English: "Slave the ADF to one of the NAV radios, or set its internal frequency." -->
+ <avionics-options>Opzioni di avionica</avionics-options> <!-- English: "Avionics Options" -->
+ <com1-desc>Imposta il COM1 frequenza radio</com1-desc> <!-- English: "Set the COM1 radio frequency" -->
+ <com2-desc>Imposta il COM2 frequenza radio </com2-desc> <!-- English: "Set the COM2 radio frequency" -->
+ <nav1-desc>Imposta il NAV1 frequenza radio, puo' essere predeceduta opzionalmente da un radiale</nav1-desc> <!-- English: "Set the NAV1 radio frequency, optionally preceded by a radial." -->
+ <nav2-desc>Imposta il NAV2 frequenza radio, puo' essere predeceduta opzionalmente da un radiale</nav2-desc> <!-- English: "Set the NAV2 radio frequency, optionally preceded by a radial." -->
+ <adf1-desc>Imposta il ADF1 frequenza radio, puo' essere predeceduta opzionalmente da una rotazione della carta</adf1-desc> <!-- English: "Set the ADF1 radio frequency, optionally preceded by a card rotation." -->
+ <adf2-desc>Imposta il ADF2 frequenza radio, puo' essere predeceduta opzionalmente da una rotazione della carta </adf2-desc> <!-- English: "Set the ADF2 radio frequency, optionally preceded by a card rotation." -->
+ <dme-desc>Rendi schiavo un ADF a uno dei radio NAV, o imposta la sua frequenza interna</dme-desc> <!-- English: "Slave the ADF to one of the NAV radios, or set its internal frequency." -->
-<!-- <situation-options>???</situation-options> --> <!-- English: "Situation Options" -->
-<!-- <failure-desc>???</failure-desc> --> <!-- English: "Fail the pitot, static, vacuum, or electrical system (repeat the option for multiple system failures)." -->
+ <situation-options>Opzioni di situazione</situation-options> <!-- English: "Situation Options" -->
+ <failure-desc>Fallisci il pitot, statico, vuoto, o sistema elettrico (ripeti l'opzione per multipli sistemi di fallimento</failure-desc> <!-- English: "Fail the pitot, static, vacuum, or electrical system (repeat the option for multiple system failures)." -->
<!-- Debugging Options -->
-<!-- <debugging-options>???</debugging-options> --> <!-- English: "Debugging Options" -->
-<!-- <fpe-desc>???</fpe-desc> --> <!-- English: "Abort on encountering a floating point exception;" -->
-<!-- <fgviewer-desc>???</fgviewer-desc> --> <!-- English: "Use a model viewer rather than load the entire simulator;" -->
-<!-- <trace-read-desc>???</trace-read-desc> --> <!-- English: "Trace the reads for a property;" -->
-<!-- <trace-write-desc>???</trace-write-desc> --> <!-- English: "Trace the writes for a property;" -->
-<!-- <log-level-desc>???</log-level-desc> --> <!-- English: "Specify which logging level to use" -->
-<!-- <log-class-desc>???</log-class-desc> --> <!-- English: "Specify which logging class(es) to use" -->
+ <debugging-options>Opzioni Debugging</debugging-options> <!-- English: "Debugging Options" -->
+ <fpe-desc>Aborta sull'incontro a eccezione di un punto fluttuante</fpe-desc> <!-- English: "Abort on encountering a floating point exception;" -->
+ <fgviewer-desc>Usa un modello visual invece dell'intero simulatore</fgviewer-desc> <!-- English: "Use a model viewer rather than load the entire simulator;" -->
+ <trace-read-desc>Rintraccia le letture per una proprieta'</trace-read-desc> <!-- English: "Trace the reads for a property;" -->
+ <trace-write-desc>Rintraccia le scritture per una proprieta'</trace-write-desc> <!-- English: "Trace the writes for a property;" -->
+ <log-level-desc>Specifica quale livello di logging da usare</log-level-desc> <!-- English: "Specify which logging level to use" -->
+ <log-class-desc>Specifica quale classe logging(es) da usare</log-class-desc> <!-- English: "Specify which logging class(es) to use" -->
</PropertyList>
diff --git a/Translations/nl/menu.xml b/Translations/nl/menu.xml
index a77361f76..1036945bc 100644
--- a/Translations/nl/menu.xml
+++ b/Translations/nl/menu.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-10 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -102,6 +104,7 @@
<reload-panel>Paneel herladen</reload-panel> <!-- English: "Reload Panel" -->
<reload-autopilot>Autopilot herladen</reload-autopilot> <!-- English: "Reload Autopilot" -->
<reload-network>Network herladen</reload-network> <!-- English: "Reload Network" -->
+ <reload-model>Vliegtuigmodel herladen</reload-model> <!-- English: "Reload Aircraft Model" -->
<nasal-console>Nasal console</nasal-console> <!-- English: "Nasal Console" -->
<development-keys>Ontwikkelingstoetsen</development-keys> <!-- English: "Development Keys" -->
<configure-dev-extension>Ontwikkelingsextensies beheren</configure-dev-extension> <!-- English: "Configure Development Extensions" -->
diff --git a/Translations/nl/options.xml b/Translations/nl/options.xml
index 4d1fa8600..d45cc94bf 100644
--- a/Translations/nl/options.xml
+++ b/Translations/nl/options.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-10 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -36,6 +38,7 @@
<enable-game-mode-desc>Schermvullende spelmode inschakelen</enable-game-mode-desc> <!-- English: "Enable full-screen game mode" -->
<disable-splash-screen-desc>Introductie scherm overslaan</disable-splash-screen-desc> <!-- English: "Disable splash screen" -->
<enable-splash-screen-desc>Introductie scherm laten zien</enable-splash-screen-desc> <!-- English: "Enable splash screen" -->
+<!-- <restore-defaults-desc>???</restore-defaults-desc> --> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
<disable-save-on-exit>Sla de instellingen niet op bij het afsluiten</disable-save-on-exit> <!-- English: "Don't save preferences upon program exit" -->
<enable-save-on-exit>Sla instellingen op bij het afsluiten</enable-save-on-exit> <!-- English: "Allow saving preferences at program exit" -->
<disable-intro-music-desc>Introductie muziek overslaan</disable-intro-music-desc> <!-- English: "Disable introduction music" -->
@@ -45,6 +48,10 @@
<enable-mouse-pointer-desc n="1">(voor Voodoo kaarten in volledige scherm mode)</enable-mouse-pointer-desc> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
<disable-random-objects-desc>Willekeurig geplaatste objecten verbergen</disable-random-objects-desc> <!-- English: "Exclude random scenery objects" -->
<enable-random-objects-desc>Willekeurig geplaatste objecten wel tonen</enable-random-objects-desc> <!-- English: "Include random scenery objects" -->
+<!-- <disable-random-vegetation-desc>???</disable-random-vegetation-desc> --> <!-- English: "Exclude random vegetation objects" -->
+<!-- <enable-random-vegetation-desc>???</enable-random-vegetation-desc> --> <!-- English: "Include random vegetation objects" -->
+<!-- <disable-random-buildings-desc>???</disable-random-buildings-desc> --> <!-- English: "Exclude random buildings objects" -->
+<!-- <enable-random-buildings-desc>???</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
<disable-real-weather-fetch-desc>Schakel live weer op basis van METAR uit</disable-real-weather-fetch-desc> <!-- English: "Disable METAR based real weather fetching" -->
<enable-real-weather-fetch-desc>Schakel live weer op basis van METAR in (hiervoor is een internetverbinding vereist)</enable-real-weather-fetch-desc> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
<metar-desc>Geef een METAR om statisch weer in te stellen</metar-desc> <!-- English: "Pass a METAR to set up static weather" -->
diff --git a/Translations/pl/menu.xml b/Translations/pl/menu.xml
index 24accf4af..1b8b02b2e 100644
--- a/Translations/pl/menu.xml
+++ b/Translations/pl/menu.xml
@@ -1,138 +1,141 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- FlightGear menu: Polish language resource -->
-
-<!--
- To chyba powinno sie udac...
- Autor: Zbigniew Matysek, gratki dla Krzysztofa Matyska.
-
- Special thanks to previous translators:
- Peter Michael Jaworski, Wojciech Jozwiak, Maciej Obarski and Krzysztof Nowak
--->
-
-<!-- ###
-### This file is automatically synchronized with the master (=English language) resource.
-### Please do not add comments, change order or restructure the file.
-###
-### To translate:
-### * Replace "???" entries with appropriate translation.
-### * Remove enclosing "<!-_ ... _->" tags for completed translations.
-### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
-### so we know which version of the English original the translation is based upon
-### (and we can identify translations which need to be updated, when the original changes).
-### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
-### consecutive "-" characters in comments).
-###
-### Last synchronized with English master resource on 2012-July-11 for FlightGear 2.8.0
-### -->
-<PropertyList>
-
- <!-- File menu -->
- <file>Plik</file> <!-- English: "File" -->
- <reset>Reset</reset> <!-- English: "Reset" -->
- <snap-shot>Zrzut ekranu</snap-shot> <!-- English: "Screenshot " -->
- <snap-shot-dir>Folder Zrzutow Ekr.</snap-shot-dir> <!-- English: "Screenshot Directory" -->
- <sound-config>Ustawienia Dzwiekow</sound-config> <!-- English: "Sound Configuration" -->
- <exit>Zakoncz</exit> <!-- English: "Quit " -->
-
- <!-- View menu -->
- <view>Widok</view> <!-- English: "View" -->
- <display-options>Opcje Wyswietlania</display-options> <!-- English: "Display Options" -->
- <rendering-options>Opcje Renderowania</rendering-options> <!-- English: "Rendering Options" -->
- <view-options>Dostepne Kamery</view-options> <!-- English: "View Options" -->
- <cockpit-view-options>Opcje Widoku z Kokpitu</cockpit-view-options> <!-- English: "Cockpit View Options" -->
- <adjust-lod>Dostosuj poziom Szczegolow (LOD)</adjust-lod> <!-- English: "Adjust LOD Ranges" -->
- <pilot-offset>Położenie Pilota</pilot-offset> <!-- English: "Adjust View Position" -->
- <adjust-hud>Dostosuj HUD</adjust-hud> <!-- English: "Adjust HUD Properties" -->
- <toggle-glide-slope>Wl/Wyl Znaczniki Sciezki Podejscia</toggle-glide-slope> <!-- English: "Toggle Glide Slope Tunnel" -->
- <replay>Powtorka</replay> <!-- English: "Instant Replay" -->
- <stereoscopic-options>Opcje Wyswietlania 3D</stereoscopic-options> <!-- English: "Stereoscopic View Options" -->
-
- <!-- Location menu -->
- <location>Pozycja</location> <!-- English: "Location" -->
- <position-on-ground>Na Ziemii</position-on-ground> <!-- English: "Position Aircraft On Ground" -->
- <position-in-air>W Powietrzu</position-in-air> <!-- English: "Position Aircraft In Air" -->
- <goto-airport>Wybierz Lotnisko</goto-airport> <!-- English: "Select Airport From List" -->
- <random-attitude>Losowa Orientacja</random-attitude> <!-- English: "Random Attitude" -->
- <tower-position>Lokalizacja Wiezy</tower-position> <!-- English: "Tower Position" -->
-
- <!-- Autopilot menu -->
- <autopilot>Autopilot</autopilot> <!-- English: "Autopilot" -->
- <autopilot-settings>Ustawienia</autopilot-settings> <!-- English: "Autopilot Settings" -->
- <route-manager>Planowanie Lotu</route-manager> <!-- English: "Route Manager" -->
- <previous-waypoint>Poprzedni Punkt Nawigacyjny</previous-waypoint> <!-- English: "Previous Waypoint" -->
- <next-waypoint>Nastepny Punkt Nawigacyjny</next-waypoint> <!-- English: "Next Waypoint" -->
-
- <!-- Environment menu -->
- <environment>Środowisko</environment> <!-- English: "Environment" -->
- <global-weather>Pogoda</global-weather> <!-- English: "Weather" -->
- <time-settings>Czas</time-settings> <!-- English: "Time Settings" -->
- <wildfire-settings>Ustawienia Pozarow</wildfire-settings> <!-- English: "Wildfire Settings" -->
- <terrasync>Pobieranie Scenerii</terrasync> <!-- English: "Scenery Download" -->
-
- <!-- Equipment menu -->
- <equipment>Wyposazenie</equipment> <!-- English: "Equipment" -->
- <map>Mapa</map> <!-- English: "Map" -->
- <stopwatch>Stoper</stopwatch> <!-- English: "Stopwatch" -->
- <fuel-and-payload>Paliwo i Ladunek</fuel-and-payload> <!-- English: "Fuel and Payload" -->
- <radio>Radio</radio> <!-- English: "Radio Settings" -->
- <gps>Ustawienia GPS</gps> <!-- English: "GPS Settings" -->
- <instrument-settings>Ustawienia Przyrzadow</instrument-settings> <!-- English: "Instrument Settings" -->
- <failure-submenu>Awarie</failure-submenu> <!-- English: " -_- Failures -_-" -->
- <random-failures>Awarie Losowe</random-failures> <!-- English: "Random Failures" -->
- <system-failures>Awarie Systemow</system-failures> <!-- English: "System Failures" -->
- <instrument-failures>Awarie Przyrzadow</instrument-failures> <!-- English: "Instrument Failures" -->
-
- <!-- AI menu -->
- <ai>AI</ai> <!-- English: "AI" -->
- <scenario>Scenariusze AI</scenario> <!-- English: "Traffic and Scenario Settings" -->
- <atc-in-range>ATC w Zasiegu</atc-in-range> <!-- English: "ATC Services in Range" -->
- <wingman>Skrzydlowy</wingman> <!-- English: "Wingman Controls" -->
- <tanker>Latajaca Cysterna</tanker> <!-- English: "Tanker Controls" -->
- <carrier>Lotniskowiec</carrier> <!-- English: "Carrier Controls" -->
- <jetway>Rekaw</jetway> <!-- English: "Jetway Settings" -->
-
- <!-- Multiplayer menu -->
- <multiplayer>Multiplayer</multiplayer> <!-- English: "Multiplayer" -->
- <mp-settings>Ustawienia</mp-settings> <!-- English: "Multiplayer Settings" -->
- <mp-chat>Chat</mp-chat> <!-- English: "Chat Dialog" -->
- <mp-chat-menu>Menu Chat</mp-chat-menu> <!-- English: "Chat Menu" -->
- <mp-list>Lista Pilotów</mp-list> <!-- English: "Pilot List" -->
- <mp-carrier>Wybor Lotniskowca MP</mp-carrier> <!-- English: "MPCarrier Selection" -->
-
- <!-- Debug menu -->
-<!-- <debug>???</debug> --> <!-- English: "Debug" -->
- <!-- Note: Debug menu items may not need to be translated
- since these options are not useful to end users anyway. -->
-<!-- <reload-gui>???</reload-gui> --> <!-- English: "Reload GUI" -->
-<!-- <reload-input>???</reload-input> --> <!-- English: "Reload Input" -->
-<!-- <reload-hud>???</reload-hud> --> <!-- English: "Reload HUD" -->
-<!-- <reload-panel>???</reload-panel> --> <!-- English: "Reload Panel" -->
-<!-- <reload-autopilot>???</reload-autopilot> --> <!-- English: "Reload Autopilot" -->
-<!-- <reload-network>???</reload-network> --> <!-- English: "Reload Network" -->
-<!-- <nasal-console>???</nasal-console> --> <!-- English: "Nasal Console" -->
-<!-- <development-keys>???</development-keys> --> <!-- English: "Development Keys" -->
-<!-- <configure-dev-extension>???</configure-dev-extension> --> <!-- English: "Configure Development Extensions" -->
-<!-- <display-marker>???</display-marker> --> <!-- English: "Display Tutorial Marker" -->
-<!-- <dump-scene-graph>???</dump-scene-graph> --> <!-- English: "Dump Scene Graph" -->
-<!-- <print-rendering-statistics>???</print-rendering-statistics> --> <!-- English: "Print Rendering Statistics" -->
-<!-- <statistics-display>???</statistics-display> --> <!-- English: "Cycle On-Screen Statistics" -->
-<!-- <performance-monitor>???</performance-monitor> --> <!-- English: "Monitor System Performance" -->
-<!-- <property-browser>???</property-browser> --> <!-- English: "Browse Internal Properties" -->
-<!-- <logging>???</logging> --> <!-- English: "Logging" -->
-<!-- <local_weather>???</local_weather> --> <!-- English: "Local Weather (Test)" -->
-<!-- <print-scene-info>???</print-scene-info> --> <!-- English: "Print Visible Scene Info" -->
-<!-- <rendering-buffers>???</rendering-buffers> --> <!-- English: "Hide/Show Rendering Buffers" -->
-<!-- <rembrandt-buffers-choice>???</rembrandt-buffers-choice> --> <!-- English: "Select Rendering Buffers" -->
-
- <!-- Help menu -->
- <help>Pomoc</help> <!-- English: "Help" -->
- <help-browser>Pomoc (w pzegladarce)</help-browser> <!-- English: "Help (opens in browser)" -->
- <aircraft-keys>Dla Tego Samolotu</aircraft-keys> <!-- English: "Aircraft Help" -->
- <common-keys>Klawisze Sterowania</common-keys> <!-- English: "Common Aircraft Keys" -->
- <basic-keys>Klawiszologia Symulatora</basic-keys> <!-- English: "Basic Simulator Keys" -->
- <joystick-info>Informacje o Joysticku</joystick-info> <!-- English: "Joystick Information" -->
- <tutorial-start>Tutoriale</tutorial-start> <!-- English: "Tutorials" -->
- <menu-about>O Programie</menu-about> <!-- English: "About" -->
-
-</PropertyList>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- FlightGear menu: Polish language resource -->
+
+<!--
+ To chyba powinno sie udac...
+ Autor: Zbigniew Matysek, gratki dla Krzysztofa Matyska.
+
+ Special thanks to previous translators:
+ Peter Michael Jaworski, Wojciech Jozwiak, Maciej Obarski and Krzysztof Nowak
+-->
+
+<!-- ###
+### This file is automatically synchronized with the master (=English language) resource.
+### Please do not add comments, change order or restructure the file.
+###
+### To translate:
+### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
+### * Remove enclosing "<!-_ ... _->" tags for completed translations.
+### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
+### so we know which version of the English original the translation is based upon
+### (and we can identify translations which need to be updated, when the original changes).
+### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
+### consecutive "-" characters in comments).
+###
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
+### -->
+<PropertyList>
+
+ <!-- File menu -->
+ <file>Plik</file> <!-- English: "File" -->
+ <reset>Reset</reset> <!-- English: "Reset" -->
+ <snap-shot>Zrzut ekranu</snap-shot> <!-- English: "Screenshot " -->
+ <snap-shot-dir>Folder Zrzutow Ekr.</snap-shot-dir> <!-- English: "Screenshot Directory" -->
+ <sound-config>Ustawienia Dzwiekow</sound-config> <!-- English: "Sound Configuration" -->
+ <exit>Zakoncz</exit> <!-- English: "Quit " -->
+
+ <!-- View menu -->
+ <view>Widok</view> <!-- English: "View" -->
+ <display-options>Opcje Wyswietlania</display-options> <!-- English: "Display Options" -->
+ <rendering-options>Opcje Renderowania</rendering-options> <!-- English: "Rendering Options" -->
+ <view-options>Dostepne Kamery</view-options> <!-- English: "View Options" -->
+ <cockpit-view-options>Opcje Widoku z Kokpitu</cockpit-view-options> <!-- English: "Cockpit View Options" -->
+ <adjust-lod>Dostosuj poziom Szczegolow (LOD)</adjust-lod> <!-- English: "Adjust LOD Ranges" -->
+ <pilot-offset>Położenie Pilota</pilot-offset> <!-- English: "Adjust View Position" -->
+ <adjust-hud>Dostosuj HUD</adjust-hud> <!-- English: "Adjust HUD Properties" -->
+ <toggle-glide-slope>Wl/Wyl Znaczniki Sciezki Podejscia</toggle-glide-slope> <!-- English: "Toggle Glide Slope Tunnel" -->
+ <replay>Powtorka</replay> <!-- English: "Instant Replay" -->
+ <stereoscopic-options>Opcje Wyswietlania 3D</stereoscopic-options> <!-- English: "Stereoscopic View Options" -->
+
+ <!-- Location menu -->
+ <location>Pozycja</location> <!-- English: "Location" -->
+ <position-on-ground>Na Ziemii</position-on-ground> <!-- English: "Position Aircraft On Ground" -->
+ <position-in-air>W Powietrzu</position-in-air> <!-- English: "Position Aircraft In Air" -->
+ <goto-airport>Wybierz Lotnisko</goto-airport> <!-- English: "Select Airport From List" -->
+ <random-attitude>Losowa Orientacja</random-attitude> <!-- English: "Random Attitude" -->
+ <tower-position>Lokalizacja Wiezy</tower-position> <!-- English: "Tower Position" -->
+
+ <!-- Autopilot menu -->
+ <autopilot>Autopilot</autopilot> <!-- English: "Autopilot" -->
+ <autopilot-settings>Ustawienia</autopilot-settings> <!-- English: "Autopilot Settings" -->
+ <route-manager>Planowanie Lotu</route-manager> <!-- English: "Route Manager" -->
+ <previous-waypoint>Poprzedni Punkt Nawigacyjny</previous-waypoint> <!-- English: "Previous Waypoint" -->
+ <next-waypoint>Nastepny Punkt Nawigacyjny</next-waypoint> <!-- English: "Next Waypoint" -->
+
+ <!-- Environment menu -->
+ <environment>Środowisko</environment> <!-- English: "Environment" -->
+ <global-weather>Pogoda</global-weather> <!-- English: "Weather" -->
+ <time-settings>Czas</time-settings> <!-- English: "Time Settings" -->
+ <wildfire-settings>Ustawienia Pozarow</wildfire-settings> <!-- English: "Wildfire Settings" -->
+ <terrasync>Pobieranie Scenerii</terrasync> <!-- English: "Scenery Download" -->
+
+ <!-- Equipment menu -->
+ <equipment>Wyposazenie</equipment> <!-- English: "Equipment" -->
+ <map>Mapa</map> <!-- English: "Map" -->
+ <stopwatch>Stoper</stopwatch> <!-- English: "Stopwatch" -->
+ <fuel-and-payload>Paliwo i Ladunek</fuel-and-payload> <!-- English: "Fuel and Payload" -->
+ <radio>Radio</radio> <!-- English: "Radio Settings" -->
+ <gps>Ustawienia GPS</gps> <!-- English: "GPS Settings" -->
+ <instrument-settings>Ustawienia Przyrzadow</instrument-settings> <!-- English: "Instrument Settings" -->
+ <failure-submenu>Awarie</failure-submenu> <!-- English: " -_- Failures -_-" -->
+ <random-failures>Awarie Losowe</random-failures> <!-- English: "Random Failures" -->
+ <system-failures>Awarie Systemow</system-failures> <!-- English: "System Failures" -->
+ <instrument-failures>Awarie Przyrzadow</instrument-failures> <!-- English: "Instrument Failures" -->
+
+ <!-- AI menu -->
+ <ai>AI</ai> <!-- English: "AI" -->
+ <scenario>Scenariusze AI</scenario> <!-- English: "Traffic and Scenario Settings" -->
+ <atc-in-range>ATC w Zasiegu</atc-in-range> <!-- English: "ATC Services in Range" -->
+ <wingman>Skrzydlowy</wingman> <!-- English: "Wingman Controls" -->
+ <tanker>Latajaca Cysterna</tanker> <!-- English: "Tanker Controls" -->
+ <carrier>Lotniskowiec</carrier> <!-- English: "Carrier Controls" -->
+ <jetway>Rekaw</jetway> <!-- English: "Jetway Settings" -->
+
+ <!-- Multiplayer menu -->
+ <multiplayer>Multiplayer</multiplayer> <!-- English: "Multiplayer" -->
+ <mp-settings>Ustawienia</mp-settings> <!-- English: "Multiplayer Settings" -->
+ <mp-chat>Chat</mp-chat> <!-- English: "Chat Dialog" -->
+ <mp-chat-menu>Menu Chat</mp-chat-menu> <!-- English: "Chat Menu" -->
+ <mp-list>Lista Pilotów</mp-list> <!-- English: "Pilot List" -->
+ <mp-carrier>Wybor Lotniskowca MP</mp-carrier> <!-- English: "MPCarrier Selection" -->
+
+ <!-- Debug menu -->
+<!-- <debug>???</debug> --> <!-- English: "Debug" -->
+ <!-- Note: Debug menu items may not need to be translated
+ since these options are not useful to end users anyway. -->
+<!-- <reload-gui>???</reload-gui> --> <!-- English: "Reload GUI" -->
+<!-- <reload-input>???</reload-input> --> <!-- English: "Reload Input" -->
+<!-- <reload-hud>???</reload-hud> --> <!-- English: "Reload HUD" -->
+<!-- <reload-panel>???</reload-panel> --> <!-- English: "Reload Panel" -->
+<!-- <reload-autopilot>???</reload-autopilot> --> <!-- English: "Reload Autopilot" -->
+<!-- <reload-network>???</reload-network> --> <!-- English: "Reload Network" -->
+<!-- <reload-model>???</reload-model> --> <!-- English: "Reload Aircraft Model" -->
+<!-- <nasal-console>???</nasal-console> --> <!-- English: "Nasal Console" -->
+<!-- <development-keys>???</development-keys> --> <!-- English: "Development Keys" -->
+<!-- <configure-dev-extension>???</configure-dev-extension> --> <!-- English: "Configure Development Extensions" -->
+<!-- <display-marker>???</display-marker> --> <!-- English: "Display Tutorial Marker" -->
+<!-- <dump-scene-graph>???</dump-scene-graph> --> <!-- English: "Dump Scene Graph" -->
+<!-- <print-rendering-statistics>???</print-rendering-statistics> --> <!-- English: "Print Rendering Statistics" -->
+<!-- <statistics-display>???</statistics-display> --> <!-- English: "Cycle On-Screen Statistics" -->
+<!-- <performance-monitor>???</performance-monitor> --> <!-- English: "Monitor System Performance" -->
+<!-- <property-browser>???</property-browser> --> <!-- English: "Browse Internal Properties" -->
+<!-- <logging>???</logging> --> <!-- English: "Logging" -->
+<!-- <local_weather>???</local_weather> --> <!-- English: "Local Weather (Test)" -->
+<!-- <print-scene-info>???</print-scene-info> --> <!-- English: "Print Visible Scene Info" -->
+<!-- <rendering-buffers>???</rendering-buffers> --> <!-- English: "Hide/Show Rendering Buffers" -->
+<!-- <rembrandt-buffers-choice>???</rembrandt-buffers-choice> --> <!-- English: "Select Rendering Buffers" -->
+
+ <!-- Help menu -->
+ <help>Pomoc</help> <!-- English: "Help" -->
+ <help-browser>Pomoc (w pzegladarce)</help-browser> <!-- English: "Help (opens in browser)" -->
+ <aircraft-keys>Dla Tego Samolotu</aircraft-keys> <!-- English: "Aircraft Help" -->
+ <common-keys>Klawisze Sterowania</common-keys> <!-- English: "Common Aircraft Keys" -->
+ <basic-keys>Klawiszologia Symulatora</basic-keys> <!-- English: "Basic Simulator Keys" -->
+ <joystick-info>Informacje o Joysticku</joystick-info> <!-- English: "Joystick Information" -->
+ <tutorial-start>Tutoriale</tutorial-start> <!-- English: "Tutorials" -->
+ <menu-about>O Programie</menu-about> <!-- English: "About" -->
+
+</PropertyList>
diff --git a/Translations/pl/options.xml b/Translations/pl/options.xml
index 2189f708d..bc61a8973 100644
--- a/Translations/pl/options.xml
+++ b/Translations/pl/options.xml
@@ -19,6 +19,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -26,7 +28,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -47,6 +49,7 @@
<enable-game-mode-desc>Zezwol na tryb pelnoekranowy</enable-game-mode-desc> <!-- English: "Enable full-screen game mode" -->
<disable-splash-screen-desc>Brak ekranu powitalnego</disable-splash-screen-desc> <!-- English: "Disable splash screen" -->
<enable-splash-screen-desc>Wlacz ekran powitalny</enable-splash-screen-desc> <!-- English: "Enable splash screen" -->
+<!-- <restore-defaults-desc>???</restore-defaults-desc> --> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
<!-- <disable-save-on-exit>???</disable-save-on-exit> --> <!-- English: "Don't save preferences upon program exit" -->
<!-- <enable-save-on-exit>???</enable-save-on-exit> --> <!-- English: "Allow saving preferences at program exit" -->
<disable-intro-music-desc>Brak intro muzycznego</disable-intro-music-desc> <!-- English: "Disable introduction music" -->
@@ -56,6 +59,10 @@
<enable-mouse-pointer-desc n="1">(np. dla trybu pelnoekranowego dla kart bazujacych na Voodoo)</enable-mouse-pointer-desc> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
<disable-random-objects-desc>Wylaczone losowe obiekty terenowe</disable-random-objects-desc> <!-- English: "Exclude random scenery objects" -->
<enable-random-objects-desc>Wlaczone losowe obiekty terenowe</enable-random-objects-desc> <!-- English: "Include random scenery objects" -->
+<!-- <disable-random-vegetation-desc>???</disable-random-vegetation-desc> --> <!-- English: "Exclude random vegetation objects" -->
+<!-- <enable-random-vegetation-desc>???</enable-random-vegetation-desc> --> <!-- English: "Include random vegetation objects" -->
+<!-- <disable-random-buildings-desc>???</disable-random-buildings-desc> --> <!-- English: "Exclude random buildings objects" -->
+<!-- <enable-random-buildings-desc>???</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
<!-- <disable-real-weather-fetch-desc>???</disable-real-weather-fetch-desc> --> <!-- English: "Disable METAR based real weather fetching" -->
<!-- <enable-real-weather-fetch-desc>???</enable-real-weather-fetch-desc> --> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
<!-- <metar-desc>???</metar-desc> --> <!-- English: "Pass a METAR to set up static weather" -->
diff --git a/Translations/pt/menu.xml b/Translations/pt/menu.xml
index 8d7a929e4..a7e66e650 100644
--- a/Translations/pt/menu.xml
+++ b/Translations/pt/menu.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-13 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -102,6 +104,7 @@
<!-- <reload-panel>???</reload-panel> --> <!-- English: "Reload Panel" -->
<!-- <reload-autopilot>???</reload-autopilot> --> <!-- English: "Reload Autopilot" -->
<!-- <reload-network>???</reload-network> --> <!-- English: "Reload Network" -->
+<!-- <reload-model>???</reload-model> --> <!-- English: "Reload Aircraft Model" -->
<!-- <nasal-console>???</nasal-console> --> <!-- English: "Nasal Console" -->
<!-- <development-keys>???</development-keys> --> <!-- English: "Development Keys" -->
<!-- <configure-dev-extension>???</configure-dev-extension> --> <!-- English: "Configure Development Extensions" -->
diff --git a/Translations/pt/options.xml b/Translations/pt/options.xml
index b29dcdbd0..1d2084f92 100644
--- a/Translations/pt/options.xml
+++ b/Translations/pt/options.xml
@@ -8,6 +8,8 @@
###
### To translate:
### * Replace "???" entries with appropriate translation.
+### * Keep untranslated items unmodified (leave the "???"). English original is the
+### automatic default.
### * Remove enclosing "<!-_ ... _->" tags for completed translations.
### * Keep the original English text unmodified (the '<!-_ English: "..." -_>)',
### so we know which version of the English original the translation is based upon
@@ -15,7 +17,7 @@
### * Replace "-_" occurences with a double "-" in all translations (XML does not allow
### consecutive "-" characters in comments).
###
-### Last synchronized with English master resource on 2012-July-08 for FlightGear 2.8.0
+### Last synchronized with English master resource on 2012-July-15 for FlightGear 2.8.0
### -->
<PropertyList>
@@ -36,6 +38,7 @@
<!-- <enable-game-mode-desc>???</enable-game-mode-desc> --> <!-- English: "Enable full-screen game mode" -->
<!-- <disable-splash-screen-desc>???</disable-splash-screen-desc> --> <!-- English: "Disable splash screen" -->
<!-- <enable-splash-screen-desc>???</enable-splash-screen-desc> --> <!-- English: "Enable splash screen" -->
+<!-- <restore-defaults-desc>???</restore-defaults-desc> --> <!-- English: "Reset all user settings to their defaults (rendering options etc)" -->
<!-- <disable-save-on-exit>???</disable-save-on-exit> --> <!-- English: "Don't save preferences upon program exit" -->
<!-- <enable-save-on-exit>???</enable-save-on-exit> --> <!-- English: "Allow saving preferences at program exit" -->
<!-- <disable-intro-music-desc>???</disable-intro-music-desc> --> <!-- English: "Disable introduction music" -->
@@ -45,6 +48,10 @@
<!-- <enable-mouse-pointer-desc n="1">???</enable-mouse-pointer-desc> --> <!-- English: "(i.e. for full screen Voodoo based cards)" -->
<!-- <disable-random-objects-desc>???</disable-random-objects-desc> --> <!-- English: "Exclude random scenery objects" -->
<!-- <enable-random-objects-desc>???</enable-random-objects-desc> --> <!-- English: "Include random scenery objects" -->
+<!-- <disable-random-vegetation-desc>???</disable-random-vegetation-desc> --> <!-- English: "Exclude random vegetation objects" -->
+<!-- <enable-random-vegetation-desc>???</enable-random-vegetation-desc> --> <!-- English: "Include random vegetation objects" -->
+<!-- <disable-random-buildings-desc>???</disable-random-buildings-desc> --> <!-- English: "Exclude random buildings objects" -->
+<!-- <enable-random-buildings-desc>???</enable-random-buildings-desc> --> <!-- English: "Include random buildings objects" -->
<!-- <disable-real-weather-fetch-desc>???</disable-real-weather-fetch-desc> --> <!-- English: "Disable METAR based real weather fetching" -->
<!-- <enable-real-weather-fetch-desc>???</enable-real-weather-fetch-desc> --> <!-- English: "Enable METAR based real weather fetching (this requires an open internet connection)" -->
<!-- <metar-desc>???</metar-desc> --> <!-- English: "Pass a METAR to set up static weather" -->
diff --git a/gui/menubar.xml b/gui/menubar.xml
index c215f2c10..9b230aed4 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -555,7 +555,7 @@
</item>
<item>
- <label>Reload Aircraft Model</label>
+ <name>reload-model</name>
<binding>
<command>reinit</command>
<subsystem>aircraft-model</subsystem>
diff --git a/options.xml b/options.xml
index f633417ea..26588d801 100644
--- a/options.xml
+++ b/options.xml
@@ -92,6 +92,11 @@
<brief/>
</option>
+ <option>
+ <name>restore-defaults</name>
+ <description>restore-defaults-desc</description>
+ </option>
+
<option>
<name>disable-save-on-exit</name>
<description>disable-save-on-exit</description>
@@ -213,6 +218,30 @@
<description>random-objects-desc</description>
</option>
+ <option>
+ <name>disable-random-vegetation</name>
+ <description>disable-random-vegetation-desc</description>
+ <description>random-vegetation-desc</description>
+ </option>
+
+ <option>
+ <name>enable-random-vegetation</name>
+ <description>enable-random-vegetation-desc</description>
+ <description>random-vegetation-desc</description>
+ </option>
+
+ <option>
+ <name>disable-random-buildings</name>
+ <description>disable-random-buildings-desc</description>
+ <description>random-buildings-desc</description>
+ </option>
+
+ <option>
+ <name>enable-random-buildings</name>
+ <description>enable-random-buildings-desc</description>
+ <description>random-buildings-desc</description>
+ </option>
+
<option>
<name>disable-ai-models</name>
<description>disable-ai-models-desc</description>
@@ -899,6 +928,7 @@
<option>
<name>metar</name>
+ <arg>METAR</arg>
<description>metar-desc</description>
</option>
diff --git a/preferences.xml b/preferences.xml
index 834708786..42edddeab 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -54,6 +54,7 @@ Started September 2000 by David Megginson, david@megginson.com
<fullscreen type="bool" preserve="y">false</fullscreen>
<units>feet</units>
<save-on-exit type="bool" userarchive="y">true</save-on-exit>
+ <restore-defaults type="bool">false</restore-defaults>
<browser-app write="n">firefox -new-tab "%u"</browser-app>
<!-- help viewer; only used under Unix -->
<terminal-ansi-colors type="bool">true</terminal-ansi-colors>
@@ -90,6 +91,17 @@ Started September 2000 by David Megginson, david@megginson.com
<enabled type="bool" userarchive="y">true</enabled>
<name userarchive="y">diffuse</name>
</debug-buffer>
+ <debug>
+ <lighting>
+ <sky type="bool">true</sky>
+ <ambient type="bool">true</ambient>
+ <sunlight type="bool">true</sunlight>
+ <lights type="bool">true</lights>
+ <fog type="bool">true</fog>
+ <debug type="bool">false</debug>
+ <transparent type="bool">false</transparent>
+ </lighting>
+ </debug>
</rembrandt>
<debug type="bool">false</debug>
<realism type="int">5</realism>
@@ -687,14 +699,9 @@ Started September 2000 by David Megginson, david@megginson.com
<atc>
<enabled type="bool">true</enabled>
<runway type="string" preserve="y"/>
+ <use-millibars type="bool" preserve="y">false</use-millibars>
</atc>
- <ai-traffic>
- <!-- Obsolete and unused - to be removed -->
- <enabled type="bool" userarchive="y">false</enabled>
- <level type="int" userarchive="y">1</level>
- </ai-traffic>
-
<traffic-manager>
<enabled type="bool" userarchive="y">true</enabled>
<heuristics type="bool">true</heuristics>
diff --git a/version b/version
index 834f26295..c8e38b614 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.8.0
+2.9.0