From 25a64e0bb1b9424d42e8db61a3f2b3e3bec1aaa4 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Fri, 21 Sep 2012 13:30:31 +0200
Subject: [PATCH 1/2] Sound: trigger subsystem reinit instead of relying on
property listener. Disable sound dialog when sound system is globally
disabled (command-line/ compile-time).
---
Nasal/gui.nas | 1 +
gui/dialogs/sound.xml | 1 +
gui/menubar.xml | 1 +
3 files changed, 3 insertions(+)
diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 6c4c7e95f..c4fd177b5 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -159,6 +159,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
menuEnable("rendering-buffers", getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("rembrandt-buffers-choice", getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("stereoscopic-options", !getprop("/sim/rendering/rembrandt/enabled"));
+ menuEnable("sound-config", getprop("/sim/sound/working"));
# frame-per-second display
var fps = props.globals.getNode("/sim/rendering/fps-display", 1);
diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 606267355..400e16dd2 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -356,6 +356,7 @@
if (cmp(current, new) != 0) {
setprop("sim/sound/devices/name", new);
setprop("sim/sound/device-name", new);
+ fgcommand("reinit", props.Node.new({ "subsystem" : "sound" }));
}
}
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 8432d39cb..3316872ec 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -64,6 +64,7 @@
<command>dialog-show</command>
<dialog-name>sound-dialog</dialog-name>
</binding>
+ <enabled>false</enabled>
</item>
<item>
From bbbccd08da8eb8d2405e1ddb3bd621b689adf9ea Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Fri, 21 Sep 2012 17:46:38 +0200
Subject: [PATCH 2/2] Add language resources for fgfs system messages.
---
Translations/de/sys.xml | 38 ++++++++++++++++++++++++++++++++++++++
Translations/en/sys.xml | 21 +++++++++++++++++++++
Translations/es/sys.xml | 38 ++++++++++++++++++++++++++++++++++++++
Translations/fr/sys.xml | 38 ++++++++++++++++++++++++++++++++++++++
Translations/it/sys.xml | 38 ++++++++++++++++++++++++++++++++++++++
Translations/locale.xml | 9 +++++++++
Translations/nl/sys.xml | 41 +++++++++++++++++++++++++++++++++++++++++
Translations/pl/sys.xml | 38 ++++++++++++++++++++++++++++++++++++++
Translations/pt/sys.xml | 38 ++++++++++++++++++++++++++++++++++++++
9 files changed, 299 insertions(+)
create mode 100644 Translations/de/sys.xml
create mode 100644 Translations/en/sys.xml
create mode 100644 Translations/es/sys.xml
create mode 100644 Translations/fr/sys.xml
create mode 100644 Translations/it/sys.xml
create mode 100644 Translations/nl/sys.xml
create mode 100644 Translations/pl/sys.xml
create mode 100644 Translations/pt/sys.xml
diff --git a/Translations/de/sys.xml b/Translations/de/sys.xml
new file mode 100644
index 000000000..f110f7e14
--- /dev/null
+++ b/Translations/de/sys.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: German 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+ <init>Initialisiere</init> <!-- English: "initializing" -->
+ <loading-aircraft-list>Lade Flugzeugliste</loading-aircraft-list> <!-- English: "loading aircraft list" -->
+ <loading-aircraft>Lade Flugzeug</loading-aircraft> <!-- English: "loading aircraft" -->
+ <loading-nav-dat>Lade Navigationsdaten</loading-nav-dat> <!-- English: "loading navigation data" -->
+ <init-scenery>Initialisiere Szenerie</init-scenery> <!-- English: "initializing scenery" -->
+ <creating-subsystems>Erzeuge Subsysteme</creating-subsystems> <!-- English: "creating subsystems" -->
+ <init-subsystems>Initialisiere Subsysteme</init-subsystems> <!-- English: "initializing subsystems" -->
+ <binding-subsystems>Binde Subsysteme</binding-subsystems> <!-- English: "binding subsystems" -->
+ <finishing-subsystems>Finalisiere Subsysteme</finishing-subsystems> <!-- English: "finalizing subsystems" -->
+ <init-graphics>Initialisiere Grafik</init-graphics> <!-- English: "initializing graphics engine" -->
+ <loading-scenery>Lade Szenerie</loading-scenery> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>
diff --git a/Translations/en/sys.xml b/Translations/en/sys.xml
new file mode 100644
index 000000000..4f527fdd6
--- /dev/null
+++ b/Translations/en/sys.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!-- FlightGear system messages: English (=default) language resource -->
+
+<PropertyList>
+
+ <splash>
+ <init>initializing</init>
+ <loading-aircraft-list>loading aircraft list</loading-aircraft-list>
+ <loading-aircraft>loading aircraft</loading-aircraft>
+ <loading-nav-dat>loading navigation data</loading-nav-dat>
+ <init-scenery>initializing scenery</init-scenery>
+ <creating-subsystems>creating subsystems</creating-subsystems>
+ <init-subsystems>initializing subsystems</init-subsystems>
+ <binding-subsystems>binding subsystems</binding-subsystems>
+ <finishing-subsystems>finalizing subsystems</finishing-subsystems>
+ <init-graphics>initializing graphics engine</init-graphics>
+ <loading-scenery>loading scenery</loading-scenery>
+ </splash>
+
+</PropertyList>
diff --git a/Translations/es/sys.xml b/Translations/es/sys.xml
new file mode 100644
index 000000000..8d27e3a0b
--- /dev/null
+++ b/Translations/es/sys.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+<!-- <init>???</init> --> <!-- English: "initializing" -->
+<!-- <loading-aircraft-list>???</loading-aircraft-list> --> <!-- English: "loading aircraft list" -->
+<!-- <loading-aircraft>???</loading-aircraft> --> <!-- English: "loading aircraft" -->
+<!-- <loading-nav-dat>???</loading-nav-dat> --> <!-- English: "loading navigation data" -->
+<!-- <init-scenery>???</init-scenery> --> <!-- English: "initializing scenery" -->
+<!-- <creating-subsystems>???</creating-subsystems> --> <!-- English: "creating subsystems" -->
+<!-- <init-subsystems>???</init-subsystems> --> <!-- English: "initializing subsystems" -->
+<!-- <binding-subsystems>???</binding-subsystems> --> <!-- English: "binding subsystems" -->
+<!-- <finishing-subsystems>???</finishing-subsystems> --> <!-- English: "finalizing subsystems" -->
+<!-- <init-graphics>???</init-graphics> --> <!-- English: "initializing graphics engine" -->
+<!-- <loading-scenery>???</loading-scenery> --> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>
diff --git a/Translations/fr/sys.xml b/Translations/fr/sys.xml
new file mode 100644
index 000000000..fe4dada82
--- /dev/null
+++ b/Translations/fr/sys.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: French 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+ <init>Réinitialiser</init> <!-- English: "initializing" -->
+<!-- <loading-aircraft-list>???</loading-aircraft-list> --> <!-- English: "loading aircraft list" -->
+<!-- <loading-aircraft>???</loading-aircraft> --> <!-- English: "loading aircraft" -->
+<!-- <loading-nav-dat>???</loading-nav-dat> --> <!-- English: "loading navigation data" -->
+<!-- <init-scenery>???</init-scenery> --> <!-- English: "initializing scenery" -->
+<!-- <creating-subsystems>???</creating-subsystems> --> <!-- English: "creating subsystems" -->
+<!-- <init-subsystems>???</init-subsystems> --> <!-- English: "initializing subsystems" -->
+<!-- <binding-subsystems>???</binding-subsystems> --> <!-- English: "binding subsystems" -->
+<!-- <finishing-subsystems>???</finishing-subsystems> --> <!-- English: "finalizing subsystems" -->
+<!-- <init-graphics>???</init-graphics> --> <!-- English: "initializing graphics engine" -->
+<!-- <loading-scenery>???</loading-scenery> --> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>
diff --git a/Translations/it/sys.xml b/Translations/it/sys.xml
new file mode 100644
index 000000000..0cc7a1cdb
--- /dev/null
+++ b/Translations/it/sys.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: Italian 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+<!-- <init>???</init> --> <!-- English: "initializing" -->
+<!-- <loading-aircraft-list>???</loading-aircraft-list> --> <!-- English: "loading aircraft list" -->
+<!-- <loading-aircraft>???</loading-aircraft> --> <!-- English: "loading aircraft" -->
+<!-- <loading-nav-dat>???</loading-nav-dat> --> <!-- English: "loading navigation data" -->
+<!-- <init-scenery>???</init-scenery> --> <!-- English: "initializing scenery" -->
+<!-- <creating-subsystems>???</creating-subsystems> --> <!-- English: "creating subsystems" -->
+<!-- <init-subsystems>???</init-subsystems> --> <!-- English: "initializing subsystems" -->
+<!-- <binding-subsystems>???</binding-subsystems> --> <!-- English: "binding subsystems" -->
+<!-- <finishing-subsystems>???</finishing-subsystems> --> <!-- English: "finalizing subsystems" -->
+<!-- <init-graphics>???</init-graphics> --> <!-- English: "initializing graphics engine" -->
+<!-- <loading-scenery>???</loading-scenery> --> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>
diff --git a/Translations/locale.xml b/Translations/locale.xml
index b269d023c..14d3749e3 100644
--- a/Translations/locale.xml
+++ b/Translations/locale.xml
@@ -15,6 +15,7 @@
<strings>
<options>Translations/en/options.xml</options>
<menu>Translations/en/menu.xml</menu>
+ <sys>Translations/en/sys.xml</sys>
</strings>
</locale>
@@ -27,6 +28,7 @@
<strings>
<options>Translations/es/options.xml</options>
<menu>Translations/es/menu.xml</menu>
+ <sys>Translations/es/sys.xml</sys>
</strings>
</locale>
@@ -39,6 +41,7 @@
<strings>
<options>Translations/de/options.xml</options>
<menu>Translations/de/menu.xml</menu>
+ <sys>Translations/de/sys.xml</sys>
</strings>
</locale>
@@ -52,6 +55,7 @@
<strings>
<options>Translations/fr/options.xml</options>
<menu>Translations/fr/menu.xml</menu>
+ <sys>Translations/fr/sys.xml</sys>
</strings>
</locale>
@@ -64,6 +68,7 @@
<strings>
<options>Translations/it/options.xml</options>
<menu>Translations/it/menu.xml</menu>
+ <sys>Translations/it/sys.xml</sys>
</strings>
</locale>
@@ -75,6 +80,7 @@
<strings>
<options>Translations/nl/options.xml</options>
<menu>Translations/nl/menu.xml</menu>
+ <sys>Translations/nl/sys.xml</sys>
</strings>
</locale>
@@ -85,6 +91,7 @@
<strings>
<options>Translations/pl/options.xml</options>
<menu>Translations/pl/menu.xml</menu>
+ <sys>Translations/pl/sys.xml</sys>
</strings>
</locale>
@@ -104,6 +111,7 @@
<strings>
<options>Translations/cs/options.xml</options>
<menu>Translations/cs/menu.xml</menu>
+ <sys>Translations/cs/sys.xml</sys>
</strings>
</locale>
@@ -113,6 +121,7 @@
<strings>
<options>Translations/da/options.xml</options>
<menu>Translations/da/menu.xml</menu>
+ <sys>Translations/da/sys.xml</sys>
</strings>
</locale>
diff --git a/Translations/nl/sys.xml b/Translations/nl/sys.xml
new file mode 100644
index 000000000..1761fbfc2
--- /dev/null
+++ b/Translations/nl/sys.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: Dutch 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+
+<!-- I know, this isn't really Dutch. Just a stub until Gijs has time to work on this new file :). -->
+
+ <init>initialisere</init> <!-- English: "initializing" -->
+<!-- <loading-aircraft-list>???</loading-aircraft-list> --> <!-- English: "loading aircraft list" -->
+ <loading-aircraft>vliegtuig laden</loading-aircraft> <!-- English: "loading aircraft" -->
+<!-- <loading-nav-dat>???</loading-nav-dat> --> <!-- English: "loading navigation data" -->
+<!-- <init-scenery>???</init-scenery> --> <!-- English: "initializing scenery" -->
+<!-- <creating-subsystems>???</creating-subsystems> --> <!-- English: "creating subsystems" -->
+ <init-subsystems>initialisere subsysteme</init-subsystems> <!-- English: "initializing subsystems" -->
+<!-- <binding-subsystems>???</binding-subsystems> --> <!-- English: "binding subsystems" -->
+<!-- <finishing-subsystems>???</finishing-subsystems> --> <!-- English: "finalizing subsystems" -->
+ <init-graphics>initialisere grafiek</init-graphics> <!-- English: "initializing graphics engine" -->
+ <loading-scenery>scenerie laden</loading-scenery> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>
diff --git a/Translations/pl/sys.xml b/Translations/pl/sys.xml
new file mode 100644
index 000000000..b433b94c5
--- /dev/null
+++ b/Translations/pl/sys.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: Polish 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+<!-- <init>???</init> --> <!-- English: "initializing" -->
+<!-- <loading-aircraft-list>???</loading-aircraft-list> --> <!-- English: "loading aircraft list" -->
+<!-- <loading-aircraft>???</loading-aircraft> --> <!-- English: "loading aircraft" -->
+<!-- <loading-nav-dat>???</loading-nav-dat> --> <!-- English: "loading navigation data" -->
+<!-- <init-scenery>???</init-scenery> --> <!-- English: "initializing scenery" -->
+<!-- <creating-subsystems>???</creating-subsystems> --> <!-- English: "creating subsystems" -->
+<!-- <init-subsystems>???</init-subsystems> --> <!-- English: "initializing subsystems" -->
+<!-- <binding-subsystems>???</binding-subsystems> --> <!-- English: "binding subsystems" -->
+<!-- <finishing-subsystems>???</finishing-subsystems> --> <!-- English: "finalizing subsystems" -->
+<!-- <init-graphics>???</init-graphics> --> <!-- English: "initializing graphics engine" -->
+<!-- <loading-scenery>???</loading-scenery> --> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>
diff --git a/Translations/pt/sys.xml b/Translations/pt/sys.xml
new file mode 100644
index 000000000..feba1531d
--- /dev/null
+++ b/Translations/pt/sys.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- FlightGear system messages: Portuguese 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
+### (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-September-21 for FlightGear 2.9.0
+### -->
+<PropertyList>
+
+ <splash>
+<!-- <init>???</init> --> <!-- English: "initializing" -->
+<!-- <loading-aircraft-list>???</loading-aircraft-list> --> <!-- English: "loading aircraft list" -->
+<!-- <loading-aircraft>???</loading-aircraft> --> <!-- English: "loading aircraft" -->
+<!-- <loading-nav-dat>???</loading-nav-dat> --> <!-- English: "loading navigation data" -->
+<!-- <init-scenery>???</init-scenery> --> <!-- English: "initializing scenery" -->
+<!-- <creating-subsystems>???</creating-subsystems> --> <!-- English: "creating subsystems" -->
+<!-- <init-subsystems>???</init-subsystems> --> <!-- English: "initializing subsystems" -->
+<!-- <binding-subsystems>???</binding-subsystems> --> <!-- English: "binding subsystems" -->
+<!-- <finishing-subsystems>???</finishing-subsystems> --> <!-- English: "finalizing subsystems" -->
+<!-- <init-graphics>???</init-graphics> --> <!-- English: "initializing graphics engine" -->
+<!-- <loading-scenery>???</loading-scenery> --> <!-- English: "loading scenery" -->
+ </splash>
+
+</PropertyList>