From bf7ab798718a82394f25cdd9f684a9870c8e0440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sidi=20Liang=20=28=E6=A2=81=E6=80=9D=E5=9C=B0=29?= Date: Tue, 16 May 2017 19:40:13 -0400 Subject: [PATCH 1/2] Add Simplified Chinese startup tips (disabled for now) The tips are not enabled in Translations/locale.xml yet, because the font currently used to display them in FlightGear's splash screen doesn't have the required glyphs (see [1] for more details). Better display English tips than empty rectangles on the startup screen. Merging this in disabled state now has a few advantages compared to waiting for the font problem to be solved: - avoid that someone ignoring the merge request[1] duplicates the translation work; - allow easy updating of these tips; - make sure they aren't forgotten when FG's localization files are converted to XLIFF format. Ship an empty Translations/zh_CN/options.xml, otherwise 'fgfs --language=zh_CN --help --verbose' won't work at all. [1] https://sourceforge.net/p/flightgear/fgdata/merge-requests/92/ --- Translations/locale.xml | 16 ++++++++++++++++ Translations/zh_CN/options.xml | 6 ++++++ Translations/zh_CN/tips.xml | 27 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 Translations/zh_CN/options.xml create mode 100644 Translations/zh_CN/tips.xml diff --git a/Translations/locale.xml b/Translations/locale.xml index a5932f443..524b19b21 100644 --- a/Translations/locale.xml +++ b/Translations/locale.xml @@ -106,6 +106,22 @@ + + zh + zh_CN + + + Translations/zh_CN/options.xml + + + + + TEST diff --git a/Translations/zh_CN/options.xml b/Translations/zh_CN/options.xml new file mode 100644 index 000000000..46879219c --- /dev/null +++ b/Translations/zh_CN/options.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Translations/zh_CN/tips.xml b/Translations/zh_CN/tips.xml new file mode 100644 index 000000000..83aa0b21d --- /dev/null +++ b/Translations/zh_CN/tips.xml @@ -0,0 +1,27 @@ + + + + + + + 在按住鼠标右键时滑动鼠标以观察四周 + 在观察四周时按住 [Shift] 来将视角向上、下、左、右移动 + 按下 a/A 来调整模拟器速度（倍速） + 按下 x/X 来放大或缩小 + 从 Radios 对话框可查询附近ATC频率 + 按下 v 来更换视角, 按下 Ctrl-V 可回到驾驶舱视角 + 按下 F3 可以截图 + 欢迎加入FlightGear社区，网址为 http://forum.flightgear.org + 按下 h 来启用抬头显示器（HUD） + 按下 F10 来隐藏或显示菜单栏 + 帧率太低？ - 试试禁用AI交通 + 选择 Environment → Weather 在不同天气条件下飞行 + 按下F12可轻易更换无线频率 + 在按住鼠标右键时滑动鼠标以观察四周 + 选择 Multiplayer → Multiplayer Settings 来加入联机飞行 + 不知如何启动引擎？ - 查看 Help → Aircraft Checklists + 在按住鼠标右键与中键时滑动鼠标以移动观察点 + 按下 / 来浏览FlightGear的内部属性 + 按下 Tab 后使用鼠标来移动观察点，并使用滚轮放大或缩小 + From d472c88dcd6966d18a80268d48c4374e3df44432 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Tue, 4 Jul 2017 21:46:20 +0100 Subject: [PATCH 2/2] Provide more granularity on tree density https://sourceforge.net/p/flightgear/codetickets/1976/ --- gui/dialogs/rendering.xml | 43 +++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml index 773dd26b4..2733c7673 100644 --- a/gui/dialogs/rendering.xml +++ b/gui/dialogs/rendering.xml @@ -407,10 +407,13 @@ 200 /sim/gui/dialogs/rendering/random-vegetation Disabled + Ultra Low Density + Very Low Density Low Density Medium Density High Density Very High Density + Ultra High Density dialog-apply random-vegetation @@ -423,6 +426,16 @@ setprop("/sim/rendering/random-vegetation", 0); } + if (val == "Ultra Low Density") { + setprop("/sim/rendering/random-vegetation", 1); + setprop("/sim/rendering/vegetation-density", 0.1); + } + + if (val == "Low Density") { + setprop("/sim/rendering/random-vegetation", 1); + setprop("/sim/rendering/vegetation-density", 0.25); + } + if (val == "Low Density") { setprop("/sim/rendering/random-vegetation", 1); setprop("/sim/rendering/vegetation-density", 0.5); @@ -435,12 +448,17 @@ if (val == "High Density") { setprop("/sim/rendering/random-vegetation", 1); - setprop("/sim/rendering/vegetation-density", 4.0); + setprop("/sim/rendering/vegetation-density", 2.0); } if (val == "Very High Density") { setprop("/sim/rendering/random-vegetation", 1); - setprop("/sim/rendering/vegetation-density", 10.0); + setprop("/sim/rendering/vegetation-density", 4.0); + } + + if (val == "Ultra High Density") { + setprop("/sim/rendering/random-vegetation", 1); + setprop("/sim/rendering/vegetation-density", 8.0); } @@ -1077,14 +1095,27 @@ if (getprop("/sim/rendering/random-vegetation")) { var density = getprop("/sim/rendering/vegetation-density"); - if (density < 0.99) { + if (density < 0.2) { + setprop("/sim/gui/dialogs/rendering/random-vegetation", "Ultra Low Density"); + # 0.1 + } else if (density < 0.4) { + setprop("/sim/gui/dialogs/rendering/random-vegetation", "Very Low Density"); + # 0.25 + } else if (density < 0.8) { setprop("/sim/gui/dialogs/rendering/random-vegetation", "Low Density"); - } else if (density < 1.99) { + # 0.5 + } else if (density < 1.5) { setprop("/sim/gui/dialogs/rendering/random-vegetation", "Medium Density"); - } else if (density < 4.01) { + # 1.0 + } else if (density < 3.0) { setprop("/sim/gui/dialogs/rendering/random-vegetation", "High Density"); - } else { + # 2.0 + } else if (density < 6.0) { setprop("/sim/gui/dialogs/rendering/random-vegetation", "Very High Density"); + # 4.0 + } else { + setprop("/sim/gui/dialogs/rendering/random-vegetation", "Ultra High Density"); + # 8.0 } } else { setprop("/sim/gui/dialogs/rendering/random-vegetation", "Disabled");