Skip to content

Commit

Permalink
Merge branch 'debug-tools' of github:Web-eWorks/pioneer into debug-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
sturnclaw committed Aug 2, 2020
2 parents 772be3d + 8899da7 commit de633f0
Show file tree
Hide file tree
Showing 62 changed files with 3,711 additions and 197 deletions.
15 changes: 13 additions & 2 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
July 2020
* New Features
* Captains log added to info-view (#4795)
* Plentiful tweaks to sector map (#4906)
* Make size of load/save dialogue window sane (#4912)

* Fixes
* Fix buying commodities not subtracting station stock (#4909)
* Fix hyperdrive last service date being wrong (#4910)
* Fix the build with USE_SYSTEM_LIBLUA (#4940)

June 2020
* New Features
* Redesign System and Sector Map View layouts (#4852)

* Internal Changes
* Add support for IMGUI tabs in pigui (#4893)

Expand Down Expand Up @@ -34,7 +45,7 @@ April 2020
* New Features
* Move the System Map to PiGUI (#4821)
* Reduce hydrogen price back to 1 credit (#4859)

* Fixes
* Fix increase / decrease buttons in SystemView being linked (#4868)

Expand Down
12 changes: 6 additions & 6 deletions data/lang/commodity/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"AIR_PROCESSORS_DESCRIPTION": {
"description": "This is an artistic description of the commodity. Translate as you deem appropriate or come up with your own description, long or short, its up to you.",
"message": "Clean air is only taken for granted when already abundant. The technique behind air purification is rumoured to come from alien artifacts found on Mars. Many companies produce various types of air processors, capable of turning even the most hostile atmospheres into a workable environment, and governments do not tolerate monopoly on air production."
"message": "Чистият въздух се приема за даденост, само когато е в изобилие. Вярва се, че техниката за пречистване на въздуха е с марсиански произход. Много фирми произвеждат въздухопречистватели, които са способни да превърнат дори най-враждебната атмосфера в приятна за живеене среда, също така е важно да се отбележи, че правителствата не толелират монопола върху производството на въздух."
},
"ANIMAL_MEAT": {
"description": "",
Expand Down Expand Up @@ -53,7 +53,7 @@
},
"FARM_MACHINERY_DESCRIPTION": {
"description": "This is an artistic description of the commodity. Translate as you deem appropriate or come up with your own description, long or short, its up to you.",
"message": "Although rare, it is still possible to catch the occasional farmer with an ox-driven plow. But in almost any place where there is agriculture, machines are used in the cultivation of the land, be it the hydroponics of an underground habitat or the endless fields of a garden world."
"message": "Макар и рядко, все още е възможно да се намери някой заблуден фермер с волски плуг. Реалността е, че почти навсякъде където има селски стопанства, се използват машини за обработването на земята."
},
"FERTILIZER": {
"description": "",
Expand All @@ -69,7 +69,7 @@
},
"FRUIT_AND_VEG_DESCRIPTION": {
"description": "This is an artistic description of the commodity. Translate as you deem appropriate or come up with your own description, long or short, its up to you.",
"message": "While there are lots of synthetic alternatives, real fruits and vegetables are still an important part of our cuisine and nutrition. Grown on agricultural worlds or as part of the life support of habitats, and exported to systems in which growing plants is not feasible."
"message": "Въпреки че има доста синтетични алтернативи, истинските плодове и зеленчуци все още са важна част от начина ни на хранене. Те се отглеждат в селскостопанските светове и се изнасят към системи, в които отглеждането им не е възможно."
},
"GRAIN": {
"description": "",
Expand All @@ -85,7 +85,7 @@
},
"HAND_WEAPONS_DESCRIPTION": {
"description": "This is an artistic description of the commodity. Translate as you deem appropriate or come up with your own description, long or short, its up to you.",
"message": "Providing insurance beyond the long arm of the law, hand weapons are essential for space traders in far-out systems. However, many governments see them as a threat to their own control over their population and strictly control their trade and possession."
"message": "Осигурявайки допълнителна сигурност, извън дългата ръка на закона, тези оръжия са неизменна част от арсенала на космическите търговци в отдалечените системи. Обаче, много правителства третират малките оръжия като опасна стока, затова тяхната търговия и притежание е под строг контрол."
},
"HYDROGEN": {
"description": "",
Expand Down Expand Up @@ -141,7 +141,7 @@
},
"METAL_ALLOYS_DESCRIPTION": {
"description": "This is an artistic description of the commodity. Translate as you deem appropriate or come up with your own description, long or short, its up to you.",
"message": "After metal ore is extracted and refined, it is processed and ends up as various alloys. An alloy is an amalgamation of metals, rather than a single pure element, combined in exact proportions to gain specific desirable traits. Therefore, most consumer metals are alloys."
"message": "След извличане, металната руда се обработва и се превръща в различни сплави. Те са съвкупност от метали, комбинирани в точно определени пропорции за придобиване на специфични характристики. Следователно, повечето метални продукти са сплави."
},
"METAL_ORE": {
"description": "",
Expand Down Expand Up @@ -229,7 +229,7 @@
},
"SLAVES_DESCRIPTION": {
"description": "This is an artistic description of the commodity. Translate as you deem appropriate or come up with your own description, long or short, its up to you.",
"message": "As machines have replaced slaves as the engine that powers civilization, slavery is now almost universally seen as immoral, and transgression against a ban draws the strictest punishment. However, despite the best efforts of humanitarians, slavery is still prevalent, even in developed worlds."
"message": "В днешно време, робския труд се извършва от машините, в резултат на което робството е забранено и се счита за неморално. Въпреки всички хуманитарни усилия в тази насока, то все още съществува, дори в развитите светове."
},
"TEXTILES": {
"description": "",
Expand Down
10 changes: 5 additions & 5 deletions data/lang/core/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,11 @@
},
"DOCKED": {
"description": "",
"message": "Atracado"
"message": "Acoplado"
},
"DOCKING": {
"description": "",
"message": "Atracando"
"message": "Acoplándose"
},
"DOCKING_CLEARANCE_EXPIRED": {
"description": "",
Expand Down Expand Up @@ -581,7 +581,7 @@
},
"HYPERSPACE_JUMP_DISABLED": {
"description": "Mouse over text for hyperdrive button on ship control panel",
"message": "Hiperimpulsor no funcional"
"message": "Hiperimpulsor desactivado"
},
"HYPERSPACE_JUMP_ENGAGE": {
"description": "Mouse over text for hyperdrive button on ship control panel",
Expand Down Expand Up @@ -1085,7 +1085,7 @@
},
"OBJECT_INFO": {
"description": "Originally for use as a window title and a button tooltip in the system map",
"message": "Object info"
"message": "Información del Objeto"
},
"OCEANICWORLD": {
"description": "",
Expand Down Expand Up @@ -1609,7 +1609,7 @@
},
"SWAP_SELECTED_HYPERSPACE_TARGET": {
"description": "",
"message": "Cambiar entre objetivo seleccionado y objetivo de hipersalto"
"message": "Alternar entre objetivo seleccionado y objetivo de hipersalto"
},
"SWITCHED_TO_PARENT": {
"description": "Show ship's heading, coordinates are on the celestial sphere (defined by the ecliptic).",
Expand Down
2 changes: 1 addition & 1 deletion data/lang/core/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@
},
"OBJECT_INFO": {
"description": "Originally for use as a window title and a button tooltip in the system map",
"message": "Object info"
"message": "Objektum információ"
},
"OCEANICWORLD": {
"description": "",
Expand Down
2 changes: 1 addition & 1 deletion data/lang/core/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@
},
"OBJECT_INFO": {
"description": "Originally for use as a window title and a button tooltip in the system map",
"message": "Object info"
"message": "对象信息"
},
"OCEANICWORLD": {
"description": "",
Expand Down
18 changes: 9 additions & 9 deletions data/lang/equipment-core/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,39 @@
},
"DRIVE_CLASS1": {
"description": "",
"message": "Hiperimpulsor clase 1"
"message": "Hiperimpulsor Clase 1"
},
"DRIVE_CLASS2": {
"description": "",
"message": "Hiperimpulsor clase 2"
"message": "Hiperimpulsor Clase 2"
},
"DRIVE_CLASS3": {
"description": "",
"message": "Hiperimpulsor clase 3"
"message": "Hiperimpulsor Clase 3"
},
"DRIVE_CLASS4": {
"description": "",
"message": "Hiperimpulsor clase 4"
"message": "Hiperimpulsor Clase 4"
},
"DRIVE_CLASS5": {
"description": "",
"message": "Hiperimpulsor clase 5"
"message": "Hiperimpulsor Clase 5"
},
"DRIVE_CLASS6": {
"description": "",
"message": "Hiperimpulsor clase 6"
"message": "Hiperimpulsor Clase 6"
},
"DRIVE_CLASS7": {
"description": "",
"message": "Hiperimpulsor clase 7"
"message": "Hiperimpulsor Clase 7"
},
"DRIVE_CLASS8": {
"description": "",
"message": "Hiperimpulsor clase 8"
"message": "Hiperimpulsor Clase 8"
},
"DRIVE_CLASS9": {
"description": "",
"message": "Hiperimpulsor clase 9"
"message": "Hiperimpulsor Clase 9"
},
"DRIVE_MIL1": {
"description": "",
Expand Down
14 changes: 7 additions & 7 deletions data/lang/input-core/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
},
"BIND_MAP_VIEW_MOVE_FORWARD": {
"description": "Axis binding",
"message": "Shift Map Longitudinally"
"message": "Надлъжно Изместване на Картата"
},
"BIND_MAP_VIEW_MOVE_LEFT": {
"description": "Axis binding",
"message": "Shift Map Horizontally"
"message": "Хоризонтално Изместване на Картата"
},
"BIND_MAP_VIEW_MOVE_UP": {
"description": "Axis binding",
"message": "Shift Map Vertically"
"message": "Вертикално Изместване на Картата"
},
"BIND_MAP_VIEW_PITCH": {
"description": "Axis binding",
"message": "Map Pitch"
"message": "Накланяне на Картата"
},
"BIND_MAP_VIEW_YAW": {
"description": "Axis binding",
"message": "Map Yaw"
"message": "Отклонение на Картата"
},
"BIND_PRIMARY_FIRE": {
"description": "Descriptive name for the PrimaryFire action.",
Expand Down Expand Up @@ -156,7 +156,7 @@
},
"GROUP_SECTOR_MAP_VIEW_CONTROLS": {
"description": "Header for the SectorMapViewControls input group.",
"message": "Sector Map View Controls"
"message": "Контроли за Картата на Сектора"
},
"GROUP_SHIP_ORIENT": {
"description": "Header for the ShipOrient input group.",
Expand All @@ -176,7 +176,7 @@
},
"PAGE_MAP_CONTROLS": {
"description": "Header for the MapControls input page.",
"message": "Map Controls"
"message": "Контроли за Картата"
},
"PAGE_SHIP_CONTROLS": {
"description": "Header for the ShipControls input page.",
Expand Down
14 changes: 7 additions & 7 deletions data/lang/input-core/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
},
"BIND_MAP_VIEW_MOVE_FORWARD": {
"description": "Axis binding",
"message": "Shift Map Longitudinally"
"message": "Mover el Mapa longitudinalmente"
},
"BIND_MAP_VIEW_MOVE_LEFT": {
"description": "Axis binding",
"message": "Shift Map Horizontally"
"message": "Mover el Mapa Horizontalmente"
},
"BIND_MAP_VIEW_MOVE_UP": {
"description": "Axis binding",
"message": "Shift Map Vertically"
"message": "Mover el Mapa Verticalmente"
},
"BIND_MAP_VIEW_PITCH": {
"description": "Axis binding",
"message": "Map Pitch"
"message": "Inclinación del Mapa"
},
"BIND_MAP_VIEW_YAW": {
"description": "Axis binding",
"message": "Map Yaw"
"message": "Guiñada del Mapa"
},
"BIND_PRIMARY_FIRE": {
"description": "Descriptive name for the PrimaryFire action.",
Expand Down Expand Up @@ -156,7 +156,7 @@
},
"GROUP_SECTOR_MAP_VIEW_CONTROLS": {
"description": "Header for the SectorMapViewControls input group.",
"message": "Sector Map View Controls"
"message": "Controles de Vista del Mapa de Sector"
},
"GROUP_SHIP_ORIENT": {
"description": "Header for the ShipOrient input group.",
Expand All @@ -176,7 +176,7 @@
},
"PAGE_MAP_CONTROLS": {
"description": "Header for the MapControls input page.",
"message": "Map Controls"
"message": "Controles de Mapa"
},
"PAGE_SHIP_CONTROLS": {
"description": "Header for the ShipControls input page.",
Expand Down
14 changes: 7 additions & 7 deletions data/lang/input-core/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
},
"BIND_MAP_VIEW_MOVE_FORWARD": {
"description": "Axis binding",
"message": "Shift Map Longitudinally"
"message": "Nézet mozgatása hosszirányban"
},
"BIND_MAP_VIEW_MOVE_LEFT": {
"description": "Axis binding",
"message": "Shift Map Horizontally"
"message": "Nézet mozgatása vízszintesen"
},
"BIND_MAP_VIEW_MOVE_UP": {
"description": "Axis binding",
"message": "Shift Map Vertically"
"message": "Nézet mozgatása függőlegesen"
},
"BIND_MAP_VIEW_PITCH": {
"description": "Axis binding",
"message": "Map Pitch"
"message": "Nézet bólintása"
},
"BIND_MAP_VIEW_YAW": {
"description": "Axis binding",
"message": "Map Yaw"
"message": "Nézet forgatása"
},
"BIND_PRIMARY_FIRE": {
"description": "Descriptive name for the PrimaryFire action.",
Expand Down Expand Up @@ -156,7 +156,7 @@
},
"GROUP_SECTOR_MAP_VIEW_CONTROLS": {
"description": "Header for the SectorMapViewControls input group.",
"message": "Sector Map View Controls"
"message": "Szektor térkép vezérlése"
},
"GROUP_SHIP_ORIENT": {
"description": "Header for the ShipOrient input group.",
Expand All @@ -176,7 +176,7 @@
},
"PAGE_MAP_CONTROLS": {
"description": "Header for the MapControls input page.",
"message": "Map Controls"
"message": "Térkép vezérése"
},
"PAGE_SHIP_CONTROLS": {
"description": "Header for the ShipControls input page.",
Expand Down
14 changes: 7 additions & 7 deletions data/lang/input-core/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@
},
"BIND_MAP_VIEW_MOVE_FORWARD": {
"description": "Axis binding",
"message": "Shift Map Longitudinally"
"message": "纵向移动地图"
},
"BIND_MAP_VIEW_MOVE_LEFT": {
"description": "Axis binding",
"message": "Shift Map Horizontally"
"message": "水平移动地图"
},
"BIND_MAP_VIEW_MOVE_UP": {
"description": "Axis binding",
"message": "Shift Map Vertically"
"message": "垂直移动地图"
},
"BIND_MAP_VIEW_PITCH": {
"description": "Axis binding",
"message": "Map Pitch"
"message": "地图间距"
},
"BIND_MAP_VIEW_YAW": {
"description": "Axis binding",
"message": "Map Yaw"
"message": "地图偏航"
},
"BIND_PRIMARY_FIRE": {
"description": "Descriptive name for the PrimaryFire action.",
Expand Down Expand Up @@ -156,7 +156,7 @@
},
"GROUP_SECTOR_MAP_VIEW_CONTROLS": {
"description": "Header for the SectorMapViewControls input group.",
"message": "Sector Map View Controls"
"message": "地图视图控制"
},
"GROUP_SHIP_ORIENT": {
"description": "Header for the ShipOrient input group.",
Expand All @@ -176,7 +176,7 @@
},
"PAGE_MAP_CONTROLS": {
"description": "Header for the MapControls input page.",
"message": "Map Controls"
"message": "地图控制"
},
"PAGE_SHIP_CONTROLS": {
"description": "Header for the ShipControls input page.",
Expand Down
4 changes: 2 additions & 2 deletions data/lang/module-breakdownservicing/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"FLAVOUR_2_YESPLEASE": {
"description": "",
"message": "Por favor, afine el hipermotor al precio acordado"
"message": "Por favor, afine el motor de hiperimpulso al precio acordado"
},
"FLAVOUR_3_INTRO": {
"description": "",
Expand Down Expand Up @@ -89,7 +89,7 @@
},
"FLAVOUR_4_RESPONSE": {
"description": "",
"message": "Hemos completado el trabajo en su motor."
"message": "Hemos completado el trabajo en su hiperimpulsor."
},
"FLAVOUR_4_TITLE": {
"description": "",
Expand Down
Loading

0 comments on commit de633f0

Please sign in to comment.