From 3643130a8dc94e626f66aea12e418561d3f777a4 Mon Sep 17 00:00:00 2001 From: Gliese852 Date: Sat, 4 Jul 2020 16:19:38 +0300 Subject: [PATCH 01/27] Fix some things with regards to the sector map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - clear route strings when enging the game, otherwise, when the game restarts, a segfault occurs - fix that the "remove jump" button continued to remove jumps even when the route became empty - reordered sections in the object information widget, added icons to the names of stars in the multisystem - it turns out that a hyper jump is possible not only to the stars, but also to the "substellar objects", but they do not return in the method GetStars. Since a specific body should be shown in the route planner, implemented an additional method GetJumpable, that gets all the bodies available for jumping (IsJumpable == true), and this is synchronized with what you can click in the systeminfo view - also I had to change the route check, now it’s not the star index that is checked, but just the path (this check is performed for multisystems, so that only the specific body that registered in the route is always selected) - remove method SectorView::SwapSelectedHyperspaceTarget, because it is not used anywhere - clang satisfaction --- data/pigui/modules/hyperjump-planner.lua | 9 ++- data/pigui/modules/map-sector-view.lua | 70 +++++++++++++----------- src/SectorView.cpp | 32 +++-------- src/SectorView.h | 3 +- src/SystemInfoView.cpp | 2 +- src/galaxy/SystemBody.h | 52 +++++++++--------- src/lua/LuaStarSystem.cpp | 15 +++++ 7 files changed, 98 insertions(+), 85 deletions(-) diff --git a/data/pigui/modules/hyperjump-planner.lua b/data/pigui/modules/hyperjump-planner.lua index 55e01c69a76..2747d422f9a 100644 --- a/data/pigui/modules/hyperjump-planner.lua +++ b/data/pigui/modules/hyperjump-planner.lua @@ -176,6 +176,7 @@ local function updateHyperspaceTarget() sectorView:SetHyperspaceTarget(hyperjump_route[1].path) else sectorView:ResetHyperspaceTarget() + selected_jump = nil end end @@ -225,7 +226,6 @@ local function showJumpRoute() mainButton(icons.retrograde_thin, lui.CLEAR_ROUTE, function() sectorView:ClearRoute() - selected_jump = nil updateHyperspaceTarget() end) ui.sameLine() @@ -361,4 +361,11 @@ function hyperJumpPlanner.onEnterSystem(ship) updateHyperspaceTarget() end +function hyperJumpPlanner.onGameEnd(ship) + -- clear the route out so it doesn't show up if the user starts a new game + sectorView:ClearRoute() + -- also clear the route list, saved in this module + buildJumpRouteList() +end + return hyperJumpPlanner diff --git a/data/pigui/modules/map-sector-view.lua b/data/pigui/modules/map-sector-view.lua index 147ba1981d2..ae379f797ad 100644 --- a/data/pigui/modules/map-sector-view.lua +++ b/data/pigui/modules/map-sector-view.lua @@ -104,11 +104,7 @@ function Windows.systemInfo.Show() local starsystem = systempath:GetStarSystem() local clicked = false ui.withID(label, function() - local jumpData = "" - if not current_systempath:IsSameSystem(systempath) then - local jumpStatus, distance, fuelRequired, duration = player:GetHyperspaceDetails(current_systempath, systempath) - jumpData = jumpStatus .. " " .. string.format("%.2f", distance) .. lc.UNIT_LY .. " " .. fuelRequired .. lc.UNIT_TONNES .. " " .. ui.Format.Duration(duration, 2) - end + -- selected system label textIcon(icons.info) ui.sameLine() ui.text(starsystem.name .. " (" .. math.floor(systempath.sectorX) .. ", " .. math.floor(systempath.sectorY) .. ", " .. math.floor(systempath.sectorZ) .. ")") @@ -119,14 +115,47 @@ function Windows.systemInfo.Show() sectorView:GotoSystemPath(systempath) end end + -- selected system alternative labels + if next(starsystem.other_names) ~= nil then + ui.pushTextWrapPos(ui.getContentRegion().x) + ui.textWrapped(table.concat(starsystem.other_names, ", ")) + ui.popTextWrapPos() + end + -- jump data + if not current_systempath:IsSameSystem(systempath) then ui.separator() - ui.text(jumpData) + local jumpStatus, distance, fuelRequired, duration = player:GetHyperspaceDetails(current_systempath, systempath) + ui.text(jumpStatus .. " " .. string.format("%.2f", distance) .. lc.UNIT_LY .. " " .. fuelRequired .. lc.UNIT_TONNES .. " " .. ui.Format.Duration(duration, 2)) + end + -- description + ui.pushTextWrapPos(ui.getContentRegion().x) + ui.textWrapped(starsystem.shortDescription) + ui.popTextWrapPos() ui.separator() - local stars = starsystem:GetStars() + -- number of stars + local numstars = starsystem.numberOfStars + local numstarstext = "" + if numstars == 4 then + numstarstext = lc.QUADRUPLE_SYSTEM + elseif numstars == 3 then + numstarstext = lc.TRIPLE_SYSTEM + elseif numstars == 2 then + numstarstext = lc.BINARY_SYSTEM + else + numstarstext = starsystem.rootSystemBody.astroDescription + end + ui.text(numstarstext) + -- star list + local stars = starsystem:GetJumpable() for _,star in pairs(stars) do - if ui.selectable(star.name, star.path == systempath, {}) then + local pos = ui.getCursorPos() + Vector2(0, 1) -- add vertical alignment, not quite necessary + if ui.selectable("## " .. star.name, star.path == systempath, {}) then clicked = star.path end + ui.setCursorPos(pos) + textIcon(icons.sun) + ui.sameLine() + ui.text(star.name) end if clicked then sectorView:SwitchToPath(clicked) @@ -138,25 +167,6 @@ function Windows.systemInfo.Show() hyperJumpPlanner.updateInRoute(systempath) prevSystemPath = systempath end - - local numstars = starsystem.numberOfStars - local numstarstext = "" - if numstars == 4 then - numstarstext = lc.QUADRUPLE_SYSTEM - elseif numstars == 3 then - numstarstext = lc.TRIPLE_SYSTEM - elseif numstars == 2 then - numstarstext = lc.BINARY_SYSTEM - else - numstarstext = starsystem.rootSystemBody.astroDescription - end - ui.text(numstarstext) - if next(starsystem.other_names) ~= nil then - ui.text(table.concat(starsystem.other_names, ", ")) - end - ui.pushTextWrapPos(ui.getContentRegion().x) - ui.textWrapped(starsystem.shortDescription) - ui.popTextWrapPos() end) end end @@ -416,11 +426,7 @@ Event.Register("onLeaveSystem", function() hyperspaceDetailsCache = {} end) -- events moved from hyperJumpPlanner -Event.Register("onGameEnd", -function(ship) - -- clear the route out so it doesn't show up if the user starts a new game - sectorView:ClearRoute() -end) +Event.Register("onGameEnd", hyperJumpPlanner.onGameEnd) Event.Register("onEnterSystem", hyperJumpPlanner.onEnterSystem) Event.Register("onShipEquipmentChanged", hyperJumpPlanner.onShipEquipmentChanged) diff --git a/src/SectorView.cpp b/src/SectorView.cpp index 9c726353e90..0dd9b2394bf 100644 --- a/src/SectorView.cpp +++ b/src/SectorView.cpp @@ -367,7 +367,7 @@ void SectorView::SetSelected(const SystemPath &path) m_selected = path; else if (path.IsSystemPath()) { RefCountedPtr system = m_galaxy->GetStarSystem(path); - m_selected = system->GetStars()[CheckIndexInRoute(path)]->GetPath(); + m_selected = CheckPathInRoute(system->GetStars()[0]->GetPath()); } } @@ -378,34 +378,18 @@ void SectorView::SwitchToPath(const SystemPath &path) GotoSystem(path); } -void SectorView::SwapSelectedHyperspaceTarget() -{ - SystemPath tmpTarget = GetHyperspaceTarget(); - SetHyperspaceTarget(GetSelected()); - if (m_automaticSystemSelection) { - GotoSystem(tmpTarget); - } else { - RefCountedPtr system = m_galaxy->GetStarSystem(tmpTarget); - SetSelected(system->GetStars()[CheckIndexInRoute(tmpTarget)]->GetPath()); - } -} - void SectorView::OnClickSystem(const SystemPath &path) { SwitchToPath(path); } -// check the route, maybe this system is there, then we'll take star number from there -// if single system, bodyindex = 0; if multisystem, bodyindex = (0 or 1),2 ... -int SectorView::CheckIndexInRoute(const SystemPath &path) +// check the route, maybe this system is there, then we'll take the path from the route +const SystemPath &SectorView::CheckPathInRoute(const SystemPath &path) { - for (auto &p : m_route) - if (p.IsSameSystem(path)) { - if (p.bodyIndex > 0) - return p.bodyIndex - 1; - return 0; - } - return 0; + for (const auto &p : m_route) + if (p.IsSameSystem(path)) + return p; + return path; } void SectorView::PutSystemLabels(RefCountedPtr sec, const vector3f &origin, int drawRadius) @@ -1160,7 +1144,7 @@ void SectorView::Update() if (!m_selected.IsSameSystem(new_selected)) { RefCountedPtr system = m_galaxy->GetStarSystem(new_selected); - SetSelected(system->GetStars()[CheckIndexInRoute(new_selected)]->GetPath()); + SetSelected(CheckPathInRoute(system->GetStars()[0]->GetPath())); } } } diff --git a/src/SectorView.h b/src/SectorView.h index fe06d73e237..7f3d6be7a37 100644 --- a/src/SectorView.h +++ b/src/SectorView.h @@ -45,7 +45,6 @@ class SectorView : public UIView, public DeleteEmitter { void GotoCurrentSystem() { GotoSystem(m_current); } void GotoSelectedSystem() { GotoSystem(m_selected); } void GotoHyperspaceTarget() { GotoSystem(m_hyperspaceTarget); } - void SwapSelectedHyperspaceTarget(); bool IsCenteredOn(const SystemPath &path); void SaveToJson(Json &jsonObj) override; @@ -131,7 +130,7 @@ class SectorView : public UIView, public DeleteEmitter { void AddStarBillboard(const matrix4x4f &modelview, const vector3f &pos, const Color &col, float size); void OnClickSystem(const SystemPath &path); - int CheckIndexInRoute(const SystemPath &path); + const SystemPath &CheckPathInRoute(const SystemPath &path); RefCountedPtr GetCached(const SystemPath &loc) { return m_sectorCache->GetCached(loc); } void ShrinkCache(); diff --git a/src/SystemInfoView.cpp b/src/SystemInfoView.cpp index b99653b9112..21126698760 100644 --- a/src/SystemInfoView.cpp +++ b/src/SystemInfoView.cpp @@ -50,7 +50,7 @@ void SystemInfoView::OnBodySelected(SystemBody *b) Body *body = m_game->GetSpace()->FindBodyForPath(&path); if (body != 0) Pi::player->SetNavTarget(body); - } else if (b->GetSuperType() == SystemBody::SUPERTYPE_STAR) { // We allow hyperjump to any star of the system + } else if (b->IsJumpable()) { m_game->GetSectorView()->SwitchToPath(path); } } diff --git a/src/galaxy/SystemBody.h b/src/galaxy/SystemBody.h index 515535785e6..8ac6711a171 100644 --- a/src/galaxy/SystemBody.h +++ b/src/galaxy/SystemBody.h @@ -52,22 +52,22 @@ class SystemBody : public RefCounted { TYPE_STAR_A_HYPER_GIANT = 28, TYPE_STAR_B_HYPER_GIANT = 29, TYPE_STAR_O_HYPER_GIANT = 30, // these various stars do exist = they are transitional states and are rare - TYPE_STAR_M_WF = 31, //Wolf-Rayet star - TYPE_STAR_B_WF = 32, // while you do not specifically get class M,B or O WF stars, - TYPE_STAR_O_WF = 33, // you do get red = blue and purple from the colour of the gasses = so spectral class is an easy way to define them. - TYPE_STAR_S_BH = 34, //stellar blackhole - TYPE_STAR_IM_BH = 35, //Intermediate-mass blackhole - TYPE_STAR_SM_BH = 36, //Supermassive blackhole + TYPE_STAR_M_WF = 31, //Wolf-Rayet star + TYPE_STAR_B_WF = 32, // while you do not specifically get class M,B or O WF stars, + TYPE_STAR_O_WF = 33, // you do get red = blue and purple from the colour of the gasses = so spectral class is an easy way to define them. + TYPE_STAR_S_BH = 34, //stellar blackhole + TYPE_STAR_IM_BH = 35, //Intermediate-mass blackhole + TYPE_STAR_SM_BH = 36, //Supermassive blackhole TYPE_PLANET_GAS_GIANT = 37, TYPE_PLANET_ASTEROID = 38, TYPE_PLANET_TERRESTRIAL = 39, TYPE_STARPORT_ORBITAL = 40, TYPE_STARPORT_SURFACE = 41, - TYPE_MIN = TYPE_BROWN_DWARF, // + TYPE_MIN = TYPE_BROWN_DWARF, // TYPE_MAX = TYPE_STARPORT_SURFACE, // TYPE_STAR_MIN = TYPE_BROWN_DWARF, // - TYPE_STAR_MAX = TYPE_STAR_SM_BH, // - // XXX need larger atmosphereless thing + TYPE_STAR_MAX = TYPE_STAR_SM_BH, // + // XXX need larger atmosphereless thing }; enum BodySuperType { // @@ -83,6 +83,8 @@ class SystemBody : public RefCounted { bool IsPlanet() const; bool IsMoon() const { return GetSuperType() == SUPERTYPE_ROCKY_PLANET && !IsPlanet(); } + // We allow hyperjump to any star of the system + bool IsJumpable() const { return GetSuperType() == SUPERTYPE_STAR; } bool HasChildren() const { return !m_children.empty(); } Uint32 GetNumChildren() const { return static_cast(m_children.size()); } @@ -98,7 +100,7 @@ class SystemBody : public RefCounted { BodySuperType GetSuperType() const; bool IsCustomBody() const { return m_isCustomBody; } bool IsCoOrbitalWith(const SystemBody *other) const; //this and other form a binary pair - bool IsCoOrbital() const; //is part of any binary pair + bool IsCoOrbital() const; //is part of any binary pair fixed GetRadiusAsFixed() const { return m_radius; } // the aspect ratio adjustment is converting from equatorial to polar radius to account for ellipsoid bodies, used for calculating terrains etc @@ -228,38 +230,38 @@ class SystemBody : public RefCounted { void ClearParentAndChildPointers(); - SystemBody *m_parent; // these are only valid if the StarSystem + SystemBody *m_parent; // these are only valid if the StarSystem std::vector m_children; // that create them still exists SystemPath m_path; Orbit m_orbit; Uint32 m_seed; // Planet.cpp can use to generate terrain std::string m_name; - fixed m_radius; // in earth radii for planets, sol radii for stars. equatorial radius in case of bodies which are flattened at the poles - fixed m_aspectRatio; // ratio between equatorial and polar radius for bodies with eqatorial bulges - fixed m_mass; // earth masses if planet, solar masses if star - fixed m_orbMin, m_orbMax; // periapsism, apoapsis in AUs - fixed m_rotationPeriod; // in days + fixed m_radius; // in earth radii for planets, sol radii for stars. equatorial radius in case of bodies which are flattened at the poles + fixed m_aspectRatio; // ratio between equatorial and polar radius for bodies with eqatorial bulges + fixed m_mass; // earth masses if planet, solar masses if star + fixed m_orbMin, m_orbMax; // periapsism, apoapsis in AUs + fixed m_rotationPeriod; // in days fixed m_rotationalPhaseAtStart; // 0 to 2 pi - fixed m_humanActivity; // 0 - 1 - fixed m_semiMajorAxis; // in AUs + fixed m_humanActivity; // 0 - 1 + fixed m_semiMajorAxis; // in AUs fixed m_eccentricity; fixed m_orbitalOffset; fixed m_orbitalPhaseAtStart; // 0 to 2 pi - fixed m_axialTilt; // in radians - fixed m_inclination; // in radians, for surface bodies = latitude + fixed m_axialTilt; // in radians + fixed m_inclination; // in radians, for surface bodies = latitude int m_averageTemp; BodyType m_type; bool m_isCustomBody; /* composition */ - fixed m_metallicity; // (crust) 0.0 = light (Al, SiO2, etc), 1.0 = heavy (Fe, heavy metals) - fixed m_volatileGas; // 1.0 = earth atmosphere density + fixed m_metallicity; // (crust) 0.0 = light (Al, SiO2, etc), 1.0 = heavy (Fe, heavy metals) + fixed m_volatileGas; // 1.0 = earth atmosphere density fixed m_volatileLiquid; // 1.0 = 100% ocean cover (earth = 70%) - fixed m_volatileIces; // 1.0 = 100% ice cover (earth = 3%) - fixed m_volcanicity; // 0 = none, 1.0 = fucking volcanic + fixed m_volatileIces; // 1.0 = 100% ice cover (earth = 3%) + fixed m_volcanicity; // 0 = none, 1.0 = fucking volcanic fixed m_atmosOxidizing; // 0.0 = reducing (H2, NH3, etc), 1.0 = oxidising (CO2, O2, etc) - fixed m_life; // 0.0 = dead, 1.0 = teeming + fixed m_life; // 0.0 = dead, 1.0 = teeming RingStyle m_rings; diff --git a/src/lua/LuaStarSystem.cpp b/src/lua/LuaStarSystem.cpp index 9e3bc9cacc3..78d9503e2c7 100644 --- a/src/lua/LuaStarSystem.cpp +++ b/src/lua/LuaStarSystem.cpp @@ -316,6 +316,20 @@ static int l_starsystem_get_stars(lua_State *l) return 1; } +static int l_starsystem_get_jumpable(lua_State *l) +{ + const StarSystem *s = LuaObject::CheckFromLua(1); + lua_newtable(l); + int i = 1; + for (RefCountedPtr sb : s->GetBodies()) + if (sb->IsJumpable()) { + lua_pushnumber(l, i++); + LuaObject::PushToLua(sb.Get()); + lua_settable(l, -3); + } + return 1; +} + /* * Method: DistanceTo * @@ -647,6 +661,7 @@ void LuaObject::RegisterClass() { "GetStationPaths", l_starsystem_get_station_paths }, { "GetBodyPaths", l_starsystem_get_body_paths }, { "GetStars", l_starsystem_get_stars }, + { "GetJumpable", l_starsystem_get_jumpable }, { "GetCommodityBasePriceAlterations", l_starsystem_get_commodity_base_price_alterations }, { "IsCommodityLegal", l_starsystem_is_commodity_legal }, From 7b00c90f25004fc7951ae37fadaca4e4b94cc63e Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Mon, 6 Jul 2020 03:01:20 +0200 Subject: [PATCH 02/27] auto-commit: translation updates --- data/lang/core/hu.json | 2 +- data/lang/input-core/hu.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/lang/core/hu.json b/data/lang/core/hu.json index 3d9c2f5e014..d74b8193bf8 100644 --- a/data/lang/core/hu.json +++ b/data/lang/core/hu.json @@ -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": "", diff --git a/data/lang/input-core/hu.json b/data/lang/input-core/hu.json index 2c1dcf734d9..8da2af09969 100644 --- a/data/lang/input-core/hu.json +++ b/data/lang/input-core/hu.json @@ -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.", @@ -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.", @@ -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.", From 937027a83f7bf61fbe9d23efc109de4947c6213e Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Thu, 9 Jul 2020 03:01:21 +0200 Subject: [PATCH 03/27] auto-commit: translation updates --- data/lang/core/zh.json | 2 +- data/lang/input-core/zh.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/lang/core/zh.json b/data/lang/core/zh.json index 00bd79161bd..530ead2e7bb 100644 --- a/data/lang/core/zh.json +++ b/data/lang/core/zh.json @@ -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": "", diff --git a/data/lang/input-core/zh.json b/data/lang/input-core/zh.json index 4c2a863a6f5..156d3304fe4 100644 --- a/data/lang/input-core/zh.json +++ b/data/lang/input-core/zh.json @@ -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.", @@ -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.", @@ -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.", From 857cb785885ca41e15508592928b487a4b74e161 Mon Sep 17 00:00:00 2001 From: Craig O'Brien Date: Fri, 10 Jul 2020 14:23:33 +1200 Subject: [PATCH 04/27] Update equipment-market.lua Fixes #4896 Credit: @joonicks Co-Authored-By: joonicks --- data/pigui/libs/equipment-market.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/pigui/libs/equipment-market.lua b/data/pigui/libs/equipment-market.lua index cd386955257..eb6c80bcd0b 100644 --- a/data/pigui/libs/equipment-market.lua +++ b/data/pigui/libs/equipment-market.lua @@ -109,7 +109,7 @@ local defaultFuncs = { if self.tradeAmount ~= nil then count = self.tradeAmount end - Game.player:GetDockedWith():AddEquipmentStock(e, count) + Game.player:GetDockedWith():AddEquipmentStock(e, -count) end, -- do something when a "sell" button is clicked From 74c550fbd0e69907c3c73c7bb3d21a562a129c8e Mon Sep 17 00:00:00 2001 From: Taylor Talkington Date: Thu, 9 Jul 2020 23:31:03 -0400 Subject: [PATCH 05/27] Set hyperdrive last service date to game start date for new games. --- data/modules/BreakdownServicing/BreakdownServicing.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/modules/BreakdownServicing/BreakdownServicing.lua b/data/modules/BreakdownServicing/BreakdownServicing.lua index bcc87738a19..367f73792fd 100644 --- a/data/modules/BreakdownServicing/BreakdownServicing.lua +++ b/data/modules/BreakdownServicing/BreakdownServicing.lua @@ -225,7 +225,7 @@ local onGameStart = function () if not loaded_data then service_history = { - lastdate = 0, -- Default will be overwritten on game start + lastdate = Game.time, company = nil, -- Name of company that did the last service service_period = oneyear, -- default jumpcount = 0, -- Number of jumps made after the service_period From 2f45e96d0fb3da53bf6397d47c1d984a3176997b Mon Sep 17 00:00:00 2001 From: Karl F Date: Fri, 10 Jul 2020 10:38:24 +0200 Subject: [PATCH 06/27] Update changelog, 2 bug fixes --- Changelog.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index b0120ded7a6..368ebaabc30 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,7 +1,12 @@ +July 2020 + * Fixes + * Fix buying commodities not subtracting station stock (#4909) + * Fix hyperdrive last service date being wrong (#4910) + June 2020 * New Features * Redesign System and Sector Map View layouts (#4852) - + * Internal Changes * Add support for IMGUI tabs in pigui (#4893) @@ -34,7 +39,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) From be91a6c71196b7768389a91f5654c514215c2e22 Mon Sep 17 00:00:00 2001 From: Gliese852 Date: Fri, 10 Jul 2020 15:02:25 +0300 Subject: [PATCH 07/27] Add a module for creating message boxes --- data/pigui/libs/message-box.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 data/pigui/libs/message-box.lua diff --git a/data/pigui/libs/message-box.lua b/data/pigui/libs/message-box.lua new file mode 100644 index 00000000000..96db273720b --- /dev/null +++ b/data/pigui/libs/message-box.lua @@ -0,0 +1,25 @@ +-- Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details +-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt + +local ui = require 'pigui' +local ModalWindow = require 'pigui.libs.modal-win' + +local OK_BUTTON_WIDTH = 100 + +local msgbox = {} + +msgbox.OK = function(msg) + ModalWindow.New('PopupMessageBox', function(self) + ui.text(msg) + local width = ui.getContentRegion().x + if width > OK_BUTTON_WIDTH then + ui.dummy(Vector2((width - OK_BUTTON_WIDTH) / 2, 0)) + ui.sameLine() + end + if ui.button("OK", Vector2(OK_BUTTON_WIDTH, 0)) then + self:close() + end + end):open() +end + +return msgbox From 548ce5ec01c39dc0b912348213416770d0163840 Mon Sep 17 00:00:00 2001 From: Gliese852 Date: Fri, 10 Jul 2020 15:30:27 +0300 Subject: [PATCH 08/27] Another 2 fixes to the sector map - fix that Auto Route button crashes game when no hyperdrive fitted. Add 3 possible options - successful route building, no drive, no valid route. Also turn the last static function in LuaSectorView.cpp into a lambda, because it turned out that it was not needed in other functions. - fix that when moving the SectorView camera by entering coordinates to the search field, the camera position gets "locked" to the coordinates and you can't move it (now it moves only when the search bar changes) --- data/lang/ui-core/en.json | 4 +++ data/pigui/modules/hyperjump-planner.lua | 8 ++++- data/pigui/modules/map-sector-view.lua | 4 +-- src/SectorView.cpp | 9 ++++-- src/SectorView.h | 2 +- src/lua/LuaRef.h | 1 + src/lua/LuaSectorView.cpp | 39 ++++++++++++------------ 7 files changed, 41 insertions(+), 26 deletions(-) diff --git a/data/lang/ui-core/en.json b/data/lang/ui-core/en.json index cf73c6c2446..05c938b9d04 100644 --- a/data/lang/ui-core/en.json +++ b/data/lang/ui-core/en.json @@ -1311,6 +1311,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} light years ({maxRange} max)" diff --git a/data/pigui/modules/hyperjump-planner.lua b/data/pigui/modules/hyperjump-planner.lua index 2747d422f9a..5df15ab53ee 100644 --- a/data/pigui/modules/hyperjump-planner.lua +++ b/data/pigui/modules/hyperjump-planner.lua @@ -10,6 +10,7 @@ local lc = Lang.GetResource("core") local lui = Lang.GetResource("ui-core"); local ui = require 'pigui' +local mb = require 'pigui.libs.message-box' local player = nil local colors = ui.theme.colors @@ -232,7 +233,12 @@ local function showJumpRoute() mainButton(icons.hyperspace, lui.AUTO_ROUTE, function() - sectorView:AutoRoute() + local result = sectorView:AutoRoute() + if result == "NO_DRIVE" then + mb.OK(lui.NO_DRIVE) + elseif result == "NO_VALID_ROUTE" then + mb.OK(lui.NO_VALID_ROUTE) + end updateHyperspaceTarget() end) ui.sameLine() diff --git a/data/pigui/modules/map-sector-view.lua b/data/pigui/modules/map-sector-view.lua index ae379f797ad..b8f9c4038e4 100644 --- a/data/pigui/modules/map-sector-view.lua +++ b/data/pigui/modules/map-sector-view.lua @@ -278,8 +278,8 @@ function Windows.searchBar.Show() ui.text(lc.SEARCH) search_text, changed = ui.inputText("", search_text, {}) if search_text ~= "" then - local parsedSystem = SystemPath.ParseString(search_text) - if parsedSystem ~= nil then + local parsedSystem = changed and SystemPath.ParseString(search_text) + if parsedSystem and parsedSystem ~= nil then sectorView:GotoSectorPath(parsedSystem) else local systempaths = sectorView:SearchNearbyStarSystemsByName(search_text) diff --git a/src/SectorView.cpp b/src/SectorView.cpp index 0dd9b2394bf..5056853fce8 100644 --- a/src/SectorView.cpp +++ b/src/SectorView.cpp @@ -620,13 +620,16 @@ std::vector SectorView::GetRoute() return m_route; } -void SectorView::AutoRoute(const SystemPath &start, const SystemPath &target, std::vector &outRoute) const +const std::string SectorView::AutoRoute(const SystemPath &start, const SystemPath &target, std::vector &outRoute) const { const RefCountedPtr start_sec = m_galaxy->GetSector(start); const RefCountedPtr target_sec = m_galaxy->GetSector(target); + LuaRef try_hdrive = LuaObject::CallMethod(Pi::player, "GetEquip", "engine", 1); + if (try_hdrive.IsNil()) + return "NO_DRIVE"; // Get the player's hyperdrive from Lua, later used to calculate the duration between systems - const ScopedTable hyperdrive = ScopedTable(LuaObject::CallMethod(Pi::player, "GetEquip", "engine", 1)); + const ScopedTable hyperdrive = ScopedTable(try_hdrive); // Cache max range so it doesn't get recalculated every time we call GetDuration const float max_range = hyperdrive.CallMethod("GetMaximumRange", Pi::player); @@ -748,7 +751,9 @@ void SectorView::AutoRoute(const SystemPath &start, const SystemPath &target, st u = path_prev[u]; } std::reverse(std::begin(outRoute), std::end(outRoute)); + return "OKAY"; } + return "NO_VALID_ROUTE"; } void SectorView::DrawRouteLines(const vector3f &playerAbsPos, const matrix4x4f &trans) diff --git a/src/SectorView.h b/src/SectorView.h index 7f3d6be7a37..75a58f85a63 100644 --- a/src/SectorView.h +++ b/src/SectorView.h @@ -75,7 +75,7 @@ class SectorView : public UIView, public DeleteEmitter { bool RemoveRouteItem(const std::vector::size_type element); void ClearRoute(); std::vector GetRoute(); - void AutoRoute(const SystemPath &start, const SystemPath &target, std::vector &outRoute) const; + const std::string AutoRoute(const SystemPath &start, const SystemPath &target, std::vector &outRoute) const; void SetDrawRouteLines(bool value) { m_drawRouteLines = value; } static struct InputBinding : public Input::InputFrame { diff --git a/src/lua/LuaRef.h b/src/lua/LuaRef.h index 33e58422481..55f090a667c 100644 --- a/src/lua/LuaRef.h +++ b/src/lua/LuaRef.h @@ -26,6 +26,7 @@ class LuaRef { lua_State *GetLua() const { return m_lua; } bool IsValid() const { return m_lua && m_id != LUA_NOREF; } + bool IsNil() const { return m_lua && m_id == LUA_REFNIL; } void SaveToJson(Json &jsonObj); void LoadFromJson(const Json &jsonObj); diff --git a/src/lua/LuaSectorView.cpp b/src/lua/LuaSectorView.cpp index a1be838ace5..e3c5dea9a3a 100644 --- a/src/lua/LuaSectorView.cpp +++ b/src/lua/LuaSectorView.cpp @@ -6,20 +6,6 @@ #include "LuaVector.h" #include "SectorView.h" -static int l_sectorview_get_route(lua_State *l, SectorView *sv) -{ - std::vector route = sv->GetRoute(); - - lua_newtable(l); - int i = 1; - for (const SystemPath &j : route) { - lua_pushnumber(l, i++); - LuaObject::PushToLua(j); - lua_settable(l, -3); - } - return 1; -} - template <> const char *LuaObject::s_type = "SectorView"; @@ -125,14 +111,27 @@ void LuaObject::RegisterClass() SystemPath current_path = sv->GetCurrent(); SystemPath target_path = sv->GetSelected(); std::vector route; - sv->AutoRoute(current_path, target_path, route); - sv->ClearRoute(); - for (auto it = route.begin(); it != route.end(); it++) { - sv->AddToRoute(*it); + const std::string result = sv->AutoRoute(current_path, target_path, route); + if (result == "OKAY") { + sv->ClearRoute(); + for (auto it = route.begin(); it != route.end(); it++) { + sv->AddToRoute(*it); + } } - return l_sectorview_get_route(l, sv); + LuaPush(l, result); + return 1; + }) + .AddFunction("GetRoute", [](lua_State *l, SectorView *sv) { + std::vector route = sv->GetRoute(); + lua_newtable(l); + int i = 1; + for (const SystemPath &j : route) { + lua_pushnumber(l, i++); + LuaObject::PushToLua(j); + lua_settable(l, -3); + } + return 1; }) - .AddFunction("GetRoute", &l_sectorview_get_route) .StopRecording(); LuaObjectBase::CreateClass(&metaType); } From 1e2251c17b6f3f8fec63027e97cc8fedce3079b9 Mon Sep 17 00:00:00 2001 From: Taylor Talkington Date: Fri, 10 Jul 2020 12:15:36 -0400 Subject: [PATCH 09/27] Resize Load/Save Window (#4674) --- data/pigui/modules/saveloadgame.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/pigui/modules/saveloadgame.lua b/data/pigui/modules/saveloadgame.lua index 5dabcaa428b..fb3b8cbf851 100644 --- a/data/pigui/modules/saveloadgame.lua +++ b/data/pigui/modules/saveloadgame.lua @@ -21,9 +21,7 @@ local icons = ui.theme.icons local pionillium = ui.fonts.pionillium local popupOpened = false -local mainButtonSize = Vector2(40,40) * (ui.screenHeight / 1200) -local optionButtonSize = Vector2(125,40) * (ui.screenHeight / 1200) -local bindingButtonSize = Vector2(135,25) * (ui.screenHeight / 1200) +local optionButtonSize = ui.rescaleUI(Vector2(150,25), Vector2(1920,1080)) local mainButtonFramePadding = 3 local saveFileCache = {} @@ -129,6 +127,7 @@ ui.saveLoadWindow = ModalWindow.New("LoadGame", function() showSaveFiles() end, function (self, drawPopupFn) + ui.setNextWindowSize(ui.rescaleUI(Vector2(640, 400), Vector2(1920,1080)), "Always") ui.setNextWindowPosCenter('Always') ui.withStyleColorsAndVars({PopupBg = Color(20, 20, 80, 230)}, {WindowBorderSize = 1}, drawPopupFn) end) From 186d54b29ec00910053468b5c53148e122e8615d Mon Sep 17 00:00:00 2001 From: Karl F Date: Sat, 15 Feb 2020 10:54:41 +0100 Subject: [PATCH 10/27] Add more Lua API documentation --- src/lua/LuaPiGui.cpp | 77 ++++++++++++++++++++++++++++++++++++++ src/lua/LuaPlayer.cpp | 86 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+) diff --git a/src/lua/LuaPiGui.cpp b/src/lua/LuaPiGui.cpp index d0a66370817..cf56d3d244f 100644 --- a/src/lua/LuaPiGui.cpp +++ b/src/lua/LuaPiGui.cpp @@ -469,6 +469,24 @@ static int l_pigui_get_column_width(lua_State *l) return 1; } +/* + * Function: ui.setColumnWidth + * + * For not dividing column widths equally + * + * > ui.setColumnWidth(column_index, width) + * + * Example: + * + * > ui.columns(2, "mycolum", true) + * > ui.setColumnWidth(0, ui.getWindowSize().x*0.8) + * + * Parameters: + * + * column_index - integer, which column width to set, first being 0 + * width - float, width to set + * + */ static int l_pigui_set_column_width(lua_State *l) { int column_index = LuaPull(l, 1); @@ -799,6 +817,30 @@ static int l_pigui_path_stroke(lua_State *l) return 0; } +/* + * Function: selectable + * + * Determine if a text was slected or not + * + * > clicked = ui.selectable(text, is_selectable, flag) + * + * Example: + * + * > if ui.selectable("Fly me to the moon", true) then + * > buyRocketShip() + * > end + * + * Parameters: + * + * text - string, text + * is_selectable - boolean, wheater or not a text field is highlighted by mouse over + * flag - optional, selectable flag + * + * Return: + * + * clicked - bool, true if was clicked, else false + * + */ static int l_pigui_selectable(lua_State *l) { PROFILE_SCOPED() @@ -918,6 +960,18 @@ static int l_pigui_button_image_sized(lua_State *l) return 1; } +/* + * Function: textWrapped + * + * Wrap text, if too long, suitable for English, and similar languages + * + * > ui.textWrapped(text) + * + * Parameters: + * + * text - string, text string, possibly longer than a single line + * + */ static int l_pigui_text_wrapped(lua_State *l) { PROFILE_SCOPED() @@ -2165,6 +2219,29 @@ static int l_pigui_end_tab_item(lua_State *l) return 0; } +/* + * Function: inputText + * + * A field for text input + * + * > text_entered, entered = ui.inputText(label, text_displayed, flag) + * + * Example: + * + * > text, changed = ui.inputText(label, text, {"EnterReturnsTrue"}) + * + * Parameters: + * + * label - A unique string labeling the widget + * text_displayed - Default text in field + * flag - + * + * Returns: + * + * text_entered - text entered + * changed - bool, true if text was entered + * + */ static int l_pigui_input_text(lua_State *l) { PROFILE_SCOPED() diff --git a/src/lua/LuaPlayer.cpp b/src/lua/LuaPlayer.cpp index e4103460ffc..4daeea64ae0 100644 --- a/src/lua/LuaPlayer.cpp +++ b/src/lua/LuaPlayer.cpp @@ -84,6 +84,20 @@ static int l_set_nav_target(lua_State *l) return 0; } +/* + * Function: SetSetSpeedTarget + * + * Set the "set speed" of player's ship + * + * Example: + * + * > player:SetSetSpeedTarget(body) + * + * Parameters: + * + * body - relative to witch speed is set relative to + * + */ static int l_set_set_speed_target(lua_State *l) { Player *p = LuaObject::CheckFromLua(1); @@ -92,6 +106,20 @@ static int l_set_set_speed_target(lua_State *l) return 0; } +/* + * Function: ChangeSetSpeed + * + * Set the "set speed" of player's ship + * + * Example: + * + * > player:ChangeSetSpeed(delta) + * + * Parameters: + * + * delta - Float, by how much to change current set speed + * + */ static int l_change_set_speed(lua_State *l) { Player *p = LuaObject::CheckFromLua(1); @@ -488,6 +516,20 @@ static int l_get_heading_pitch_roll(lua_State *l) return 3; } +/* + * Function: SetRotationDamping + * + * Set rotation dampening on or off of player's ship + * + * Example: + * + * > player:SetRotationDamping(is_on) + * + * Parameters: + * + * is_on - boolean + * + */ static int l_set_rotation_damping(lua_State *l) { Player *player = LuaObject::CheckFromLua(1); @@ -496,6 +538,20 @@ static int l_set_rotation_damping(lua_State *l) return 0; } +/* + * Function: GetRotationDamping + * + * Get rotation dampening state of player's ship + * + * Example: + * + * > state = player:GetRotationDamping() + * + * Returns: + * + * state - bool + * + */ static int l_get_rotation_damping(lua_State *l) { Player *player = LuaObject::CheckFromLua(1); @@ -503,6 +559,16 @@ static int l_get_rotation_damping(lua_State *l) return 1; } +/* + * Function: ToggleRotationDamping + * + * Toggle rotation dampening on/off + * + * Example: + * + * > player:ToggleRotationDamping() + * + */ static int l_toggle_rotation_damping(lua_State *l) { Player *player = LuaObject::CheckFromLua(1); @@ -510,6 +576,26 @@ static int l_toggle_rotation_damping(lua_State *l) return 0; } +/* + * Function: GetGPS() + * + * Get altitude, speed, and position of player's ship + * + * Example: + * + * > alt, vspd, lat, long = player:GetGPS() + * + * Returns: + * + * alt - altitude + * + * vspd - vertical speed + * + * latitude - latitude + * + * longitude - longitude + * + */ static int l_get_gps(lua_State *l) { Player *player = LuaObject::CheckFromLua(1); From fdd930796b97342a0ffa33a5e51bc0086ed8e38f Mon Sep 17 00:00:00 2001 From: Karl F Date: Mon, 17 Feb 2020 21:44:29 +0100 Subject: [PATCH 11/27] Fix FligtLog surviving after starting new game. --- data/libs/FlightLog.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua index 2b8ea4ab1fa..af2d4a71ef9 100644 --- a/data/libs/FlightLog.lua +++ b/data/libs/FlightLog.lua @@ -220,6 +220,12 @@ local onGameStart = function () loaded_data = nil end +local onGameEnd = function () + FlightLogSystem = {} + FlightLogStation = {} + FlightLogCustom = {} +end + local serialize = function () return { System = FlightLogSystem, Station = FlightLogStation } end @@ -232,6 +238,7 @@ Event.Register("onEnterSystem", AddSystemArrivalToLog) Event.Register("onLeaveSystem", AddSystemDepartureToLog) Event.Register("onShipUndocked", AddStationToLog) Event.Register("onGameStart", onGameStart) +Event.Register("onGameEnd", onGameEnd) Serializer:Register("FlightLog", serialize, unserialize) return FlightLog From aa118ed4551c07822de35fb19a5b25728616f1ae Mon Sep 17 00:00:00 2001 From: Karl F Date: Sat, 15 Feb 2020 10:53:43 +0100 Subject: [PATCH 12/27] FlightLog also saves player's financial state when undocking --- data/libs/FlightLog.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua index af2d4a71ef9..1850caf46fb 100644 --- a/data/libs/FlightLog.lua +++ b/data/libs/FlightLog.lua @@ -90,15 +90,15 @@ FlightLog = { -- -- iterator - A function which will generate the paths from the log, returning -- one each time it is called until it runs out, after which it --- returns nil. It also returns, as a secondary value, the game --- time at which the player undocked. +-- returns nil. It also returns, as two additional value, the game +-- time at which the player undocked, and palyer's financial balance. -- -- Example: -- -- Print the names and departure times of the last five stations visited by -- the player -- --- > for systemp, deptime in FlightLog.GetStationPaths(5) do +-- > for systemp, deptime, money in FlightLog.GetStationPaths(5) do -- > print(systemp:GetSystemBody().name, Format.Date(deptime)) -- > end @@ -110,10 +110,11 @@ FlightLog = { counter = counter + 1 if FlightLogStation[counter] then return FlightLogStation[counter][1], - FlightLogStation[counter][2] + FlightLogStation[counter][2], + FlightLogStation[counter][3] end end - return nil, nil + return nil, nil, nil end end, @@ -200,7 +201,7 @@ end -- onShipUndocked local AddStationToLog = function (ship, station) if not ship:IsPlayer() then return end - table.insert(FlightLogStation,1,{station.path,Game.time}) + table.insert(FlightLogStation,1,{station.path, Game.time, Game.player:GetMoney()}) while #FlightLogStation > FlightLogStationQueueLength do table.remove(FlightLogStation,FlightLogStationQueueLength + 1) end From b76b164b0cd9856694f7ba00facd706c6ddd8365 Mon Sep 17 00:00:00 2001 From: Karl F Date: Sun, 23 Feb 2020 11:20:19 +0100 Subject: [PATCH 13/27] Make coloredSelectedIconButton work with same tooltip This method used to require each instance to have a unique tooltip string. Now it supports having the same tooltip repeated, provided it is appended with a "...##ID", where ID is a unique identifier. Also added documentation. --- data/pigui/modules/system-view-ui.lua | 9 ++++--- data/pigui/pigui.lua | 35 +++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/data/pigui/modules/system-view-ui.lua b/data/pigui/modules/system-view-ui.lua index ddd648a4f47..bca2a347898 100644 --- a/data/pigui/modules/system-view-ui.lua +++ b/data/pigui/modules/system-view-ui.lua @@ -122,18 +122,19 @@ local function showDvLine(leftIcon, resetIcon, rightIcon, key, Formatter, leftTo end end end - local press = ui.coloredSelectedIconButton(leftIcon, mainButtonSize, false, mainButtonFramePadding, svColor.BUTTON_ACTIVE, svColor.BUTTON_INK, leftTooltip, nil, key) + local id = "##" .. key + local press = ui.coloredSelectedIconButton(leftIcon, mainButtonSize, false, mainButtonFramePadding, svColor.BUTTON_ACTIVE, svColor.BUTTON_INK, leftTooltip..id, nil) if press or (key ~= "factor" and ui.isItemActive()) then systemView:TransferPlannerAdd(key, -10) end wheel() ui.sameLine() - if ui.coloredSelectedIconButton(resetIcon, mainButtonSize, false, mainButtonFramePadding, svColor.BUTTON_ACTIVE, svColor.BUTTON_INK, resetTooltip, nil, key) then + if ui.coloredSelectedIconButton(resetIcon, mainButtonSize, false, mainButtonFramePadding, svColor.BUTTON_ACTIVE, svColor.BUTTON_INK, resetTooltip..id, nil) then systemView:TransferPlannerReset(key) end wheel() ui.sameLine() - press = ui.coloredSelectedIconButton(rightIcon, mainButtonSize, false, mainButtonFramePadding, svColor.BUTTON_ACTIVE, svColor.BUTTON_INK, rightTooltip, nil, key) + press = ui.coloredSelectedIconButton(rightIcon, mainButtonSize, false, mainButtonFramePadding, svColor.BUTTON_ACTIVE, svColor.BUTTON_INK, rightTooltip..id, nil) if press or (key ~= "factor" and ui.isItemActive()) then systemView:TransferPlannerAdd(key, 10) end @@ -433,7 +434,7 @@ local function displayOnScreenObjects() if (isShip or isSystemBody and mainObject.ref.physicsBody) and ui.selectable(lc.SET_AS_TARGET, false, {}) then if isSystemBody then player:SetNavTarget(mainObject.ref.physicsBody) - else + else if combatTarget == mainObject.ref then player:SetCombatTarget(nil) end player:SetNavTarget(mainObject.ref) end diff --git a/data/pigui/pigui.lua b/data/pigui/pigui.lua index 3e80ec2ee44..fcf81eb5563 100644 --- a/data/pigui/pigui.lua +++ b/data/pigui/pigui.lua @@ -833,7 +833,35 @@ ui.coloredSelectedButton = function(label, thesize, is_selected, bg_color, toolt end return res end -ui.coloredSelectedIconButton = function(icon, thesize, is_selected, frame_padding, bg_color, fg_color, tooltip, img_size, extraID) + +-- +-- Function: ui.coloredSelectedIconButton +-- +-- > clicked = ui.coloredSelectedIconButton(icon, button_size, is_selected, +-- > frame_padding, bg_color, fg_color, tooltip, img_size) +-- +-- +-- Example: +-- +-- > clicked = ui.coloredSelectedIconButton(ui.theme.icons.bullseye, Vector2(10,10), false, +-- > 0, ui.theme.colors.buttonBlue, Color(255,0,0), "Click for action##42", Vector2(8,8)) +-- +-- Parameters: +-- +-- icon - image to place on button, e.g. from ui.theme.icons +-- button_size - size of button, Vector2 +-- is_selected - bool +-- frame_padding - number +-- bg_color - Color(R,G,B), for background +-- fg_color - Color(R,G,B), for forground +-- tooltip - string, mouseover text, will be used as ID, must be unique, append "##uniqueID" if needed +-- img_size - size of icon on the button, Vector2 +-- +-- Returns: +-- +-- clicked - true if button was clicked +-- +ui.coloredSelectedIconButton = function(icon, thesize, is_selected, frame_padding, bg_color, fg_color, tooltipID, img_size) if is_selected then pigui.PushStyleColor("Button", bg_color) pigui.PushStyleColor("ButtonHovered", bg_color:tint(0.1)) @@ -844,10 +872,13 @@ ui.coloredSelectedIconButton = function(icon, thesize, is_selected, frame_paddin pigui.PushStyleColor("ButtonActive", bg_color:shade(0.2)) end local uv0,uv1 = get_icon_tex_coords(icon) - pigui.PushID(tooltip .. (extraID or "")) + pigui.PushID(tooltipID) local res = pigui.ButtonImageSized(ui.icons_texture, thesize, img_size or Vector2(0,0), uv0, uv1, frame_padding, ui.theme.colors.lightBlueBackground, fg_color) pigui.PopID() pigui.PopStyleColor(3) + local pos = tooltipID:find("##") -- get position for id tag start + local pos = pos and pos - 1 -- if found, move back beyond first "#" + local tooltip = pos and string.sub(tooltipID, 1, pos) or tooltipID if pigui.IsItemHovered() then pigui.SetTooltip(tooltip) end From c930a04780bb2835d69d194639c6c86b0fd27bd8 Mon Sep 17 00:00:00 2001 From: Karl F Date: Sat, 15 Feb 2020 18:16:09 +0100 Subject: [PATCH 14/27] FligtLog: Add a 'text entry'-field, to both system and station logs Defaults to empty. Will allow player to enter info on system/station e.g. "Smelly station, but nice ring system". --- data/libs/FlightLog.lua | 68 +++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua index 1850caf46fb..9629d1d31bf 100644 --- a/data/libs/FlightLog.lua +++ b/data/libs/FlightLog.lua @@ -53,7 +53,7 @@ FlightLog = { -- Print the names and departure times of the last five systems visited by -- the player -- --- > for systemp,arrtime,deptime in FlightLog.GetSystemPaths(5) do +-- > for systemp,arrtime,deptime,entry in FlightLog.GetSystemPaths(5) do -- > print(systemp:GetStarSystem().name, Format.Date(deptime)) -- > end @@ -66,13 +66,39 @@ FlightLog = { if FlightLogSystem[counter] then return FlightLogSystem[counter][1], FlightLogSystem[counter][2], - FlightLogSystem[counter][3] + FlightLogSystem[counter][3], + FlightLogSystem[counter][4] end end - return nil, nil, nil + return nil, nil, nil, nil end end, + +-- +-- Method: UpdateSystemEntry +-- +-- Update the free text field in system log. +-- +-- > UpdateSystemEntry(index, entry) +-- +-- Parameters: +-- +-- index - Index in log, 1 being most recent (current) system +-- entry - New text string to insert instead +-- +-- Example: +-- +-- Replace the second most recent system record, i.e. the previously +-- visited system. +-- +-- > UpdateSystemEntry(2, "At Orion's shoulder, I see attackships on fire") +-- + + UpdateSystemEntry = function (index, entry) + FlightLogSystem[index][4] = entry + end, + -- -- Method: GetStationPaths -- @@ -98,7 +124,7 @@ FlightLog = { -- Print the names and departure times of the last five stations visited by -- the player -- --- > for systemp, deptime, money in FlightLog.GetStationPaths(5) do +-- > for systemp, deptime, money, entry in FlightLog.GetStationPaths(5) do -- > print(systemp:GetSystemBody().name, Format.Date(deptime)) -- > end @@ -111,13 +137,37 @@ FlightLog = { if FlightLogStation[counter] then return FlightLogStation[counter][1], FlightLogStation[counter][2], - FlightLogStation[counter][3] + FlightLogStation[counter][3], + FlightLogStation[counter][4] end end - return nil, nil, nil + return nil, nil, nil, nil end end, +-- +-- Method: UpdateStationEntry +-- +-- Update the free text field in station log. +-- +-- > UpdateStationEntry(index, entry) +-- +-- Parameters: +-- +-- index - Index in log, 1 being most recent station undocked from +-- entry - New text string to insert instead +-- +-- Example: +-- +-- Replace note for the second most recent station undocked from +-- +-- > UpdateStationEntry(2, "This was a smelly station") +-- + + UpdateStationEntry = function (index, entry) + FlightLogStation[index][4] = entry + end, + -- -- Method: GetPreviousSystemPath -- @@ -192,7 +242,7 @@ end -- onEnterSystem local AddSystemArrivalToLog = function (ship) if not ship:IsPlayer() then return end - table.insert(FlightLogSystem,1,{Game.system.path,Game.time,nil}) + table.insert(FlightLogSystem,1,{Game.system.path,Game.time,nil,""}) while #FlightLogSystem > FlightLogSystemQueueLength do table.remove(FlightLogSystem,FlightLogSystemQueueLength + 1) end @@ -201,7 +251,7 @@ end -- onShipUndocked local AddStationToLog = function (ship, station) if not ship:IsPlayer() then return end - table.insert(FlightLogStation,1,{station.path, Game.time, Game.player:GetMoney()}) + table.insert(FlightLogStation,1,{station.path, Game.time, Game.player:GetMoney(), ""}) while #FlightLogStation > FlightLogStationQueueLength do table.remove(FlightLogStation,FlightLogStationQueueLength + 1) end @@ -216,7 +266,7 @@ local onGameStart = function () FlightLogSystem = loaded_data.System FlightLogStation = loaded_data.Station else - table.insert(FlightLogSystem,1,{Game.system.path,nil,nil}) + table.insert(FlightLogSystem,1,{Game.system.path,nil,nil,""}) end loaded_data = nil end From b628843f2df93fef3c7f3704eb7af73282c2ad37 Mon Sep 17 00:00:00 2001 From: Karl F Date: Sat, 15 Feb 2020 18:12:36 +0100 Subject: [PATCH 15/27] Add a third flightlog: custom We have a flightlog for automatically logging station-departures, and one for system arrival/departure. Have now added a custom one, that captures player stats, and a custom field for text entries. --- data/libs/FlightLog.lua | 144 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua index 9629d1d31bf..c3912ae124a 100644 --- a/data/libs/FlightLog.lua +++ b/data/libs/FlightLog.lua @@ -20,6 +20,7 @@ local FlightLogStationQueueLength = 1000 -- private data - the log itself local FlightLogSystem = {} local FlightLogStation = {} +local FlightLogCustom = {} local FlightLog FlightLog = { @@ -226,6 +227,146 @@ FlightLog = { else return nil end end, + + +-- +-- Method: GetCustomEntry +-- +-- Returns an iterator returning custom entries for each system the +-- player has created a custom log entry for, backwards in turn, +-- starting with the most recent. If count is specified, returns no +-- more than that many entries. +-- +-- > iterator = FlightLog.GetCustomEntry(count) +-- +-- Parameters: +-- +-- count - Optional. The maximum number of entries to return. +-- +-- Return: +-- +-- iterator - A function which will generate the entries from the +-- log, returning one each time it is called until it +-- runs out, after which it returns nil. Each entry +-- consists of the system's path, date, money, location, +-- text; 'location' being an text array with flight state +-- and appropriate additional information. + +-- +-- Example: +-- +-- > for systemp, date, money, location, entry in FlightLog.GetCustomEntry(5) do +-- > print(location[1], location[2], Format.Date(deptime)) +-- > end +-- + + GetCustomEntry = function (maximum) + local counter = 0 + maximum = maximum or #FlightLogCustom + return function () + if counter < maximum then + counter = counter + 1 + if FlightLogCustom[counter] then + return FlightLogCustom[counter][1], --path + FlightLogCustom[counter][2], --time + FlightLogCustom[counter][3], --money + FlightLogCustom[counter][4], --location + FlightLogCustom[counter][5] --manual entry + end + end + return nil, nil, nil, nil, nil + end + end, + +-- +-- Method: UpdateCustomEntry +-- +-- Update the free text field with new entry. Allows the player to +-- change the original text entry. +-- +-- > FlightLog.GetCustomEntry(index, entry) +-- +-- Parameters: +-- +-- index - Position in log, 1 being most recent +-- entry - String of new text to replace the original with +-- +-- Example: +-- +-- > FlightLog.UpdateCustomEntry(2, "Earth is an overrated spot") +-- + + UpdateCustomEntry = function (index, entry) + FlightLogCustom[index][5] = entry + end, + +-- +-- Method: DeleteCustomEntry +-- +-- Remove an entry. +-- +-- > FlightLog.DeleteCustomEntry(index) +-- +-- Parameters: +-- +-- index - Position in log to remove, 1 being most recent +-- + + DeleteCustomEntry = function (index) + table.remove(FlightLogCustom, index) + end, + +-- +-- Method: MakeCustomEntry +-- +-- Create a custom entry. A set of information is automatically +-- compiled, in a header. +-- +-- > FlightLog.MakeCustomEntry(text) +-- +-- Header: +-- +-- path - System path, pointing to player's current sytem +-- time - Game date +-- money - Financial balance at time of record creation +-- location - Array, with two strings: flight state, and relevant additional string +-- manual entry - Free text string +-- +-- Parameters: +-- +-- text - Text to accompany the log +-- + + MakeCustomEntry = function (text) + text = text or "" + + local location = "" + local state = Game.player:GetFlightState() + + if state == "DOCKED" then + local station = Game.player:GetDockedWith() + local parent_body = station.path:GetSystemBody().parent.name + location = {station.type, station.label, parent_body} + elseif state == "DOCKING" or state == "UNDOCKING" then + location = {state, Game.player:FindNearestTo("SPACESTATION").label} + elseif state == "FLYING" then + location = {state, Game.player.frameBody.label} + elseif state == "LANDED" then + local alt, vspd, lat, long = Game.player:GetGPS() + if not (lat and long) then + lat, long = "nil", "nil" + end + location = {state, Game.player:FindNearestTo("PLANET").label, lat, long} + elseif state == "JUMPING" or state == "HYPERSPACE" then + -- bug: if in hyperspace, there's no Game.system (!) + -- local spath, sysname = Game.player:GetHyperspaceDestination() + sysname = "" + location = {state, sysname} + end + + table.insert(FlightLogCustom,1, + {Game.system.path, Game.time, Game.player:GetMoney(), location, text}) + end, } -- LOGGING @@ -265,6 +406,7 @@ local onGameStart = function () if loaded_data then FlightLogSystem = loaded_data.System FlightLogStation = loaded_data.Station + FlightLogCustom = loaded_data.Custom else table.insert(FlightLogSystem,1,{Game.system.path,nil,nil,""}) end @@ -278,7 +420,7 @@ local onGameEnd = function () end local serialize = function () - return { System = FlightLogSystem, Station = FlightLogStation } + return { System = FlightLogSystem, Station = FlightLogStation, Custom = FlightLogCustom } end local unserialize = function (data) From ea95e583cf141f7efac300901f71cc25162d3cf4 Mon Sep 17 00:00:00 2001 From: Karl F Date: Tue, 18 Feb 2020 10:54:46 +0100 Subject: [PATCH 16/27] Add version attribute to FlightLog Lets us keep backwards compatibility as we add more features to this library --- data/libs/FlightLog.lua | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua index c3912ae124a..09c6358483a 100644 --- a/data/libs/FlightLog.lua +++ b/data/libs/FlightLog.lua @@ -22,6 +22,9 @@ local FlightLogSystem = {} local FlightLogStation = {} local FlightLogCustom = {} +-- Version for backwards compability +local version = 1 + local FlightLog FlightLog = { @@ -339,7 +342,6 @@ FlightLog = { MakeCustomEntry = function (text) text = text or "" - local location = "" local state = Game.player:GetFlightState() @@ -367,6 +369,25 @@ FlightLog = { table.insert(FlightLogCustom,1, {Game.system.path, Game.time, Game.player:GetMoney(), location, text}) end, + +-- +-- Group: Attributes +-- + +-- +-- Attribute: version +-- +-- Marks version of flight log, can be used for non-breaking backwards +-- compatibility, if new features are added to FlightLog +-- +-- Example: +-- +-- > if FlightLog.version > 2 then +-- > FlightLog.useNewFeature() +-- > end +-- + + version = version, } -- LOGGING @@ -403,10 +424,11 @@ end local loaded_data local onGameStart = function () - if loaded_data then + if loaded_data and loaded_data.Version then FlightLogSystem = loaded_data.System FlightLogStation = loaded_data.Station FlightLogCustom = loaded_data.Custom + version = loaded_data.Version else table.insert(FlightLogSystem,1,{Game.system.path,nil,nil,""}) end @@ -417,10 +439,15 @@ local onGameEnd = function () FlightLogSystem = {} FlightLogStation = {} FlightLogCustom = {} + version = nil end local serialize = function () - return { System = FlightLogSystem, Station = FlightLogStation, Custom = FlightLogCustom } + return { System = FlightLogSystem, + Station = FlightLogStation, + Custom = FlightLogCustom, + Version = version + } end local unserialize = function (data) From db9008aab4f77ed25b30b9c6f2ccf6131a21b797 Mon Sep 17 00:00:00 2001 From: Karl F Date: Sat, 15 Feb 2020 11:00:46 +0100 Subject: [PATCH 17/27] Flight Log added to Info View Will show the automatically logged events (station, and system visits), as well as allow custom text entries to these, and custom logs to be made at arbitrary points. --- data/lang/ui-core/en.json | 84 +++++++ data/pigui/modules/info-view/06-flightlog.lua | 229 ++++++++++++++++++ 2 files changed, 313 insertions(+) create mode 100644 data/pigui/modules/info-view/06-flightlog.lua diff --git a/data/lang/ui-core/en.json b/data/lang/ui-core/en.json index 05c938b9d04..da51e95745e 100644 --- a/data/lang/ui-core/en.json +++ b/data/lang/ui-core/en.json @@ -35,6 +35,10 @@ "description": "", "message": "An error has occurred" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Deadly" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Economy & Trade" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effects:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Location" }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1495,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1695,6 +1775,10 @@ "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/pigui/modules/info-view/06-flightlog.lua b/data/pigui/modules/info-view/06-flightlog.lua new file mode 100644 index 00000000000..fdc43951cda --- /dev/null +++ b/data/pigui/modules/info-view/06-flightlog.lua @@ -0,0 +1,229 @@ +-- Copyright © 2008-2020 Pioneer Developers. See AUTHORS.txt for details +-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt + +local ui = require 'pigui' +local InfoView = require 'pigui/views/info-view' +local Lang = require 'Lang' +local FlightLog = require 'FlightLog' +local Format = require 'Format' + +local pionillium = ui.fonts.pionillium +local colors = ui.theme.colors +local icons = ui.theme.icons + +local gray = Color(145, 145, 145) + +local l = Lang.GetResource("ui-core") + +local iconSize = Vector2(28, 28) * (ui.screenHeight / 1200) +local buttonSpaceSize = iconSize + +-- Sometimes date is empty, e.g. departure date prior to departure +local function formatDate(date) + return date and Format.Date(date) or nil +end + + +local function formatCoordinates(sysp) + return sysp.sectorX ..", " + .. sysp.sectorY ..", " + .. sysp.sectorZ +end + +-- Format system to be of form: "Sol (0,0,0)" +local function formatsystem(sysp) + return sysp:GetStarSystem().name .. " (" .. formatCoordinates(sysp) .. ")" +end + +-- Title text is gray, followed by the variable text: +local function headerText(title, text, wrap) + if not text then return end + ui.textColored(gray, string.gsub(title, ":", "") .. ":") + ui.sameLine() + if wrap then + -- TODO: limit width of text box! + ui.textWrapped(text) + else + ui.text(text) + end +end + + +local entering_text_custom = false +local entering_text_system = false +local entering_text_station = false + +-- Display Entry text, and Edit button, to update flightlog +local function inputText(entry, counter, entering_text, log, str, clicked) + if #entry > 0 then + headerText(l.ENTRY, entry, true) + end + + if clicked or entering_text == counter then + local updated_entry, return_pressed = ui.inputText("##" ..str..counter, entry, {"EnterReturnsTrue"}) + entering_text = counter + if return_pressed then + log(counter, updated_entry) + entering_text = -1 + end + end + ui.text("") + return entering_text +end + +-- Based on flight state, compose a reasonable string for location +local function composeLocationString(location) + return string.interp(l["FLIGHTLOG_"..location[1]], + { primary_info = location[2], + secondary_info = location[3] or "", + tertiary_info = location[4] or "",}) +end + +local function renderCustomLog() + local counter = 0 + local was_clicked = false + for systemp, time, money, location, entry in FlightLog.GetCustomEntry() do + counter = counter + 1 + -- reserve a narrow right colum for small edit/remove icon, + ui.columns(2, "custom" .. counter, false) + ui.setColumnWidth(0, ui.getWindowSize().x - 2*iconSize.x) + + headerText(l.DATE, formatDate(time)) + headerText(l.LOCATION, composeLocationString(location)) + headerText(l.IN_SYSTEM, formatsystem(systemp)) + headerText(l.ALLEGIANCE, systemp:GetStarSystem().faction.name) + headerText(l.CASH, Format.Money(money)) + + ::input:: + entering_text_custom = inputText(entry, counter, + entering_text_custom, FlightLog.UpdateCustomEntry, "custom", was_clicked) + ui.nextColumn() + + was_clicked = false + if ui.coloredSelectedIconButton(icons.pencil, buttonSpaceSize, false, + 0, colors.buttonBlue, colors.white, l.EDIT .. "##custom"..counter, iconSize) then + was_clicked = true + -- If edit field was clicked, we want to edit _this_ iteration's field, + -- not next record's. Quick, behind you, velociraptor! + goto input + end + + if ui.coloredSelectedIconButton(icons.trashcan, buttonSpaceSize, false, + 0, colors.buttonBlue, colors.white, l.REMOVE .. "##custom" .. counter, iconSize) then + FlightLog.DeleteCustomEntry(counter) + -- if we were already in edit mode, reset it, or else it carries over to next iteration + entering_text_custom = false + end + ui.columns(1) + ui.separator() + end +end + +-- See comments on previous function +local function renderStationLog() + local counter = 0 + local was_clicked = false + for systemp, deptime, money, entry in FlightLog.GetStationPaths() do + counter = counter + 1 + ui.columns(2, "station" .. counter, false) + ui.setColumnWidth(0, ui.getWindowSize().x - 2*iconSize.x) + + local station_type = "FLIGHTLOG_" .. systemp:GetSystemBody().type + headerText(l.DATE, formatDate(deptime)) + headerText(l.STATION, string.interp(l[station_type], + { primary_info = systemp:GetSystemBody().name, secondary_info = systemp:GetSystemBody().parent.name })) + -- headerText(l.LOCATION, systemp:GetSystemBody().parent.name) + headerText(l.IN_SYSTEM, formatsystem(systemp)) + headerText(l.ALLEGIANCE, systemp:GetStarSystem().faction.name) + headerText(l.CASH, Format.Money(money)) + + ::input:: + entering_text_station = inputText(entry, counter, + entering_text_station, FlightLog.UpdateStationEntry, "station", was_clicked) + ui.nextColumn() + + was_clicked = false + if ui.coloredSelectedIconButton(icons.pencil, buttonSpaceSize, false, + 0, colors.buttonBlue, colors.white, l.EDIT .. "##station"..counter, iconSize) then + was_clicked = true + goto input + end + ui.columns(1) + ui.separator() + end +end + +-- See comments on previous function +local function renderSystemLog() + local counter = 0 + local was_clicked = false + for systemp, arrtime, deptime, entry in FlightLog.GetSystemPaths() do + counter = counter + 1 + ui.columns(2, "system" .. counter, false) + ui.setColumnWidth(0, ui.getWindowSize().x - 2*iconSize.x) + + headerText(l.ARRIVAL_DATE, formatDate(arrtime)) + headerText(l.DEPARTURE_DATE, formatDate(deptime)) + headerText(l.IN_SYSTEM, formatsystem(systemp)) + headerText(l.ALLEGIANCE, systemp:GetStarSystem().faction.name) + + ::input:: + entering_text_system = inputText(entry, counter, + entering_text_system, FlightLog.UpdateSystemEntry, "sys", was_clicked) + ui.nextColumn() + + was_clicked = false + if ui.coloredSelectedIconButton(icons.pencil, buttonSpaceSize, false, + 0, colors.buttonBlue, colors.white, l.EDIT .. "##system"..counter, iconSize) then + was_clicked = true + goto input + end + ui.columns(1) + ui.separator() + end +end + +local function getFlightHistory() + if ui.beginTabBar("mytabbar") then + if ui.beginTabItem(l.LOG_CUSTOM) then + -- input field for custom log: + headerText(l.LOG_NEW, "") + ui.sameLine() + text, changed = ui.inputText("##inputfield", "", {"EnterReturnsTrue"}) + if changed then + FlightLog.MakeCustomEntry(text) + end + ui.separator() + + renderCustomLog() + ui.endTabItem() + end + + if ui.beginTabItem(l.LOG_STATION) then + renderStationLog() + ui.endTabItem() + end + + if ui.beginTabItem(l.LOG_SYSTEM) then + renderSystemLog() + ui.endTabItem() + end + + ui.endTabBar() + end +end + +local function drawLog () + ui.withFont(pionillium.medlarge.name, pionillium.medlarge.size, function() + getFlightHistory() + end) +end + +InfoView:registerView({ + id = "captainsLog", + name = l.FLIGHT_LOG, + icon = ui.theme.icons.bookmark, + showView = true, + draw = drawLog, + refresh = function() end, +}) From 3951605b2ee21735d78a569da588a8c7d96cc2be Mon Sep 17 00:00:00 2001 From: Karl F Date: Mon, 17 Feb 2020 21:46:17 +0100 Subject: [PATCH 18/27] Add custom start log message, giving backstory to game start --- data/lang/ui-core/en.json | 12 ++++++++++++ data/pigui/views/mainmenu.lua | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/data/lang/ui-core/en.json b/data/lang/ui-core/en.json index da51e95745e..bcee4f67f58 100644 --- a/data/lang/ui-core/en.json +++ b/data/lang/ui-core/en.json @@ -1771,6 +1771,18 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" diff --git a/data/pigui/views/mainmenu.lua b/data/pigui/views/mainmenu.lua index bc8d539b917..131e9200057 100644 --- a/data/pigui/views/mainmenu.lua +++ b/data/pigui/views/mainmenu.lua @@ -10,6 +10,7 @@ local Equipment = require 'Equipment' local Format = require 'Format' local Event = require 'Event' local Lang = require 'Lang' +local FlightLog = require ("FlightLog") local lc = Lang.GetResource("core") local lui = Lang.GetResource("ui-core") @@ -42,6 +43,7 @@ local startLocations = { {['name']=lui.START_AT_MARS, ['desc']=lui.START_AT_MARS_DESC, ['location']=SystemPath.New(0,0,0,0,18), + ['logmsg']=lui.START_LOG_ENTRY_1, ['shipType']='sinonatrix',['money']=100,['hyperdrive']=true, ['equipment']={ {laser.pulsecannon_1mw,1}, @@ -52,6 +54,7 @@ local startLocations = { {['name']=lui.START_AT_NEW_HOPE, ['desc']=lui.START_AT_NEW_HOPE_DESC, ['location']=SystemPath.New(1,-1,-1,0,4), + ['logmsg']=lui.START_LOG_ENTRY_2, ['shipType']='pumpkinseed',['money']=100,['hyperdrive']=true, ['equipment']={ {laser.pulsecannon_1mw,1}, @@ -62,6 +65,7 @@ local startLocations = { {['name']=lui.START_AT_BARNARDS_STAR, ['desc']=lui.START_AT_BARNARDS_STAR_DESC, ['location']=SystemPath.New(-1,0,0,0,16), + ['logmsg']=lui.START_LOG_ENTRY_3, ['shipType']='xylophis',['money']=100,['hyperdrive']=false, ['equipment']={ {misc.atmospheric_shielding,1}, @@ -158,6 +162,7 @@ local function startAtLocation(location) for _,equip in pairs(location.equipment) do Game.player:AddEquip(equip[1],equip[2]) end + FlightLog.MakeCustomEntry(location.logmsg) end local function callModules(mode) From 33df7fd0f574a0a077eeb604b8a05bc34817f861 Mon Sep 17 00:00:00 2001 From: Karl F Date: Fri, 3 Jul 2020 11:25:50 +0200 Subject: [PATCH 19/27] Log station dates when player arrives, instead of departure This feels more intuitive, to log arrival event, rather than undocking event. Typically, arrival data is important for checking if one made a mission dead line. --- data/libs/FlightLog.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua index 09c6358483a..4e10f14ecbe 100644 --- a/data/libs/FlightLog.lua +++ b/data/libs/FlightLog.lua @@ -121,11 +121,11 @@ FlightLog = { -- iterator - A function which will generate the paths from the log, returning -- one each time it is called until it runs out, after which it -- returns nil. It also returns, as two additional value, the game --- time at which the player undocked, and palyer's financial balance. +-- time at which the player docked, and palyer's financial balance. -- -- Example: -- --- Print the names and departure times of the last five stations visited by +-- Print the names and arrival times of the last five stations visited by -- the player -- -- > for systemp, deptime, money, entry in FlightLog.GetStationPaths(5) do @@ -158,12 +158,12 @@ FlightLog = { -- -- Parameters: -- --- index - Index in log, 1 being most recent station undocked from +-- index - Index in log, 1 being most recent station docked with -- entry - New text string to insert instead -- -- Example: -- --- Replace note for the second most recent station undocked from +-- Replace note for the second most recent station docked with -- -- > UpdateStationEntry(2, "This was a smelly station") -- @@ -410,7 +410,7 @@ local AddSystemArrivalToLog = function (ship) end end --- onShipUndocked +-- onShipDocked local AddStationToLog = function (ship, station) if not ship:IsPlayer() then return end table.insert(FlightLogStation,1,{station.path, Game.time, Game.player:GetMoney(), ""}) @@ -456,7 +456,7 @@ end Event.Register("onEnterSystem", AddSystemArrivalToLog) Event.Register("onLeaveSystem", AddSystemDepartureToLog) -Event.Register("onShipUndocked", AddStationToLog) +Event.Register("onShipDocked", AddStationToLog) Event.Register("onGameStart", onGameStart) Event.Register("onGameEnd", onGameEnd) Serializer:Register("FlightLog", serialize, unserialize) From f67de42d4572509264b51dd583e73fed8ef1a90b Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Tue, 14 Jul 2020 03:01:42 +0200 Subject: [PATCH 20/27] auto-commit: translation updates --- data/lang/ui-core/ar.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/bg.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/ca.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/cs.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/da.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/de.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/el.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/en.json | 52 +++++++++--------- data/lang/ui-core/eo.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/es.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/fr.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/ga.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/gd.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/hr.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/hu.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/id.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/it.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/lt.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/nb.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/nl.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/pl.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/pt.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/pt_BR.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/ro.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/ru.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/sv.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/tr.json | 100 +++++++++++++++++++++++++++++++++++ data/lang/ui-core/zh.json | 100 +++++++++++++++++++++++++++++++++++ 28 files changed, 2726 insertions(+), 26 deletions(-) diff --git a/data/lang/ui-core/ar.json b/data/lang/ui-core/ar.json index cb6abc41645..d258ad1ec8a 100644 --- a/data/lang/ui-core/ar.json +++ b/data/lang/ui-core/ar.json @@ -35,6 +35,10 @@ "description": "", "message": "هناك خطأ قد حدث" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "التدريع الجوي" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "خطير" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "مميت" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "دلتا-في (أقصي)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "سرعة الوصول إلي الأرض:" @@ -359,6 +371,10 @@ "description": "", "message": "الإقتصاد و التجارة" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "تأثيرات:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "الهندسة:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "المعدات" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "الهدف النهائي:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "حالة الطيران" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "الموقع" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "منخفض" @@ -1311,6 +1387,10 @@ "description": "", "message": "لا مهمات." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} سنة ضوئية ({maxRange} اقصى)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/bg.json b/data/lang/ui-core/bg.json index 2101bc38bf0..5510db14a48 100644 --- a/data/lang/ui-core/bg.json +++ b/data/lang/ui-core/bg.json @@ -35,6 +35,10 @@ "description": "", "message": "Възникна грешка" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Атмосферен щит" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Опасен" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Смъртоносен" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Делта-v (максимален)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Икономика и Търговия" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Ефекти:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Инженерство:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Оборудване" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Крайна Цел:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Местоположение" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "Няма мисии." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} светлинни години ({maxRange} макс)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Надежден" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/ca.json b/data/lang/ui-core/ca.json index 2e6be72cb95..6d43ca8b3a7 100644 --- a/data/lang/ui-core/ca.json +++ b/data/lang/ui-core/ca.json @@ -35,6 +35,10 @@ "description": "", "message": "Ha hagut un error" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Perillós" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Mortal" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Velocitat de descens a terra." @@ -359,6 +371,10 @@ "description": "", "message": "Economia i Comerç" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efectes:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Objecte fora d'estoc" @@ -1091,6 +1151,22 @@ "description": "", "message": "Localització" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Baix" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} anys llum ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Retirar" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/cs.json b/data/lang/ui-core/cs.json index ab04bcc58ea..60a7de9ea0e 100644 --- a/data/lang/ui-core/cs.json +++ b/data/lang/ui-core/cs.json @@ -35,6 +35,10 @@ "description": "", "message": "Vyskytla se chyba" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmosférický štít" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Nebezpečný" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Smrtící" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Přistávací rychlost:" @@ -359,6 +371,10 @@ "description": "", "message": "Ekonomika & obchod" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efekty:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Údržba:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Vybavení" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "Skladem" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Tato položka není skladem." @@ -1091,6 +1151,22 @@ "description": "", "message": "Pozice" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Nízké" @@ -1311,6 +1387,10 @@ "description": "", "message": "Žádné mise." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} ly ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Spolehlivý" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "[-]" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/da.json b/data/lang/ui-core/da.json index 89cdf9e418f..a6830e4eaeb 100644 --- a/data/lang/ui-core/da.json +++ b/data/lang/ui-core/da.json @@ -35,6 +35,10 @@ "description": "", "message": "Der er opstået en fejl" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Farlig" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Dødelig" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Nedstigning-til-overflade hastighed:" @@ -359,6 +371,10 @@ "description": "", "message": "Økonomi & Handel" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effekter:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Vedligeholdelse:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Udstyr" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "På lager" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Der er ikke flere af denne ting på lager." @@ -1091,6 +1151,22 @@ "description": "", "message": "Placering" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Lav" @@ -1311,6 +1387,10 @@ "description": "", "message": "Ingen missioner." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} lysår ({maxRange} maks)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Pålidelig" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/de.json b/data/lang/ui-core/de.json index ed0c5fca232..ea82a91329a 100644 --- a/data/lang/ui-core/de.json +++ b/data/lang/ui-core/de.json @@ -35,6 +35,10 @@ "description": "", "message": "Es ist ein Fehler aufgetreten" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmosphärische Abschirmung" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Gefährlich" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Tödlich" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max.)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Landegeschwindigkeit:" @@ -359,6 +371,10 @@ "description": "", "message": "Wirtschaft und Handel" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effekte:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Technik:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Ausrüstung" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Endgültiges Ziel:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flugstatus" @@ -999,6 +1055,10 @@ "description": "", "message": "Auf Lager" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Dieser Artikel ist ausverkauft." @@ -1091,6 +1151,22 @@ "description": "", "message": "Ort" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Niedrig" @@ -1311,6 +1387,10 @@ "description": "", "message": "Keine Missionen." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} Lichtjahre ({maxRange} max.)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Zuverlässig" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Entf." + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Sprung löschen" @@ -1687,10 +1771,26 @@ "description": "", "message": "Das ist ein ausgewogener Start von Itzalean auf New Hope im System Epsilon Eridani." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Ziel des Sternenfeldes" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Unsere Gesamtkapazität ist {total_docking_pads} Andockstützen." diff --git a/data/lang/ui-core/el.json b/data/lang/ui-core/el.json index a7d58273af6..dda50085806 100644 --- a/data/lang/ui-core/el.json +++ b/data/lang/ui-core/el.json @@ -35,6 +35,10 @@ "description": "", "message": "An error has occurred" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Deadly" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Economy & Trade" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effects:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Location" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} light years ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/en.json b/data/lang/ui-core/en.json index bcee4f67f58..ff8e1f53157 100644 --- a/data/lang/ui-core/en.json +++ b/data/lang/ui-core/en.json @@ -515,41 +515,41 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, - "FLIGHT_LOG": { - "description": "Title for flight log screen, in info view", - "message": "Flight Log" - }, - "FLIGHTLOG_STARPORT_ORBITAL": { - "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, in orbit around {secondary_info}" - }, - "FLIGHTLOG_STARPORT_SURFACE": { - "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, on {secondary_info}" - }, "FLIGHTLOG_DOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", "message": "Docking at {primary_info}" }, - "FLIGHTLOG_UNDOCKING": { - "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Undocking at {primary_info}" - }, "FLIGHTLOG_FLYING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", "message": "Flying in space, relative {primary_info}" }, - "FLIGHTLOG_LANDED": { - "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", - "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" }, "FLIGHTLOG_JUMPING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", "message": "Hyper jumping towards {primary_info}" }, - "FLIGHTLOG_HYPERSPACE": { - "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "In Hyperspace, enroute to {primary_info}" + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" }, "FLIGHT_STATE": { "description": "", @@ -1151,14 +1151,14 @@ "description": "", "message": "Location" }, - "LOG_NEW": { - "description": "Indicate to make an entry into flight log system", - "message": "New Entry" - }, "LOG_CUSTOM": { "description": "Label tab for showing custom logged events", "message": "Custom Log" }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, "LOG_STATION": { "description": "Label tab for showing logged station events", "message": "Station Log" diff --git a/data/lang/ui-core/eo.json b/data/lang/ui-core/eo.json index cf73c6c2446..ff8e1f53157 100644 --- a/data/lang/ui-core/eo.json +++ b/data/lang/ui-core/eo.json @@ -35,6 +35,10 @@ "description": "", "message": "An error has occurred" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Deadly" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Economy & Trade" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effects:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Location" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} light years ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/es.json b/data/lang/ui-core/es.json index cd57d8409c9..9b066dbeac2 100644 --- a/data/lang/ui-core/es.json +++ b/data/lang/ui-core/es.json @@ -35,6 +35,10 @@ "description": "", "message": "Ha ocurrido un error" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Escudo atmosférico" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Peligroso" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Mortal" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-V (máx)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Velocidad de descenso a tierra:" @@ -359,6 +371,10 @@ "description": "", "message": "Economía y Comercio" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efectos:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Ingeniería:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipo" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Objetivo Final:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Estado de Vuelo" @@ -999,6 +1055,10 @@ "description": "", "message": "En Almacén" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Este artículo está agotado." @@ -1091,6 +1151,22 @@ "description": "", "message": "Localización" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Bajo" @@ -1311,6 +1387,10 @@ "description": "", "message": "No hay misiones disponibles." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} años-luz ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Fiable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "-" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Borrar Salto" @@ -1687,10 +1771,26 @@ "description": "", "message": "Comienzo de juego moderado en Itzalean/New Hope. en el sistema Epsilon Eridani." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Densidad del fondo estelar" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Nuestra capacidad total es de {total_docking_pads} plataformas de atraque." diff --git a/data/lang/ui-core/fr.json b/data/lang/ui-core/fr.json index 2f82b99647f..05a24135fde 100644 --- a/data/lang/ui-core/fr.json +++ b/data/lang/ui-core/fr.json @@ -35,6 +35,10 @@ "description": "", "message": "Une erreur est survenue" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Boucliers Thermiques" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangereux" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Mortel" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Vitesse de descente" @@ -359,6 +371,10 @@ "description": "", "message": "Economies & Commerce" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effets:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Ingénierie:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipement" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Destination finale:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "État de vol" @@ -999,6 +1055,10 @@ "description": "", "message": "En stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Nous n'avons pas cet objet en stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Localisation" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Bas" @@ -1311,6 +1387,10 @@ "description": "", "message": "Pas de missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "Pas de route valide vers le système sélectionné." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} années lum. ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Enlever" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Effacer ce saut" @@ -1687,10 +1771,26 @@ "description": "", "message": "Départ modérement facile depuis Itzalean sur New Hope dans le système Epsilon Eridani." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Densité du champ d'étoile." }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Notre capacité totale est de {total_docking_pads} stations d'arrimages." diff --git a/data/lang/ui-core/ga.json b/data/lang/ui-core/ga.json index 5de14ea81f3..dfd993f7758 100644 --- a/data/lang/ui-core/ga.json +++ b/data/lang/ui-core/ga.json @@ -35,6 +35,10 @@ "description": "", "message": "Tharla earráid" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Sciathadh atmaisféarach" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Contúirteach" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Marfach" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Deilt-v (uas)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Luas tuirlingt-go-talamh:" @@ -359,6 +371,10 @@ "description": "", "message": "Geilleagar ⁊ Trádáil" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Éifeachtaí:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Innealtóireacht:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Trealamh" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "An Sprioc Dheiridh:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Stádas na hEitilte" @@ -999,6 +1055,10 @@ "description": "", "message": "Sa stoc" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Tá sé as stoc." @@ -1091,6 +1151,22 @@ "description": "", "message": "Suíomh" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Íseal" @@ -1311,6 +1387,10 @@ "description": "", "message": "Misean ar bith." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} solasbhliain ({maxRange} uasmhéid)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Iontaofa" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Bain Léim" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Dlús an Réaltréimse" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/gd.json b/data/lang/ui-core/gd.json index 343f1654057..1590eac67c6 100644 --- a/data/lang/ui-core/gd.json +++ b/data/lang/ui-core/gd.json @@ -35,6 +35,10 @@ "description": "", "message": "Thachair mearachd" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Dìonadh àile" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Cunnartach" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Marbhtach" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (as motha)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Luaths teàrnadh dhan làr:" @@ -359,6 +371,10 @@ "description": "", "message": "Eaconamaidh ⁊ malart" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Èifeachdan:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Innleadaireachd:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Uidheamachd" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "An ceann-uidhe:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Staid an iteil" @@ -999,6 +1055,10 @@ "description": "", "message": "San stoc" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Chan eil an nì seo san stoc tuilleadh." @@ -1091,6 +1151,22 @@ "description": "", "message": "Ionad" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Ìseal" @@ -1311,6 +1387,10 @@ "description": "", "message": "Chan eil misean agad." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} bl-sholais ({maxRange} as motha)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Earbsach" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Thoir air falbh" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Thoir air falbh an leum" @@ -1687,10 +1771,26 @@ "description": "", "message": "Seo toiseach le duilgheas meadhanach o Itzalean air Dòchas Ùr ann an siostam Epsilon." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Dùmhlachd an reul-raoin" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/hr.json b/data/lang/ui-core/hr.json index a87227a1c7f..24ea9912b39 100644 --- a/data/lang/ui-core/hr.json +++ b/data/lang/ui-core/hr.json @@ -35,6 +35,10 @@ "description": "", "message": "An error has occurred" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Deadly" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Economy & Trade" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effects:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Ovaj proizvod je rasprodan." @@ -1091,6 +1151,22 @@ "description": "", "message": "Location" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} light years ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Ukloni" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/hu.json b/data/lang/ui-core/hu.json index cbf8c403261..049e2922376 100644 --- a/data/lang/ui-core/hu.json +++ b/data/lang/ui-core/hu.json @@ -35,6 +35,10 @@ "description": "", "message": "Hiba történt" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmoszférapajzs" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Veszélyes" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Halálos" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Sebesség ereszkedéshez:" @@ -359,6 +371,10 @@ "description": "", "message": "Leltár" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effektek:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Gépészet:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Felszerelés" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Végső cél:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Repülési állapot" @@ -999,6 +1055,10 @@ "description": "", "message": "Készlet" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Ez az áru most nincs raktáron." @@ -1091,6 +1151,22 @@ "description": "", "message": "Helyzet" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Alacsony" @@ -1311,6 +1387,10 @@ "description": "", "message": "Nincs küldetés." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "Nem található útvonal a kiválasztott rendszerbe." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} fényév ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Megbízható" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Le" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Ugrás eltávolítása" @@ -1687,10 +1771,26 @@ "description": "", "message": "Közepes nehézségű kezdés, Iztalean-on, New Hope-on az Epsilon Eridani rendszerben." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Csillagos ég sűrűsége" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Kapacitásunk {total_docking_pads} dokk." diff --git a/data/lang/ui-core/id.json b/data/lang/ui-core/id.json index d9f42619e7f..70f40eb109f 100644 --- a/data/lang/ui-core/id.json +++ b/data/lang/ui-core/id.json @@ -35,6 +35,10 @@ "description": "", "message": "An error has occurred" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Deadly" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Economy & Trade" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effects:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Location" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} light years ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/it.json b/data/lang/ui-core/it.json index ad29ba8b413..e154771b0cb 100644 --- a/data/lang/ui-core/it.json +++ b/data/lang/ui-core/it.json @@ -35,6 +35,10 @@ "description": "", "message": "Si è verificato un errore" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Scudi atmosferici" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Pericoloso" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Letale" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Velocità di discesa-a-terra:" @@ -359,6 +371,10 @@ "description": "", "message": "Economia & Commercio" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effetti:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Ingegneria:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipaggiamento" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Destinazione Finale:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Stato di volo" @@ -999,6 +1055,10 @@ "description": "", "message": "Giacenza" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Quest'articolo è esaurito." @@ -1091,6 +1151,22 @@ "description": "", "message": "Posizione" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Basso" @@ -1311,6 +1387,10 @@ "description": "", "message": "Nessuna missione." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} anni luce ({maxRange} massimi)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Affidabile" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "-" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Rimuovi Salto" @@ -1687,10 +1771,26 @@ "description": "", "message": "Un inizio moderato da Itzalean su New Hope nel sistema Epsilon Eridani." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Densità del campo stellare" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Abbiamo una capacità di {total_docking_pads} attracchi." diff --git a/data/lang/ui-core/lt.json b/data/lang/ui-core/lt.json index 1bf751a16af..c70c068e125 100644 --- a/data/lang/ui-core/lt.json +++ b/data/lang/ui-core/lt.json @@ -35,6 +35,10 @@ "description": "", "message": "An error has occurred" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Pavojingas" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Deadly" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Ekonomika ir Prekyba" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efektai:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Įranga" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "Yra sandėlyje" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Šio daikto nėra sandėlyje." @@ -1091,6 +1151,22 @@ "description": "", "message": "Vieta" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} light years ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/nb.json b/data/lang/ui-core/nb.json index 637422ca242..c39e2babed5 100644 --- a/data/lang/ui-core/nb.json +++ b/data/lang/ui-core/nb.json @@ -35,6 +35,10 @@ "description": "", "message": "En feil har oppstått" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Dødelig" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Descent-to-ground speed:" @@ -359,6 +371,10 @@ "description": "", "message": "Economy & Trade" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effects:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "This item is out of stock." @@ -1091,6 +1151,22 @@ "description": "", "message": "Lokasjon" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} lysår ({maxRange} maks)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/nl.json b/data/lang/ui-core/nl.json index 23cd14e4d3c..13ad215aff9 100644 --- a/data/lang/ui-core/nl.json +++ b/data/lang/ui-core/nl.json @@ -35,6 +35,10 @@ "description": "", "message": "Er is een fout opgetreden" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmosfeerschilden" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Gevaarlijk" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Dodelijk" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Daal-naar-oppervlaksnelheid:" @@ -359,6 +371,10 @@ "description": "", "message": "Economie & Handel" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effecten:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Techniek:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Uitrusting" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Laatste Doel:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Vluchtstatus" @@ -999,6 +1055,10 @@ "description": "", "message": "In voorraad" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Dit artikel is niet in voorraad." @@ -1091,6 +1151,22 @@ "description": "", "message": "Locatie" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Laag" @@ -1311,6 +1387,10 @@ "description": "", "message": "Geen missies." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} lichtjaar ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "[-]" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Sprong verwijderen" @@ -1687,10 +1771,26 @@ "description": "", "message": "Dit is een wat moeilijker start in Itzalean op New Hope in het Epsilon Eridani-stelsel" }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Sterrendichtheid" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/pl.json b/data/lang/ui-core/pl.json index f24d308b8e4..887f366dde5 100644 --- a/data/lang/ui-core/pl.json +++ b/data/lang/ui-core/pl.json @@ -35,6 +35,10 @@ "description": "", "message": "Wystąpił błąd" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Tarcze atmosferyczne" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Groźny" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Zabójczy" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (maks.)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Prędkość graniczna:" @@ -359,6 +371,10 @@ "description": "", "message": "Ekonomia i Handel" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efekty:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Naprawa:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Wyposażenie" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Końcowy cel:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Stan lotu" @@ -999,6 +1055,10 @@ "description": "", "message": "Stan" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Ta pozycja jest obecnie niedostępna." @@ -1091,6 +1151,22 @@ "description": "", "message": "Lokalizacja" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Mała" @@ -1311,6 +1387,10 @@ "description": "", "message": "Brak misji." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} lat świetlnych ({maxRange} maks.)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Niezawodny" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "[-]" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Usuń skok" @@ -1687,10 +1771,26 @@ "description": "", "message": "Jest to umiarkowany start z Itzalean na New Hope w układzie Epsilon Eridani." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Zagęszczenie gwiazd" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/pt.json b/data/lang/ui-core/pt.json index 48f90cef582..37a559cffe6 100644 --- a/data/lang/ui-core/pt.json +++ b/data/lang/ui-core/pt.json @@ -35,6 +35,10 @@ "description": "", "message": "Ocorreu um erro" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmospheric shielding" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Dangerous" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Mortal" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Velocidade de Descida ao chão:" @@ -359,6 +371,10 @@ "description": "", "message": "Economia & Troca" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efeitos:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engineering:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipment" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Estado do voo" @@ -999,6 +1055,10 @@ "description": "", "message": "In stock" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Este item está esgotado." @@ -1091,6 +1151,22 @@ "description": "", "message": "Localização" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Low" @@ -1311,6 +1387,10 @@ "description": "", "message": "No missions." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{alcance} anos-luz ({Alcancemáximo} máximo)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Reliable" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remover" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Density of Star field" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/pt_BR.json b/data/lang/ui-core/pt_BR.json index a6af127e5c3..6c01729c432 100644 --- a/data/lang/ui-core/pt_BR.json +++ b/data/lang/ui-core/pt_BR.json @@ -35,6 +35,10 @@ "description": "", "message": "Ocorreu um erro" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Blindagem atmosférica" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Perigoso" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Mortal" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (máximo)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Velocidade de aterrissagem:" @@ -359,6 +371,10 @@ "description": "", "message": "Economia & Comércio" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efeitos:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Engenharia:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Equipamento" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "Em estoque" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Não há este item no estoque" @@ -1091,6 +1151,22 @@ "description": "", "message": "Localização" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Baixo" @@ -1311,6 +1387,10 @@ "description": "", "message": "Sem missões." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} anos luz ({maxRange} máx)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Confiável" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Densidade do campo Estelar" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/ro.json b/data/lang/ui-core/ro.json index 394e33dafc1..a1a136b666e 100644 --- a/data/lang/ui-core/ro.json +++ b/data/lang/ui-core/ro.json @@ -35,6 +35,10 @@ "description": "", "message": "A survenit o eroare" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Scut atmosferic" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Periculos" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Mortal" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Viteză verticală:" @@ -359,6 +371,10 @@ "description": "", "message": "Economie și Comerț" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efecte:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Inginerie:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Echipament" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "În stoc" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Nu mai există acest obiect în stoc." @@ -1091,6 +1151,22 @@ "description": "", "message": "Situare" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Scăzut" @@ -1311,6 +1387,10 @@ "description": "", "message": "Nicio misiune." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} ani lumină (max. {maxRange})" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "De încredere" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Înlăturare" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Remove Jump" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Densitatea câmpului de stele" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/ru.json b/data/lang/ui-core/ru.json index 6141ecd34c8..d3ea217a823 100644 --- a/data/lang/ui-core/ru.json +++ b/data/lang/ui-core/ru.json @@ -35,6 +35,10 @@ "description": "", "message": "Произошла ошибка" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Атмосферный щит" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Опасный" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Смертельный" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Дельта v (макс.)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Скорость снижения:" @@ -359,6 +371,10 @@ "description": "", "message": "Экономика и торговля" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Эффекты:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Инженерное дело:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Оснащение" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Конечная цель:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "На складе" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Этого товара нет на складе." @@ -1091,6 +1151,22 @@ "description": "", "message": "Система" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Низкая" @@ -1311,6 +1387,10 @@ "description": "", "message": "Нет заданий." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} св. лет (из {maxRange} макс.)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Надёжный" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "[-]" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Удалить гиперпрыжок" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Плотность звёздного поля" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/sv.json b/data/lang/ui-core/sv.json index aec46c96569..87c623ae596 100644 --- a/data/lang/ui-core/sv.json +++ b/data/lang/ui-core/sv.json @@ -35,6 +35,10 @@ "description": "", "message": "Ett fel har uppstått" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmosfärkapabel" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Farligt" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Dödligt" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (max)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Hastighet-mot-marken:" @@ -359,6 +371,10 @@ "description": "", "message": "Ekonomi & handel" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Effekter:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Ingenjör:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Utrustning" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Final Target:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Flight State" @@ -999,6 +1055,10 @@ "description": "", "message": "I lager" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Den här varan finns inte på lager." @@ -1091,6 +1151,22 @@ "description": "", "message": "Plats" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Låg" @@ -1311,6 +1387,10 @@ "description": "", "message": "Inga uppdrag." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} ljusår ({maxRange} max)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Pålitlig" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Ta bort hopp" @@ -1687,10 +1771,26 @@ "description": "", "message": "This is a moderate start from Itzalean on New Hope in the Epsilon Eridani system." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Täthet i bakgrundssjärnor" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Our total capacity is {total_docking_pads} docking pads." diff --git a/data/lang/ui-core/tr.json b/data/lang/ui-core/tr.json index 9ce6cbf5549..9addfad8640 100644 --- a/data/lang/ui-core/tr.json +++ b/data/lang/ui-core/tr.json @@ -35,6 +35,10 @@ "description": "", "message": "Bir hata oluştu" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "Atmosfer kalkanı" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "Tehlikeli" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "Ölümcül" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "Delta-v (en çok)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "Yere-alçalma hızı" @@ -359,6 +371,10 @@ "description": "", "message": "Ekonomi ve Ticaret" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "Efektler:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "Mühendislik:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "Ekipman" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "Son Hedef:" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "Uçuş Durumu" @@ -999,6 +1055,10 @@ "description": "", "message": "Stok" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "Bu ürün stokta yok." @@ -1091,6 +1151,22 @@ "description": "", "message": "Konum" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "Düşük" @@ -1311,6 +1387,10 @@ "description": "", "message": "Görev yok." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "Seçili sisteme geçerli bir rota yok." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} ışık yılı ({maxRange} en çok)" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "Güvenilir" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "Sıçramayı Kaldır" @@ -1687,10 +1771,26 @@ "description": "", "message": "Bu, Epsilon Eridani sistemindeki New Hope'ta bulunan Itzaelan'dan yapılan orta zorluktaki başlangıç." }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "Yıldız Yoğunluğu" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "Toplam kapasitemiz {total_docking_pads} kenetlenme platformudur." diff --git a/data/lang/ui-core/zh.json b/data/lang/ui-core/zh.json index 69c00fe32c4..8f307c0573f 100644 --- a/data/lang/ui-core/zh.json +++ b/data/lang/ui-core/zh.json @@ -35,6 +35,10 @@ "description": "", "message": "发生了一个错误" }, + "ARRIVAL_DATE": { + "description": "Time of arrival, used in flight log", + "message": "Arrival date" + }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", "message": "可安装大气护盾" @@ -259,6 +263,10 @@ "description": "Player combat rating", "message": "危险" }, + "DATE": { + "description": "Date of an event, used in flight log", + "message": "Date" + }, "DEADLY": { "description": "Player combat rating", "message": "致命的" @@ -283,6 +291,10 @@ "description": "Delta-v capacity of a ship with cargo bay fully loaded with propellant", "message": "速度增量(最大)" }, + "DEPARTURE_DATE": { + "description": "Time of departure, used in flight log", + "message": "Departure date" + }, "DESCENT_TO_GROUND_SPEED": { "description": "", "message": "减速至地速为:" @@ -359,6 +371,10 @@ "description": "", "message": "经济 & 贸易" }, + "EDIT": { + "description": "Tooltip, to edit a flight log entry", + "message": "Edit" + }, "EFFECTS": { "description": "", "message": "影响:" @@ -403,6 +419,10 @@ "description": "Engineering skills of crew", "message": "工程:" }, + "ENTRY": { + "description": "A note/entry/record into the flight log", + "message": "Entry" + }, "EQUIPMENT": { "description": "", "message": "装备" @@ -495,6 +515,42 @@ "description": "Hyperjump planner, referring to star system target", "message": "最终目标：" }, + "FLIGHTLOG_DOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Docking at {primary_info}" + }, + "FLIGHTLOG_FLYING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", + "message": "Flying in space, relative {primary_info}" + }, + "FLIGHTLOG_HYPERSPACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "In Hyperspace, enroute to {primary_info}" + }, + "FLIGHTLOG_JUMPING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", + "message": "Hyper jumping towards {primary_info}" + }, + "FLIGHTLOG_LANDED": { + "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", + "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + }, + "FLIGHTLOG_STARPORT_ORBITAL": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, in orbit around {secondary_info}" + }, + "FLIGHTLOG_STARPORT_SURFACE": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", + "message": "Docked at {primary_info}, on {secondary_info}" + }, + "FLIGHTLOG_UNDOCKING": { + "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", + "message": "Undocking at {primary_info}" + }, + "FLIGHT_LOG": { + "description": "Title for flight log screen, in info view", + "message": "Flight Log" + }, "FLIGHT_STATE": { "description": "", "message": "飞行状态" @@ -999,6 +1055,10 @@ "description": "", "message": "有存货" }, + "IN_SYSTEM": { + "description": "Used in flight log, show which star system we are/were in", + "message": "In system" + }, "ITEM_IS_OUT_OF_STOCK": { "description": "", "message": "该商品没有存货了" @@ -1091,6 +1151,22 @@ "description": "", "message": "地点" }, + "LOG_CUSTOM": { + "description": "Label tab for showing custom logged events", + "message": "Custom Log" + }, + "LOG_NEW": { + "description": "Indicate to make an entry into flight log system", + "message": "New Entry" + }, + "LOG_STATION": { + "description": "Label tab for showing logged station events", + "message": "Station Log" + }, + "LOG_SYSTEM": { + "description": "Label tab for showing logged system events", + "message": "System Log" + }, "LOW": { "description": "", "message": "低" @@ -1311,6 +1387,10 @@ "description": "", "message": "没有任务." }, + "NO_VALID_ROUTE": { + "description": "Message in the sector map, issued by the autoroute function.", + "message": "No valid route to the selected system." + }, "N_LIGHT_YEARS_N_MAX": { "description": "", "message": "{range} 光年 (最大 {maxRange})" @@ -1491,6 +1571,10 @@ "description": "For player reputation", "message": "可靠的" }, + "REMOVE": { + "description": "Remove, e.g. deleting a log entry", + "message": "Remove" + }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", "message": "移除跳跃" @@ -1687,10 +1771,26 @@ "description": "", "message": "这是一个温和的开始，从伊扎莱恩对新希望的Epsilon-Eridani系统。" }, + "START_LOG_ENTRY_1": { + "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", + "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + }, + "START_LOG_ENTRY_2": { + "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", + "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + }, + "START_LOG_ENTRY_3": { + "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", + "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + }, "STAR_FIELD_DENSITY": { "description": "", "message": "星场密度" }, + "STATION": { + "description": "Flight log info, will refer to a station by name", + "message": "Station" + }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", "message": "我们的总容量是 {total_docking_pads} 对接垫." From db20b13b978f4d5f9dfe582af40bd339709ad0d3 Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Wed, 15 Jul 2020 03:01:59 +0200 Subject: [PATCH 21/27] auto-commit: translation updates --- data/lang/ui-core/fr.json | 42 +++++++++++++++++----------------- data/lang/ui-core/it.json | 48 +++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/data/lang/ui-core/fr.json b/data/lang/ui-core/fr.json index 05a24135fde..9281221f303 100644 --- a/data/lang/ui-core/fr.json +++ b/data/lang/ui-core/fr.json @@ -37,7 +37,7 @@ }, "ARRIVAL_DATE": { "description": "Time of arrival, used in flight log", - "message": "Arrival date" + "message": "Date d'arrivée" }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", @@ -293,7 +293,7 @@ }, "DEPARTURE_DATE": { "description": "Time of departure, used in flight log", - "message": "Departure date" + "message": "Date de départ" }, "DESCENT_TO_GROUND_SPEED": { "description": "", @@ -373,7 +373,7 @@ }, "EDIT": { "description": "Tooltip, to edit a flight log entry", - "message": "Edit" + "message": "Modifier" }, "EFFECTS": { "description": "", @@ -421,7 +421,7 @@ }, "ENTRY": { "description": "A note/entry/record into the flight log", - "message": "Entry" + "message": "Entrée" }, "EQUIPMENT": { "description": "", @@ -517,39 +517,39 @@ }, "FLIGHTLOG_DOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Docking at {primary_info}" + "message": "Arrimage à {primary_info}" }, "FLIGHTLOG_FLYING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", - "message": "Flying in space, relative {primary_info}" + "message": "En vol, relatif à {primary_info}" }, "FLIGHTLOG_HYPERSPACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "In Hyperspace, enroute to {primary_info}" + "message": "En hyperespace, en route vers {primary_info}" }, "FLIGHTLOG_JUMPING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "Hyper jumping towards {primary_info}" + "message": "Hyper-saut vers {primary_info}" }, "FLIGHTLOG_LANDED": { "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", - "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + "message": "Atterri sur {primary_info}, position ({secondary_info}, {tertiary_info})" }, "FLIGHTLOG_STARPORT_ORBITAL": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, in orbit around {secondary_info}" + "message": "Arrimé à {primary_info}, en orbite autour de {secondary_info}" }, "FLIGHTLOG_STARPORT_SURFACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, on {secondary_info}" + "message": "Arrimé à {primary_info}, sur {secondary_info}" }, "FLIGHTLOG_UNDOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Undocking at {primary_info}" + "message": "Désarrimage de {primary_info}" }, "FLIGHT_LOG": { "description": "Title for flight log screen, in info view", - "message": "Flight Log" + "message": "Journal de vol" }, "FLIGHT_STATE": { "description": "", @@ -1057,7 +1057,7 @@ }, "IN_SYSTEM": { "description": "Used in flight log, show which star system we are/were in", - "message": "In system" + "message": "Dans le système" }, "ITEM_IS_OUT_OF_STOCK": { "description": "", @@ -1153,19 +1153,19 @@ }, "LOG_CUSTOM": { "description": "Label tab for showing custom logged events", - "message": "Custom Log" + "message": "Journal personnalisé" }, "LOG_NEW": { "description": "Indicate to make an entry into flight log system", - "message": "New Entry" + "message": "Nouvelle entrée" }, "LOG_STATION": { "description": "Label tab for showing logged station events", - "message": "Station Log" + "message": "Journal de station" }, "LOG_SYSTEM": { "description": "Label tab for showing logged system events", - "message": "System Log" + "message": "Journal de système" }, "LOW": { "description": "", @@ -1773,15 +1773,15 @@ }, "START_LOG_ENTRY_1": { "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", - "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + "message": "Malheureusement, mon oncle ne m'a jamais montré comment utiliser cette vieille barque quand il était vivant, et j'espère créer correctement cette entrée dans le journal de bord. C'est étrange, je peux toujours sentir sa présence, comme s'il était dans les murs de ce vaisseau. Peut-être que cette présence comblera le rôle de co-pilote et, ensemble, nous tracerons la voie de notre destinée dans ce grand vide. Mais d'abord, je dois juste acheter de l'hydrogène pour le moteur de saut, tracer un chemin vers des opportunités lucratives, et prier les cieux que les contrôleurs de trafic vont autoriser un pilote inexpérimenté comme moi à prendre vol. Alors nous verrons ce que ce bébé à dans le ventre. Il est temps de me faire une réputation !" }, "START_LOG_ENTRY_2": { "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", - "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + "message": "Mes bottes sont encore mouillées de la forte pluie de la nuit dernière. La chaussée a été si trempée, qu'elle - en apparence, dans un acte de revanche - inondait le ciel nocturne de la lueur réfléchie provenant des néons surplombant la rue. Mais je suis tout de même arrivé, malgré la pluie torrentielle, à mon vol de correspondance vers le port stellaire où mon nouveau vaisseau m'attendait. L'officier de sécurité m'a lancé un regard étrange quand je lui ai dit que j'étais ici pour récupérer un vaisseau. Je pense que je n'avais pas le look d'un citoyen des étoiles typique lorsque je me présentait devant lui, les bottes trempées, pour ne rien dire du reste, étant donné que j'ai dû vendre tout ce que je possédait afin d'investir dans cette vieille carcasse rouillée. Mais je pense vraiment qu'à partir de maintenant mon futur sera écrit dans les étoiles. Mais pour cela, je dois d'abord trouver la clé de démarrage." }, "START_LOG_ENTRY_3": { "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", - "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + "message": "Après une longue procédure administrative, j'ai finalement récupéré mon vaisseau de la fourrière. Cependant ils l'ont dépecé jusqu'aux os, afin de payer une dette que je n'ai jamais considéré leur devoir. Non seulement ont-ils pris ma cafetière favorite, mais ces bâtards on également arraché l'hyper-propulsion. Je suis donc bloqué dans ce système, à moins de vendre ce qu'il reste de la cargaison et, espérons-le, ainsi financer une nouvelle propulsion. Mais comme le dit le dicton: on ne fait pas d'omelette sans casser des œufs. Même si je suis de retour à la case de départ, je préfère voir ce contre-temps comme une opportunité, une seconde chance. Sans café. En laissant partir ce qui me définissait, je peux me redéfinir en un être nouveau. Le monde va se tourner pour me laisser passer, comme il le fait pour ceux qui savent où ils vont. Et je m'en vais vers les étoiles." }, "STAR_FIELD_DENSITY": { "description": "", diff --git a/data/lang/ui-core/it.json b/data/lang/ui-core/it.json index e154771b0cb..491ca30772e 100644 --- a/data/lang/ui-core/it.json +++ b/data/lang/ui-core/it.json @@ -37,7 +37,7 @@ }, "ARRIVAL_DATE": { "description": "Time of arrival, used in flight log", - "message": "Arrival date" + "message": "Giorno di arrivo" }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", @@ -265,7 +265,7 @@ }, "DATE": { "description": "Date of an event, used in flight log", - "message": "Date" + "message": "Data" }, "DEADLY": { "description": "Player combat rating", @@ -293,7 +293,7 @@ }, "DEPARTURE_DATE": { "description": "Time of departure, used in flight log", - "message": "Departure date" + "message": "Giorno della partenza" }, "DESCENT_TO_GROUND_SPEED": { "description": "", @@ -373,7 +373,7 @@ }, "EDIT": { "description": "Tooltip, to edit a flight log entry", - "message": "Edit" + "message": "Modifica" }, "EFFECTS": { "description": "", @@ -421,7 +421,7 @@ }, "ENTRY": { "description": "A note/entry/record into the flight log", - "message": "Entry" + "message": "Voce" }, "EQUIPMENT": { "description": "", @@ -517,39 +517,39 @@ }, "FLIGHTLOG_DOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Docking at {primary_info}" + "message": "Attracco a {primary_info}" }, "FLIGHTLOG_FLYING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", - "message": "Flying in space, relative {primary_info}" + "message": "In volo spaziale, relativo a {primary_info}" }, "FLIGHTLOG_HYPERSPACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "In Hyperspace, enroute to {primary_info}" + "message": "Nell'Iperspazio, in rotta verso {primary_info}" }, "FLIGHTLOG_JUMPING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "Hyper jumping towards {primary_info}" + "message": "Salto iperspaziale verso {primary_info}" }, "FLIGHTLOG_LANDED": { "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", - "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + "message": "Atterrato a {primary_info}, posizione ({secondary_info}, {tertiary_info})" }, "FLIGHTLOG_STARPORT_ORBITAL": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, in orbit around {secondary_info}" + "message": "Attraccato a {primary_info}, in orbita attorno a {secondary_info}" }, "FLIGHTLOG_STARPORT_SURFACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, on {secondary_info}" + "message": "Attraccato a {primary_info}, su {secondary_info}" }, "FLIGHTLOG_UNDOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Undocking at {primary_info}" + "message": "Salpando da {primary_info}" }, "FLIGHT_LOG": { "description": "Title for flight log screen, in info view", - "message": "Flight Log" + "message": "Diario di Volo" }, "FLIGHT_STATE": { "description": "", @@ -1057,7 +1057,7 @@ }, "IN_SYSTEM": { "description": "Used in flight log, show which star system we are/were in", - "message": "In system" + "message": "Nel sistema" }, "ITEM_IS_OUT_OF_STOCK": { "description": "", @@ -1153,19 +1153,19 @@ }, "LOG_CUSTOM": { "description": "Label tab for showing custom logged events", - "message": "Custom Log" + "message": "Voci di diario personalizzate" }, "LOG_NEW": { "description": "Indicate to make an entry into flight log system", - "message": "New Entry" + "message": "Nuova voce" }, "LOG_STATION": { "description": "Label tab for showing logged station events", - "message": "Station Log" + "message": "Diario della Stazione" }, "LOG_SYSTEM": { "description": "Label tab for showing logged system events", - "message": "System Log" + "message": "Diario del Sistema" }, "LOW": { "description": "", @@ -1389,7 +1389,7 @@ }, "NO_VALID_ROUTE": { "description": "Message in the sector map, issued by the autoroute function.", - "message": "No valid route to the selected system." + "message": "Non ci sono rotte valide verso il sistema scelto." }, "N_LIGHT_YEARS_N_MAX": { "description": "", @@ -1773,15 +1773,15 @@ }, "START_LOG_ENTRY_1": { "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", - "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + "message": "Sfortunatamente, finché era in vita, lo zio non mi ha mai mostrato come guidare questo vecchio barcone, ma penso che ora scriverò una voce in questo diario di bordo. È strano, mi sembra di sentirlo, come se fosse dentro le pareti di questa nave. Forse potrebbe diventare il mio co-pilota ed assieme potremmo seguire il nostro destino nel grande vuoto. Ma prima, ho bisogno di comprare un po' di idrogeno per il motore di salto, impostare una rotta verso qualche redditizia opportunità e pregare i cieli che il controllo del volo aereo permetta ad un pilota inesperto come me di decollare, ed allora vedremo cos'è capace di fare questa piccolina. È tempo di costruirmi una reputazione!" }, "START_LOG_ENTRY_2": { "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", - "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + "message": "I miei stivali sono ancora madidi per il temporale di ieri notte, nel tornare a casa. Il marciapiede era così bagnato che - forse per una sorta di vendetta - inzuppò il cielo notturno con il bagliore riflesso dai cartelli al neon che ci squadrano dall'alto sopra la strada umida. Ma ce la feci, solcando la pioggia, a raggiungere la mia coincidenza allo spazioporto dove la mia nuova nave mi stava aspettando. La sicurezza del porto mi guardò in modo strano quando dissi loro che ero lì per ritirare una nave. Immagino di non avere avuto l'aspetto del tipico spaziale, dopo aver venduto tutto ciò che potevo per investire in questa vecchia bagnarola, mentre stavo di fronte ad esso con gli stivali fradici e tutto il resto. Ma ora sento davvero che da questo momento il mio futuro sarà scritto nelle stelle. Ora, devo solo trovare la chiave di accensione." }, "START_LOG_ENTRY_3": { "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", - "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + "message": "Dopo un lungo processo burocratico, finalmente ho potuto riavere la mia nave sequestrata, ma me l'hanno spogliata di ogni cosa per ripagare 'il debito' che sostengono io avessi. Non solo mi hanno portato via la mia caffettiera preferita, ma quei bastardi hanno anche strappato via il motore iperspaziale, lasciandomi così bloccato in questo sistema... a meno di non vendere quel poco che è rimasto nella nave per pagarmi una nuova iperguida. Ma come si dice: non tutto il male vien per nuocere; quindi, anche se sono tornato al segnalino del 'Via', la prenderò come un'opportunità anziché un contrattempo. Ma senza il caffè. Lasciandosene andare l'io che ero, potrò diventare ciò che vorrò. Il mondo si farà da parte per farmi passare, come fa per quelli che sanno bene dove stanno andando, ed io sono diretto alle stelle." }, "STAR_FIELD_DENSITY": { "description": "", @@ -1789,7 +1789,7 @@ }, "STATION": { "description": "Flight log info, will refer to a station by name", - "message": "Station" + "message": "Stazione" }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", From d61d64af437bce346454d71d6f7811e6b9456fef Mon Sep 17 00:00:00 2001 From: Karl F Date: Fri, 17 Jul 2020 10:20:27 +0200 Subject: [PATCH 22/27] Update changelog --- Changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.txt b/Changelog.txt index 46438b91345..2fcb3105e05 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -2,6 +2,7 @@ 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) From a3f83eba2c0d1d38441c4dbfebfeaf0c8535b411 Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Sat, 18 Jul 2020 03:01:26 +0200 Subject: [PATCH 23/27] auto-commit: translation updates --- data/lang/commodity/bg.json | 12 ++++----- data/lang/input-core/bg.json | 14 +++++------ data/lang/ui-core/hu.json | 46 +++++++++++++++++----------------- data/lang/ui-core/tr.json | 48 ++++++++++++++++++------------------ 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/data/lang/commodity/bg.json b/data/lang/commodity/bg.json index b9355a463e8..dfe1fa0f1bc 100644 --- a/data/lang/commodity/bg.json +++ b/data/lang/commodity/bg.json @@ -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": "", @@ -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": "", @@ -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": "", @@ -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": "", @@ -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": "", @@ -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": "", diff --git a/data/lang/input-core/bg.json b/data/lang/input-core/bg.json index cb3e36c6bff..99d32904c31 100644 --- a/data/lang/input-core/bg.json +++ b/data/lang/input-core/bg.json @@ -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.", @@ -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.", @@ -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.", diff --git a/data/lang/ui-core/hu.json b/data/lang/ui-core/hu.json index 049e2922376..942d65b787d 100644 --- a/data/lang/ui-core/hu.json +++ b/data/lang/ui-core/hu.json @@ -37,7 +37,7 @@ }, "ARRIVAL_DATE": { "description": "Time of arrival, used in flight log", - "message": "Arrival date" + "message": "Érkezés dátima" }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", @@ -265,7 +265,7 @@ }, "DATE": { "description": "Date of an event, used in flight log", - "message": "Date" + "message": "Dátum" }, "DEADLY": { "description": "Player combat rating", @@ -293,7 +293,7 @@ }, "DEPARTURE_DATE": { "description": "Time of departure, used in flight log", - "message": "Departure date" + "message": "Távozás dátuma" }, "DESCENT_TO_GROUND_SPEED": { "description": "", @@ -373,7 +373,7 @@ }, "EDIT": { "description": "Tooltip, to edit a flight log entry", - "message": "Edit" + "message": "Szerkesztés" }, "EFFECTS": { "description": "", @@ -421,7 +421,7 @@ }, "ENTRY": { "description": "A note/entry/record into the flight log", - "message": "Entry" + "message": "Bejegyzés" }, "EQUIPMENT": { "description": "", @@ -517,39 +517,39 @@ }, "FLIGHTLOG_DOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Docking at {primary_info}" + "message": "Dokkolva: " }, "FLIGHTLOG_FLYING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", - "message": "Flying in space, relative {primary_info}" + "message": "{primary_info} környékén" }, "FLIGHTLOG_HYPERSPACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "In Hyperspace, enroute to {primary_info}" + "message": "Hyperűrben, úti cél: {primary_info}" }, "FLIGHTLOG_JUMPING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "Hyper jumping towards {primary_info}" + "message": "Ugrás {primary_info} felé" }, "FLIGHTLOG_LANDED": { "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", - "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + "message": "Landolva: {primary_info}, {secondary_info}, {tertiary_info} koordinátákon" }, "FLIGHTLOG_STARPORT_ORBITAL": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, in orbit around {secondary_info}" + "message": "Dokkolva: {primary_info} űrállomáson, {secondary_info} körüli pályán" }, "FLIGHTLOG_STARPORT_SURFACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, on {secondary_info}" + "message": "Dokkolva: {primary_info}, űrkikötőben. {secondary_info} felszínén" }, "FLIGHTLOG_UNDOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Undocking at {primary_info}" + "message": "Indulás: {primary_info}" }, "FLIGHT_LOG": { "description": "Title for flight log screen, in info view", - "message": "Flight Log" + "message": "Hajónapló" }, "FLIGHT_STATE": { "description": "", @@ -1057,7 +1057,7 @@ }, "IN_SYSTEM": { "description": "Used in flight log, show which star system we are/were in", - "message": "In system" + "message": "Rendszerben" }, "ITEM_IS_OUT_OF_STOCK": { "description": "", @@ -1153,19 +1153,19 @@ }, "LOG_CUSTOM": { "description": "Label tab for showing custom logged events", - "message": "Custom Log" + "message": "Saját bejegyzés" }, "LOG_NEW": { "description": "Indicate to make an entry into flight log system", - "message": "New Entry" + "message": "Új bejegyzés" }, "LOG_STATION": { "description": "Label tab for showing logged station events", - "message": "Station Log" + "message": "Állomás napló" }, "LOG_SYSTEM": { "description": "Label tab for showing logged system events", - "message": "System Log" + "message": "Rendszer napló" }, "LOW": { "description": "", @@ -1773,15 +1773,15 @@ }, "START_LOG_ENTRY_1": { "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", - "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + "message": "Sajnos a nagybátyám sosem mutatta meg, hogy kell vezetni ezt a vén bárkát, amíg még életben volt. Azt hiszem épp a hajónaplóba írok. Fura, még mindíg érzem a jelenlétét itt a hajóban. Tán ő lesz a másodpilótám a túlvilágról, és együtt beteljesíthetjük végzetünket a nagy ürességben. De előbb vennem kell némi Hidrogént, a hiperhajtóműhöz, találnom egy jövedelmező kereskedelmi útvonalat, és imádkoznom a mennyeknek, hogy a repülésirányítás felszállási engedélyt fog adni egy ilyen tapasztalatlan pilótának. Aztán meglátjuk mire képes a kicsike. Ideje megalapoznom a hírnevemet!" }, "START_LOG_ENTRY_2": { "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", - "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + "message": "A bakancsom még mindig vizes a tegnap esti vihartól. Az vizes út -mintegy bosszúból- beragyogta az éjszakai eget ahogy visszaverte az utcáira letekintő neon hirdetések fényeit. Végül sikerült elérnem a csatlakozásomat az űrkikötőbe, ahol az új hajóm várt rám. A biztonságiak elég furán néztek rám, amikor csuromvizesen közöltem velük, hogy egy űrhajóért jöttem. Gyanítom nem épp úgy festettem, mint egy tipikus űrhajós. Eladtam mindenemet, és ebbe a rozsdás vén vödörbe fektettem. Úgy érzem ettől a perctől a jövőm a csillagokba van írva. Már csak az indító gombot kellene megtalálnom." }, "START_LOG_ENTRY_3": { "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", - "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + "message": "Beletelt némi hivatali hadakozásba, de végre sikerült visszaszereznem a lefoglalt hajómat. Hajótestig csupaszították, hogy fedezzék amivel szerintük 'tartoztam'. Nem elég, hogy azt a csodálatos kávégéped, de még a hiperhajtóművet is kiszerelték, úgyhogy ebben a rendszerben ragadtam. Talán ha eladom ami alkatrészt meghagytak ezek a keselyűk, akkor tudok venni új hiperművet. Ahogy mindani szokás: ha az élet citromot ad, csinálj limonádét. Úgyhogy ha vissza is kellett lépnem a kezdő mezőre, lehetőségnek, második esélynek tekintem, nem visszalépésnek. Kávé nélkül. Ha elengedem ami vagyok, azzá válhatok, ami lehetek. A világ félreáll és utamra enged, ahogy azoknak, akik tudják merre tartanak. Én pedig a csillagokba tartok." }, "STAR_FIELD_DENSITY": { "description": "", @@ -1789,7 +1789,7 @@ }, "STATION": { "description": "Flight log info, will refer to a station by name", - "message": "Station" + "message": "Állomás" }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", diff --git a/data/lang/ui-core/tr.json b/data/lang/ui-core/tr.json index 9addfad8640..ec100b918a4 100644 --- a/data/lang/ui-core/tr.json +++ b/data/lang/ui-core/tr.json @@ -37,7 +37,7 @@ }, "ARRIVAL_DATE": { "description": "Time of arrival, used in flight log", - "message": "Arrival date" + "message": "Varış tarihi" }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", @@ -265,7 +265,7 @@ }, "DATE": { "description": "Date of an event, used in flight log", - "message": "Date" + "message": "Tarih" }, "DEADLY": { "description": "Player combat rating", @@ -293,7 +293,7 @@ }, "DEPARTURE_DATE": { "description": "Time of departure, used in flight log", - "message": "Departure date" + "message": "Ayrılış tarihi" }, "DESCENT_TO_GROUND_SPEED": { "description": "", @@ -373,7 +373,7 @@ }, "EDIT": { "description": "Tooltip, to edit a flight log entry", - "message": "Edit" + "message": "Düzenle" }, "EFFECTS": { "description": "", @@ -421,7 +421,7 @@ }, "ENTRY": { "description": "A note/entry/record into the flight log", - "message": "Entry" + "message": "Girdi" }, "EQUIPMENT": { "description": "", @@ -517,39 +517,39 @@ }, "FLIGHTLOG_DOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Docking at {primary_info}" + "message": "{primary_info} ile kenetlenirken" }, "FLIGHTLOG_FLYING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", - "message": "Flying in space, relative {primary_info}" + "message": "Uzay uçuşunda, {primary_info}'a göre" }, "FLIGHTLOG_HYPERSPACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "In Hyperspace, enroute to {primary_info}" + "message": "Hiperuzayda, {primary_info} yönünde yolculukta" }, "FLIGHTLOG_JUMPING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "Hyper jumping towards {primary_info}" + "message": "{primary_info} doğrultusunda hipersıçrama yaparken" }, "FLIGHTLOG_LANDED": { "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", - "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + "message": "{primary_info}, pozisyon ({secondary_info}, {tertiary_info}) inildi." }, "FLIGHTLOG_STARPORT_ORBITAL": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, in orbit around {secondary_info}" + "message": "{secondary_info} yörüngesindeki {primary_info} ile kenetli." }, "FLIGHTLOG_STARPORT_SURFACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, on {secondary_info}" + "message": "{secondary_info} üzerindeki {primary_info} istasyonuna inildi." }, "FLIGHTLOG_UNDOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Undocking at {primary_info}" + "message": "{primary_info}'dan ayrılırken" }, "FLIGHT_LOG": { "description": "Title for flight log screen, in info view", - "message": "Flight Log" + "message": "Uçuş Günlüğü" }, "FLIGHT_STATE": { "description": "", @@ -1057,7 +1057,7 @@ }, "IN_SYSTEM": { "description": "Used in flight log, show which star system we are/were in", - "message": "In system" + "message": "Sistem:" }, "ITEM_IS_OUT_OF_STOCK": { "description": "", @@ -1153,19 +1153,19 @@ }, "LOG_CUSTOM": { "description": "Label tab for showing custom logged events", - "message": "Custom Log" + "message": "Özel Günlük" }, "LOG_NEW": { "description": "Indicate to make an entry into flight log system", - "message": "New Entry" + "message": "Yeni Girdi" }, "LOG_STATION": { "description": "Label tab for showing logged station events", - "message": "Station Log" + "message": "İstasyon Günlüğü" }, "LOG_SYSTEM": { "description": "Label tab for showing logged system events", - "message": "System Log" + "message": "Sistem Günlüğü" }, "LOW": { "description": "", @@ -1573,7 +1573,7 @@ }, "REMOVE": { "description": "Remove, e.g. deleting a log entry", - "message": "Remove" + "message": "Kaldır" }, "REMOVE_JUMP": { "description": "UI-button: remove hyper jump from list of planned jumps", @@ -1773,15 +1773,15 @@ }, "START_LOG_ENTRY_1": { "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", - "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + "message": "Ne yazık ki amcam hayattayken bana bu yaşlı teknenin nasıl kullanılacağını öğretmedi, ama sanıyorum ki şu an geminin günlüğüne giriş yapıyorum. Çok tuhaf, onu hâlâ hissedebiliyorum, sanki bu geminin duvarlarındaymış gibi. Belki benim yardımcı pilotum olur ve devasa boşlukta kaderimizi buluruz. Ama ilk olarak sıçrama sürücüsü için hidrojen almam, ticaret fırsatlarına bir rota çizmem ve trafik kontrolün benim gibi tecrübesiz bir pilota kalış izni vermesi için dua etmem lazım; sonra bu bebeğin neler yapabildiğini görürüz. Kendime isim yapma zamanı!" }, "START_LOG_ENTRY_2": { "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", - "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + "message": "Botlarım geçen gece eve giderken başlayan sağanak yağmurdan dolayı hala ıslak. Kaldırım öyle ıslanmış ki - sanki intikam almak istercesine - sokağın üstünde parlayan neon ışıkları yansıtarak gece göğünü ışığa boğmuş. Ancak yine de, yağmura rağmen, beni yeni gemimin beklediği yıldız limanına götürecek aktarma uçuşunu yakaladım. Gemime gitmek istediğimi söylediğimde istasyondaki güvenlik görevlisi bana ters bir bakış attı. Sanırım her şeyimi bu paslı teneke için harcadığımdan tipik bir uzay pilotuna benzemiyordum, böyle ıslak botlarla falan. Ancak hissedebiliyorum ki, şu andan itibaren geleceğim yıldızlarda yazılacak. Yapmam gereken tek şey başlatma tuşunu bulmak." }, "START_LOG_ENTRY_3": { "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", - "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + "message": "Uzun bir bürokratik süreçten sonra gemimi nihayet hacizden kurtardım, ama sözde borcumu ödemek için iskeletine kadar her şeyi sökmüşler. En sevdiğim kahve makinem bir yana, bu adiler hipersürücüyü de götürmüşler, o yüzden şimdilik bu sistemde sıkışıp kaldım. Eh, belki gemide kalan son şeyleri satıp bir hipersürücü alabilirim... Ama ne derler bilirsiniz; krizi fırsata çevirmeli; şu an en başa dönmüş de olsam, bu gerilemeyi yeni bir başlangıç olarak göreceğim. Kahvesiz bir başlangıç. Kim olduğumu geride bırakıp kim olacağıma odaklanacağım. Dünya önümden çekilip yolumu açacak, yolunu bilen herkese yaptığı gibi - ve ben yıldızlara gidiyorum." }, "STAR_FIELD_DENSITY": { "description": "", @@ -1789,7 +1789,7 @@ }, "STATION": { "description": "Flight log info, will refer to a station by name", - "message": "Station" + "message": "İstasyon" }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", From f96801bde9103c40ce3bf482c7b2cb5a64faaac6 Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Fri, 24 Jul 2020 03:01:23 +0200 Subject: [PATCH 24/27] auto-commit: translation updates --- data/lang/core/es.json | 6 ++--- data/lang/input-core/es.json | 14 +++++------ data/lang/ui-core/es.json | 48 ++++++++++++++++++------------------ 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/data/lang/core/es.json b/data/lang/core/es.json index c76ebe14615..eec8091ffd7 100644 --- a/data/lang/core/es.json +++ b/data/lang/core/es.json @@ -337,11 +337,11 @@ }, "DOCKED": { "description": "", - "message": "Atracado" + "message": "Acoplado" }, "DOCKING": { "description": "", - "message": "Atracando" + "message": "Acoplándose" }, "DOCKING_CLEARANCE_EXPIRED": { "description": "", @@ -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": "", diff --git a/data/lang/input-core/es.json b/data/lang/input-core/es.json index aca34b53abf..e2431f8bca5 100644 --- a/data/lang/input-core/es.json +++ b/data/lang/input-core/es.json @@ -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.", @@ -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.", @@ -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.", diff --git a/data/lang/ui-core/es.json b/data/lang/ui-core/es.json index 9b066dbeac2..97d1bc58be2 100644 --- a/data/lang/ui-core/es.json +++ b/data/lang/ui-core/es.json @@ -37,7 +37,7 @@ }, "ARRIVAL_DATE": { "description": "Time of arrival, used in flight log", - "message": "Arrival date" + "message": "Fecha de llegada" }, "ATMOSPHERIC_SHIELDING": { "description": "Used in ShipInfo view, followed by a yes/no depending on if the ship can carry atmospheric shields", @@ -265,7 +265,7 @@ }, "DATE": { "description": "Date of an event, used in flight log", - "message": "Date" + "message": "Fecha" }, "DEADLY": { "description": "Player combat rating", @@ -293,7 +293,7 @@ }, "DEPARTURE_DATE": { "description": "Time of departure, used in flight log", - "message": "Departure date" + "message": "Fecha de partida" }, "DESCENT_TO_GROUND_SPEED": { "description": "", @@ -373,7 +373,7 @@ }, "EDIT": { "description": "Tooltip, to edit a flight log entry", - "message": "Edit" + "message": "Editar" }, "EFFECTS": { "description": "", @@ -421,7 +421,7 @@ }, "ENTRY": { "description": "A note/entry/record into the flight log", - "message": "Entry" + "message": "Introducir" }, "EQUIPMENT": { "description": "", @@ -517,39 +517,39 @@ }, "FLIGHTLOG_DOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Docking at {primary_info}" + "message": "Atracando en {primary_info}" }, "FLIGHTLOG_FLYING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the name of a space body", - "message": "Flying in space, relative {primary_info}" + "message": "Volando por el espacio, relativo a {primary_info}" }, "FLIGHTLOG_HYPERSPACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "In Hyperspace, enroute to {primary_info}" + "message": "En el Hiperespacio, en ruta a {primary_info}" }, "FLIGHTLOG_JUMPING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is the star system targeted for hyperspace jump.", - "message": "Hyper jumping towards {primary_info}" + "message": "Hipersalto hacia {primary_info}" }, "FLIGHTLOG_LANDED": { "description": "Used in Flight Log, to indicate player's position, 'primary_info' is the name of a space body, typically a planet, the other two variables are latitude and longitude as floating point number, e.g. 'Landed on Trantor, position (-43.23, 67.89)'", - "message": "Landed on {primary_info}, position ({secondary_info}, {tertiary_info})" + "message": "Aterrizado en {primary_info}, posición ({secondary_info}, {tertiary_info})" }, "FLIGHTLOG_STARPORT_ORBITAL": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, in orbit around {secondary_info}" + "message": "Atracado en {primary_info}, orbitando {secondary_info}" }, "FLIGHTLOG_STARPORT_SURFACE": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name, 'secondary_info' is a space body (planet, moon/satelite, star) name", - "message": "Docked at {primary_info}, on {secondary_info}" + "message": "Atracado en {primary_info}, en {secondary_info}" }, "FLIGHTLOG_UNDOCKING": { "description": "Used in Flight Log, to indicate player's position. 'primary_info' is a station name", - "message": "Undocking at {primary_info}" + "message": "Desacoplándose de {primary_info}" }, "FLIGHT_LOG": { "description": "Title for flight log screen, in info view", - "message": "Flight Log" + "message": "Registro de Vuelo" }, "FLIGHT_STATE": { "description": "", @@ -1057,7 +1057,7 @@ }, "IN_SYSTEM": { "description": "Used in flight log, show which star system we are/were in", - "message": "In system" + "message": "En el sistema" }, "ITEM_IS_OUT_OF_STOCK": { "description": "", @@ -1153,19 +1153,19 @@ }, "LOG_CUSTOM": { "description": "Label tab for showing custom logged events", - "message": "Custom Log" + "message": "Registro Personalizado" }, "LOG_NEW": { "description": "Indicate to make an entry into flight log system", - "message": "New Entry" + "message": "Nueva Entrada" }, "LOG_STATION": { "description": "Label tab for showing logged station events", - "message": "Station Log" + "message": "Registro de Estación" }, "LOG_SYSTEM": { "description": "Label tab for showing logged system events", - "message": "System Log" + "message": "Registro de Sistema" }, "LOW": { "description": "", @@ -1389,7 +1389,7 @@ }, "NO_VALID_ROUTE": { "description": "Message in the sector map, issued by the autoroute function.", - "message": "No valid route to the selected system." + "message": "No existe una ruta válida al sistema seleccionado." }, "N_LIGHT_YEARS_N_MAX": { "description": "", @@ -1773,15 +1773,15 @@ }, "START_LOG_ENTRY_1": { "description": "First custom log message when starting a new game, giving backstory to the character. Importantly we here hint at what actions the player is best to take: buy fuel, get reputation, ask for take off clearance.", - "message": "Unfortunately, uncle never showed me how to operate this old barge when he was alive, but I think I'm making an entry in the ship's log now. It's strange, I can still feel him, as if he's in the very walls of this ship. Maybe he can be my co-pilot, and together we will manifest our destiny in the great void. But first, I just need to buy some hydrogen for the jump drive, plot a course to lucrative trading opportunities, and pray to the heavens that traffic control will allow an inexperienced pilot like me to take off, then we'll see what this baby can do. Time to make a reputation for myself!" + "message": "Desafortunadamente, el tío nunca me mostró cómo operar esta vieja barcaza cuando estaba vivo, pero creo que ahora estoy introduciendo una entrada en el registro de la nave. Es extraño, todavía puedo sentirlo, como si estuviera en las paredes de esta nave. Tal vez puede ser mi copiloto, y juntos manifestaremos nuestro destino en el gran vacío. Pero primero, Solo necesito comprar algo de hidrógeno para la unidad de salto, trazar un curso hacia oportunidades comerciales lucrativas y rezar a los cielos para que el control del tráfico permita que un piloto sin experiencia como yo despegue, luego veremos qué puede hacer este bebé. ¡Es hora de hacerme una reputación!" }, "START_LOG_ENTRY_2": { "description": "First custom log message when starting a new game, giving backstory to the character, here going for a Blade Runner feeling", - "message": "My boots are still wet from the heavy rainfall last night, back home. The pavement got so wet it - seemingly, in an act of revenge - drenched the night sky with the reflected glow from the neon signs that looked down on the wet street. But I made it, through the rain, to my connecting flight to the starport where my new ship was waiting for me. The starport security officer gave me a funny look when I told him I'm here to pick up a ship. I guess I didn't look like the typical spacer, having sold everything I had to invest in this rusty old bucket, as I was standing in front of him, wet boots and all. But I truly feel, that from now on, my future will be written in the stars. Now, I just need to find the start-key." + "message": "Mis botas están todavía húmedas por la fuerte lluvia de anoche, de vuelta a casa. El pavimento se mojó tanto que, aparentemente, en un acto de venganza - empapó el cielo nocturno con el brillo reflejado de los letreros de neón que miraban hacia la calle mojada. Pero lo hice, bajo la lluvia, a mi contacto de vuelo del puerto estelar donde mi nueva nave me estaba esperando. El oficial de seguridad del puerto estelar me lanzó una mirada graciosa cuando le dije que estaba aquí para recoger una nave. Supongo que no tenía el aspecto del típico piloto espacial, después de haber vendido todo lo que tenía para invertir en este viejo cubo oxidado, mientras estaba de pie frente a él, con las botas mojadas y todo. Pero realmente siento que, a partir de ahora, mi futuro estará escrito en las estrellas. Ahora, solo necesito encontrar la llave de contacto." }, "START_LOG_ENTRY_3": { "description": "First custom log message when starting a new game, giving backstory to the character. Here explaining why there's no hyperdrive in the ship, and what to do about it.", - "message": "After a long bureaucratic process, I finally got my ship back from the impound, but they had stripped her down to the bare metal, to pay 'the debt' they claimed I had. Not only did they take my favourite coffee brewer, but those bastards also ripped out the hyper drive, so I'm stuck for now in this system, unless I sell whatever is left in the ship, to finance a new drive. But as they say: when life gives you lemons - make lemonade; so even if I'm back at square one, I will think of this as an opportunity instead of as a setback, a second chance. Without coffee. By letting go of what I am, I will become what I might be. The world will turn aside, and let me pass, as it does for those who know where they are going, and I am heading to the stars." + "message": "Tras un largo proceso burocrático, finalmente recuperé mi nave del depósito, pero la habían dejado en metal desnudo, para pagar 'la deuda' que afirmaban que tenía. No solo se llevaron mi cafetera favorita, sino que esos bastardos también arrancaron el hiperimpulsor, así que estoy atrapado por ahora en este sistema, a menos que venda lo que quede en la nave, para financiar un nuevo motor. Pero como dicen: cuando la vida te da limones, haz limonada; así que incluso si vuelvo al punto de partida, pensaré en esto como una oportunidad en lugar de un revés, una segunda oportunidad. Sin café. Desprendiéndome de lo que soy, me convertiré en lo que puedo llegar a ser. El mundo se volverá a un lado, y me dejará pasar como lo hace para aquellos que saben a dónde van, y me dirijo a las estrellas." }, "STAR_FIELD_DENSITY": { "description": "", @@ -1789,7 +1789,7 @@ }, "STATION": { "description": "Flight log info, will refer to a station by name", - "message": "Station" + "message": "Estación" }, "STATION_DOCKS": { "description": "Information shown in the station lobby, for total number of docking pads", From f34619f28220b57abd39fea0ad43869ee4aa9429 Mon Sep 17 00:00:00 2001 From: Pioneer Transifex Date: Sat, 25 Jul 2020 03:01:20 +0200 Subject: [PATCH 25/27] auto-commit: translation updates --- data/lang/core/es.json | 4 ++-- data/lang/equipment-core/es.json | 18 +++++++++--------- data/lang/module-breakdownservicing/es.json | 4 ++-- data/lang/module-combat/es.json | 2 +- data/lang/module-taxi/es.json | 2 +- data/lang/ui-core/es.json | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/lang/core/es.json b/data/lang/core/es.json index eec8091ffd7..d985d7359ac 100644 --- a/data/lang/core/es.json +++ b/data/lang/core/es.json @@ -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", @@ -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).", diff --git a/data/lang/equipment-core/es.json b/data/lang/equipment-core/es.json index 30b01b76bbb..04c7a35ff67 100644 --- a/data/lang/equipment-core/es.json +++ b/data/lang/equipment-core/es.json @@ -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": "", diff --git a/data/lang/module-breakdownservicing/es.json b/data/lang/module-breakdownservicing/es.json index d2e7b25ba06..1372a18a223 100644 --- a/data/lang/module-breakdownservicing/es.json +++ b/data/lang/module-breakdownservicing/es.json @@ -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": "", @@ -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": "", diff --git a/data/lang/module-combat/es.json b/data/lang/module-combat/es.json index 9c26e4446db..1d04b3de092 100644 --- a/data/lang/module-combat/es.json +++ b/data/lang/module-combat/es.json @@ -277,7 +277,7 @@ }, "POLICE_2": { "description": "{area} is an asteroid or planet", - "message": "{org} pagará {cash} por una misión de combate en el sistema {system} ({sectorx}, {sectory}, {sectorz}). Andamos cortos de pilotos y naves. Por eso esto será una oportunidad de hacer dinero para un ciudadano leal. El objetivo es una pequeña base pirata en {area}. Necesitarás propelente de hipermotor para {dist} ly y fuel adicional para la ruta de regreso." + "message": "{org} pagará {cash} por una misión de combate en el sistema {system} ({sectorx}, {sectory}, {sectorz}). Andamos cortos de pilotos y naves. Por eso esto será una oportunidad de hacer dinero para un ciudadano leal. El objetivo es una pequeña base pirata en {area}. Necesitarás propelente de hiperimpulsor para {dist} ly y fuel adicional para la ruta de regreso." }, "POLICE_3": { "description": "{area} is an asteroid or planet", diff --git a/data/lang/module-taxi/es.json b/data/lang/module-taxi/es.json index 7a5ee376499..07a8e5128f8 100644 --- a/data/lang/module-taxi/es.json +++ b/data/lang/module-taxi/es.json @@ -357,7 +357,7 @@ }, "FLAVOUR_5_ADTEXT": { "description": "", - "message": "SE BUSCA: Pasaje al Sistema {system}. Se paga {cash}." + "message": "SE BUSCA: Pasaje al Sistema {system}. Se pagará {cash}." }, "FLAVOUR_5_DANGER": { "description": "", diff --git a/data/lang/ui-core/es.json b/data/lang/ui-core/es.json index 97d1bc58be2..d6bd5052612 100644 --- a/data/lang/ui-core/es.json +++ b/data/lang/ui-core/es.json @@ -1745,7 +1745,7 @@ }, "START_AT_BARNARDS_STAR_DESC": { "description": "", - "message": "Comienzo de juego difícil en la estación penitenciaria Sistema Administrativo de Descanso." + "message": "Comienzo de juego difícil en la estación penitenciaria Sistema Administrativo Resting." }, "START_AT_EARTH": { "description": "", @@ -1801,7 +1801,7 @@ }, "STATION_ORBIT": { "description": "Information shown in the station loby", - "message": "Estamos en una órbita periódica diaria de {orbit_period} alrededor de {parent_body}." + "message": "Estamos en una órbita periódica diaria de {orbit_period} alrededor de {parent_body}." }, "STATION_TECH_TOO_LOW": { "description": "", @@ -1869,7 +1869,7 @@ }, "TOO_SMALL_TO_TRANSSHIP": { "description": "Ship market error message", - "message": "La nueva nave no dispone de capacidad para la actual carga ni para hipermotor" + "message": "La nueva nave no dispone de capacidad para la carga actual ni para el hiperimpulsor." }, "TOTAL": { "description": "", From 1f93f16d201afe134e018a61b645a93b1c5a08b5 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 26 Jul 2020 09:02:03 -0700 Subject: [PATCH 26/27] Fix the build with USE_SYSTEM_LIBLUA. Fixes https://github.com/pioneerspacesim/pioneer/issues/4939 --- src/lua/LuaMetaType.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lua/LuaMetaType.h b/src/lua/LuaMetaType.h index 234faccd490..aba3f678c40 100644 --- a/src/lua/LuaMetaType.h +++ b/src/lua/LuaMetaType.h @@ -8,7 +8,6 @@ #include "LuaManager.h" #include "LuaPushPull.h" #include "LuaTable.h" -#include "src/lua.h" class LuaMetaTypeBase { public: From 7c7ed5580c01f89e3ade89f423d7f6063ab91bbd Mon Sep 17 00:00:00 2001 From: Webster Sheets Date: Sun, 26 Jul 2020 14:47:18 -0400 Subject: [PATCH 27/27] Update Changelog.txt --- Changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.txt b/Changelog.txt index 2fcb3105e05..d282553a88f 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7,6 +7,7 @@ July 2020 * 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