fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'next' of git://git.code.sf.net/p/flightgear/fgdata into next

Browse source
This commit is contained in:
Scott Giese 2021-03-01 21:12:49 -06:00
commit 033b49b9fb
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Translations/default/sys.xml
View file

@ -33,16 +33,19 @@
<settings-migration-title>Settings migrated</settings-migration-title> <settings-migration-title>Settings migrated</settings-migration-title>
<settings-migration-text>Saved settings were migrated from a previous version of FlightGear. If you encounter any problems when using the system, try restoring the default settings, before reporting a problem. Saved settings can affect the appearance, performance and features of the simulator.</settings-migration-text> <settings-migration-text>Saved settings were migrated from a previous version of FlightGear. If you encounter any problems when using the system, try restoring the default settings, before reporting a problem. Saved settings can affect the appearance, performance and features of the simulator.</settings-migration-text>
<error-next-steps>FlightGear is developed and tested by volunteers around the world. The information below contains details on the problem: you can use it to start investigating the problem yourself, or ask for help via our forum or bug tracker.</error-next-steps>
<!-- error groupings : top-level messages shown to the user--> <!-- error groupings : top-level messages shown to the user-->
<error-category-aircraft>The selected aircraft contains errors. This may cause visual issues, or the aircraft might not fly at all. Check for an updated version of the aircraft from its developers, or use the information below to investigate further.</error-category-aircraft> <error-category-aircraft>The selected aircraft contains errors. This may cause visual issues, or the aircraft might not fly at all. Check for an updated version of the aircraft from its developers.</error-category-aircraft>
<error-category-aircraft-from-hangar>The selected aircraft (%VALUE%) contains errors. This may cause visual issues, or the aircraft might not fly at all. Please report the information below to the aircraft hangar's maintainers.</error-category-aircraft-from-hangar> <error-category-aircraft-from-hangar>The selected aircraft (%VALUE%) contains errors. This may cause visual issues, or the aircraft might not fly at all. Please report the information below to the aircraft hangar's maintainers.</error-category-aircraft-from-hangar>
<error-category-custom-scenery>The custom scenery at '%VALUE%' contains errors. Parts may be missing, or the scenery may not load at all. Check for an updated version of the scenery, or use the information below to investigate further.</error-category-custom-scenery> <error-category-custom-scenery>The custom scenery at '%VALUE%' contains errors. Parts may be missing, or the scenery may not load at all. Check for an updated version of the scenery.</error-category-custom-scenery>
<error-category-terrasync>Scenery downloaded via TerraSync is not loading correctly. The usually indicates a problem with your network connection or local disk. The information below may help investigating further.</error-category-terrasync> <error-category-terrasync>Scenery downloaded via TerraSync is not loading correctly. The usually indicates a problem with your network connection or local disk.</error-category-terrasync>
<error-category-addon>The add-on '%VALUE%' contains errors. Please report this to the add-on developers, or use the information below to investigate further.</error-category-addon> <error-category-addon>The add-on '%VALUE%' contains errors. Please report this to the add-on developers.</error-category-addon>
<error-category-scenario>The scenario '%VALUE%' contains errors, and may not work correctly. Check the information below to help investigate fruther.</error-category-scenario> <error-category-scenario>The scenario '%VALUE%' contains errors, and may not work correctly.</error-category-scenario>
<error-category-input-device>The joystick (input device) '%VALUE%' couldn't be loaded correctly. This usually means its configuration file is incorrect: see the information below for more information.</error-category-input-device> <error-category-input-device>The joystick (input device) '%VALUE%' couldn't be loaded correctly. This usually means its configuration file is incorrect.</error-category-input-device>
<error-category-fgdata>Errors were found loading the core simulator files (FGData). This usually indicates a problem with the installation, or your local disk.</error-category-fgdata> <error-category-fgdata>Errors were found loading the core simulator files (FGData). This usually indicates a problem with the installation, or your local disk.</error-category-fgdata>
<error-category-unknown>Errors occurred in an unknown part of FlightGear. Please report this bug to the FlightGear development team, providing the information below.</error-category-unknown> <error-category-unknown>Errors occurred in an unknown part of FlightGear. Please report this bug to the FlightGear development team.</error-category-unknown>
<error-category-ai-traffic-schedule>The traffic schedule '%VALUE%' contains errors, and can't be loaded.</error-category-ai-traffic-schedule>
<error-type-unknown>Unknown error</error-type-unknown> <error-type-unknown>Unknown error</error-type-unknown>
<error-type-not-found>The file or resource was not found</error-type-not-found> <error-type-not-found>The file or resource was not found</error-type-not-found>
@ -51,7 +54,7 @@
<error-type-bad-data>File or resource is invalid or corrupted</error-type-bad-data> <error-type-bad-data>File or resource is invalid or corrupted</error-type-bad-data>
<error-type-misconfigured>The resource contains a configuration problem</error-type-misconfigured> <error-type-misconfigured>The resource contains a configuration problem</error-type-misconfigured>
<error-missing-shader>Shader file not found</error-missing-shader> <error-missing-shader>Shader / Effect problems</error-missing-shader>
<error-loading-texture>Texture failed to load</error-loading-texture> <error-loading-texture>Texture failed to load</error-loading-texture>
<error-xml-model-load>Errors loading model XML</error-xml-model-load> <error-xml-model-load>Errors loading model XML</error-xml-model-load>
<error-btg-load>Errors loading terrain (BTG)</error-btg-load> <error-btg-load>Errors loading terrain (BTG)</error-btg-load>
@ -59,6 +62,6 @@
<error-dialog-load>Errors loading user-interface</error-dialog-load> <error-dialog-load>Errors loading user-interface</error-dialog-load>
<error-audio-fx-load>Audio FX description contains errors</error-audio-fx-load> <error-audio-fx-load>Audio FX description contains errors</error-audio-fx-load>
<error-xml-load-command>Scripted loading of XML failed</error-xml-load-command> <error-xml-load-command>Scripted loading of XML failed</error-xml-load-command>
<error-aircraft-systems>Errors occured loading ircraft systems (fuel, electrical, hydrualics)</error-aircraft-systems> <error-aircraft-systems>Errors occured loading aircraft systems (fuel, electrical, hydrualics)</error-aircraft-systems>
<error-input-device-config>Errors loading input device configuration</error-input-device-config> <error-input-device-config>Errors loading input device configuration</error-input-device-config>
</PropertyList> </PropertyList>

12
gui/dialogs/error-report.xml
View file

@ -26,8 +26,6 @@
<textbox> <textbox>
<halign>fill</halign> <halign>fill</halign>
<valign>fill</valign>
<stretch>true</stretch>
<!-- <pref-width>450</pref-width> --> <!-- <pref-width>450</pref-width> -->
<pref-height>100</pref-height> <pref-height>100</pref-height>
<padding>6</padding> <padding>6</padding>
@ -37,6 +35,16 @@
<property>/sim/error-report/display/category</property> <property>/sim/error-report/display/category</property>
</textbox> </textbox>
<textbox>
<halign>fill</halign>
<pref-height>100</pref-height>
<padding>6</padding>
<wrap>true</wrap>
<editable>false</editable>
<property>/sim/error-report/display/next-steps</property>
</textbox>
<hrule/> <hrule/>
<textbox> <textbox>