From 49c827b2c8b9d5d61e9ab06bccdf7b0224cb52b0 Mon Sep 17 00:00:00 2001 From: "yevhenii.chubar" Date: Tue, 29 Dec 2020 17:47:10 +0200 Subject: [PATCH 01/15] Corrected calculations of modification values --- src/app/shipyard/Module.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js index fc702603..6b90c6b1 100755 --- a/src/app/shipyard/Module.js +++ b/src/app/shipyard/Module.js @@ -1,7 +1,8 @@ import * as ModuleUtils from './ModuleUtils'; import { Modifications } from 'coriolis-data/dist'; import React from 'react'; -import { STATS_FORMATTING, SI_PREFIXES } from './StatsFormatting'; +import { SI_PREFIXES, STATS_FORMATTING } from './StatsFormatting'; +import { includes } from 'lodash'; /** * Module - active module in a ship's buildout @@ -41,8 +42,7 @@ export default class Module { * @return {object} The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123 */ getModValue(name, raw) { - let baseVal = this[name]; - let result = this.mods && this.mods[name] ? this.mods[name] : null; + let result = this.mods && this.mods[name] ? this.mods[name] : null; if ((!raw) && this.blueprint && this.blueprint.special) { // This module has a special effect, see if we need to alter our returned value @@ -51,7 +51,8 @@ export default class Module { // this special effect modifies our returned value const modification = Modifications.modifications[name]; const multiplier = modification.type === 'percentage' ? 10000 : 100; - if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') { + + if (includes(['explres', 'kinres', 'thermres', 'causres'], name)) { // Apply resistance modding mechanisms to special effects subsequently result = result + modifierActions[name] * (1 - (this[name] + result / multiplier)) * 100; } else if (modification.method === 'additive') { @@ -59,7 +60,7 @@ export default class Module { } else if (modification.method === 'overwrite') { result = modifierActions[name]; } else { - result = (((1 + result / multiplier) * (1 + modifierActions[name])) - 1) * multiplier; + result = result + modifierActions[name] * multiplier; } } } From 8d9581900fde2d045f7a732ce4b819172001607c Mon Sep 17 00:00:00 2001 From: Ben Zarzycki Date: Wed, 20 Jan 2021 00:05:45 -0800 Subject: [PATCH 02/15] Remove dead code --- src/app/shipyard/Calculations.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/app/shipyard/Calculations.js b/src/app/shipyard/Calculations.js index b237c028..0b9873ff 100644 --- a/src/app/shipyard/Calculations.js +++ b/src/app/shipyard/Calculations.js @@ -341,16 +341,10 @@ export function shieldMetrics(ship, sys) { const maxSysResistance = this.sysResistance(4); let shield = {}; - const dimReturnLine = (res) => 1 - (1 - res) * 0.7; const shieldGeneratorSlot = ship.findInternalByGroup('sg'); if (shieldGeneratorSlot && shieldGeneratorSlot.enabled && shieldGeneratorSlot.m) { const shieldGenerator = shieldGeneratorSlot.m; - let res = { - kin: shieldGenerator.kinres, - therm: shieldGenerator.thermres, - expl: shieldGenerator.explres - }; // Boosters let boost = 1; let boosterExplDmg = 1; @@ -359,9 +353,6 @@ export function shieldMetrics(ship, sys) { for (let slot of ship.hardpoints) { if (slot.enabled && slot.m && slot.m.grp == 'sb') { boost += slot.m.getShieldBoost(); - res.expl += slot.m.getExplosiveResistance(); - res.kin += slot.m.getKineticResistance(); - res.therm += slot.m.getThermalResistance(); boosterExplDmg = boosterExplDmg * (1 - slot.m.getExplosiveResistance()); boosterKinDmg = boosterKinDmg * (1 - slot.m.getKineticResistance()); boosterThermDmg = boosterThermDmg * (1 - slot.m.getThermalResistance()); @@ -549,9 +540,6 @@ export function armourMetrics(ship) { armourReinforcement += slot.m.getHullReinforcement(); // Hull boost for HRPs is applied against the ship's base armour armourReinforcement += ship.baseArmour * slot.m.getModValue('hullboost') / 10000; - // res.expl += slot.m.getExplosiveResistance(); - // res.kin += slot.m.getKineticResistance(); - // res.therm += slot.m.getThermalResistance(); hullExplDmgs.push(1 - slot.m.getExplosiveResistance()); hullKinDmgs.push(1 - slot.m.getKineticResistance()); hullThermDmgs.push(1 - slot.m.getThermalResistance()); From 1db6fe1a3419c275a6a1aa5da576e0bc27c2d8c2 Mon Sep 17 00:00:00 2001 From: VAKazakov <47143965+VAKazakov@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:41:32 +0300 Subject: [PATCH 03/15] Some l18n additions guardians and mining rows addition courtesy of LightEvil --- src/app/i18n/ru.json | 846 +++++++++++++++++++++++-------------------- 1 file changed, 463 insertions(+), 383 deletions(-) diff --git a/src/app/i18n/ru.json b/src/app/i18n/ru.json index 34850dfe..114aa636 100644 --- a/src/app/i18n/ru.json +++ b/src/app/i18n/ru.json @@ -1,384 +1,464 @@ { - "PHRASE_ALT_ALL": "Alt + Нажатие для заполнения всех слотов", - "PHRASE_BACKUP_DESC": "Сохраните все данные перед переносом в другой браузер или устройство", - "PHRASE_CONFIRMATION": "Вы уверены?", - "PHRASE_EXPORT_DESC": "Детальный JSON-экспорт вашей сборки для использования в других местах и инструментах", - "PHRASE_FASTEST_RANGE": "Последовательные прыжки максимальной дальности", - "PHRASE_IMPORT": "Для импорта вставьте код в эту форму", - "PHRASE_LADEN": "Масса корабля с учётом топлива и грузов", - "PHRASE_NO_BUILDS": "Нечего сравнивать", - "PHRASE_NO_RETROCH": "Нет ранних версий сборки", - "PHRASE_SELECT_BUILDS": "Выберите конфигурацию для сравнения", - "PHRASE_SG_RECHARGE": "Восстановление с 50% до 100% объема щита, учитывая полный аккумулятор СИС в начале", - "PHRASE_SG_RECOVER": "Восстановление с 0% до 50% объема щита, учитывая полный аккумулятор СИС в начале", - "PHRASE_UNLADEN": "Масса корабля без учета топлива и грузов", - "PHRASE_UPDATE_RDY": "Доступна новая версия. Нажмите для обновления.", - "PHRASE_ENGAGEMENT_RANGE": "Дистанция между кораблём и целью", - "PHRASE_SELECT_BLUEPRINT": "Нажмите чтобы выбрать чертёж", - "PHRASE_BLUEPRINT_WORST": "Худшие основные значения для чертежа", - "PHRASE_BLUEPRINT_RANDOM": "Случайный выбор между худшими и лучшими значениями для этого чертежа", - "PHRASE_BLUEPRINT_BEST": "Лучшие основные значения для чертежа", - "PHRASE_BLUEPRINT_EXTREME": "Лучшие положительные и худшие отрицательные основные значения для чертежа", - "PHRASE_BLUEPRINT_RESET": "Убрать все изменения и чертёж", - "PHRASE_SELECT_SPECIAL": "Нажмите, чтобы выбрать экспериментальный эффект", - "PHRASE_NO_SPECIAL": "Без экспериментального эффекта", - "PHRASE_SHOPPING_LIST": "Станции, что продают эту сборку", - "PHRASE_REFIT_SHOPPING_LIST": "Станции, что продают необходимые модули", - "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Общий урон, что может быть нанесён в каждым типе, если используются все щитонакопители", - "PHRASE_TIME_TO_LOSE_SHIELDS": "Щиты продержатся", - "PHRASE_TIME_TO_RECOVER_SHIELDS": "Щиты восстановятся за", - "PHRASE_TIME_TO_RECHARGE_SHIELDS": "Щиты будут заряжены за", - "PHRASE_SHIELD_SOURCES": "Подробности энергии щита", - "PHRASE_EFFECTIVE_SHIELD": "Эффективная сила щита против разных типов урона", - "PHRASE_ARMOUR_SOURCES": "Подробности состава брони", - "PHRASE_EFFECTIVE_ARMOUR": "Эффективная сила брони против разных типов урона", - "PHRASE_DAMAGE_TAKEN": "% общих повреждений полученных в разных типах урона", - "PHRASE_TIME_TO_LOSE_ARMOUR": "Броня продержится", - "PHRASE_MODULE_PROTECTION_EXTERNAL": "Защита гнёзд", - "PHRASE_MODULE_PROTECTION_INTERNAL": "Защита всех остальных модулей", - "PHRASE_SHIELD_DAMAGE": "Подробности источников поддерживаемого ДПС против щитов", - "PHRASE_ARMOUR_DAMAGE": "Подробности источников поддерживаемого ДПС против брони", - "PHRASE_TIME_TO_REMOVE_SHIELDS": "Снимет щиты за", - "TT_TIME_TO_REMOVE_SHIELDS": "Непрерывным огнём из всех орудий", - "PHRASE_TIME_TO_REMOVE_ARMOUR": "Снимет броню за", - "TT_TIME_TO_REMOVE_ARMOUR": "Непрерывным огнём из всех орудий", - "PHRASE_TIME_TO_DRAIN_WEP": "Опустошит ОРУЖ за", - "TT_TIME_TO_DRAIN_WEP": "Время, за которое опустошится аккумулятор ОРУЖ при стрельбе из всех орудий", - "TT_TIME_TO_LOSE_SHIELDS": "Против поддерживаемой стрельбы из всех орудий противника", - "TT_TIME_TO_LOSE_ARMOUR": "Против поддерживаемой стрельбы из всех орудий противника", - "TT_MODULE_ARMOUR": "Броня, защищающая модули от урона", - "TT_MODULE_PROTECTION_EXTERNAL": "Процент урона, перенаправленного от гнёзд на наборы для усиления модулей", - "TT_MODULE_PROTECTION_INTERNAL": "Процент урона, перенаправленного от модулей вне гнёзд на наборы для усиления модулей", - "TT_EFFECTIVE_SDPS_SHIELDS": "Реальный поддерживаемый ДПС пока аккумулятор ОРУЖ не пуст", - "TT_EFFECTIVENESS_SHIELDS": "Эффективность в сравнении с попаданием по цели с 0-сопротивляемостью без пунктов в СИС на 0 метрах", - "TT_EFFECTIVE_SDPS_ARMOUR": "Реальный поддерживаемый ДПС пока аккумулятор ОРУЖ не пуст", - "TT_EFFECTIVENESS_ARMOUR": "Эффективность в сравнении с попаданием по цели с 0-сопротивляемостью на 0 метрах", - "PHRASE_EFFECTIVE_SDPS_SHIELDS": "ПДПС против щитов", - "PHRASE_EFFECTIVE_SDPS_ARMOUR": "ПДПС против брони", - "TT_SUMMARY_SPEED": "С полным топливным баком и 4 пунктами в ДВИ", - "TT_SUMMARY_SPEED_NONFUNCTIONAL": "Маневровые двигатели выключены или превышена максимальная масса с топливом и грузом", - "TT_SUMMARY_BOOST": "С полным топливным баком и 4 пунктами в ДВИ", - "TT_SUMMARY_BOOST_NONFUNCTIONAL": "Распределитель питания не может обеспечить достаточно энергии для форсажа", - "TT_SUMMARY_SHIELDS": "Чистая сила щита, включая усилители", - "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": "Шитогенератор отсутствует или выключен", - "TT_SUMMARY_INTEGRITY": "Целостность корабля, включая переборки и наборы для усиления корпуса", - "TT_SUMMARY_HULL_MASS": "Масса корпуса без каких-либо модулей", - "TT_SUMMARY_UNLADEN_MASS": "Масса корпуса и модулей без топлива и груза", - "TT_SUMMARY_LADEN_MASS": "Масса корпуса и модулей с топливом и грузом", - "TT_SUMMARY_DPS": "Урон в секунду при стрельбе из всех орудий", - "TT_SUMMARY_EPS": "Расход аккумулятора ОРУЖ в секунду при стрельбе из всех орудий", - "TT_SUMMARY_TTD": "Время расхода аккумулятора ОРУЖ при стрельбе из всех орудий и с 4 пунктами в ОРУЖ", - "TT_SUMMARY_MAX_SINGLE_JUMP": "Самый дальний возможный прыжок без груза и с топливом, достаточным только на сам прыжок", - "TT_SUMMARY_UNLADEN_SINGLE_JUMP": "Самый дальний возможный прыжок без груза и с полным топливным баком", - "TT_SUMMARY_LADEN_SINGLE_JUMP": "Самый дальний возможный прыжок с полным грузовым отсеком и с полным топливным баком", - "TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Самая дальняя общая дистанция без груза, с полным топливным баком и при прыжках на максимальное расстояние", - "TT_SUMMARY_LADEN_TOTAL_JUMP": "Самая дальняя общая дистанция с полным грузовым отсеком, с полным топливным баком и при прыжках на максимальное расстояние", - "HELP_MODIFICATIONS_MENU": "Нажмите на номер, чтобы ввести новое значение, или потяните вдоль полосы для малых изменений", - "am": "Блок Автом. Полевого Ремонта", - "bh": "Переборки", - "bl": "Пучковый лазер", - "bsg": "Двухпоточный щитогенератор", - "c": "Орудие", - "cc": "Контроллер магнитного снаряда для сбора", - "ch": "Разбрасыватель дипольных отражателей", - "cr": "Грузовой стеллаж", - "cs": "Сканер содержимого", - "dc": "Стыковочный компьютер", - "ec": "Электр. противодействие", - "fc": "Залповое орудие", - "fh": "Ангар для истребителя", - "fi": "FSD-перехватчик", - "fs": "Топливозаборник", - "fsd": "Рамочно-сместительный двигатель", - "ft": "Топливный бак", - "fx": "Контроллер магнитного снаряда для топлива", - "hb": "Контроллер магнитного снаряда для взлома трюма", - "hr": "Набор для усиления корпуса", - "hs": "Теплоотводная катапульта", - "kw": "Сканер преступников", - "ls": "Система жизнеобеспечения", - "mc": "Многоствольное орудие", - "ml": "Проходочный лазер", - "mr": "Ракетный лоток", - "mrp": "Набор для усиления модуля", - "nl": "Мины", - "pa": "Ускоритель плазмы", - "pas": "Комплект для сближения с планетой", - "pc": "Контроллер магнитного снаряда для геологоразведки", - "pce": "Каюта пассажира эконом-класса", - "pci": "Каюта пассажира бизнес-класса", - "pcm": "Каюта пассажира первого класса", - "pcq": "Каюта пассажира класса люкс", - "pd": "Распределитель питания", - "pl": "Импульсный лазер", - "po": "Точечная оборона", - "pp": "Силовая установка", - "psg": "Призматический щитогенератор", - "pv": "Гараж для планетарного транспорта", - "rf": "Устройство переработки", - "rg": "Электромагнитная пушка", - "s": "Сенсоры", - "sb": "Усилитель щита", - "sc": "Сканер обнаружения", - "scb": "Щитонакопитель", - "sg": "Щитогенератор", - "ss": "Сканер поверхностей", - "t": "Маневровые двигатели", - "tp": "Торпедная стойка", - "ul": "Пульсирующие лазеры", - "ws": "Сканер следа FSD", - "emptyrestricted": "пусто (ограниченно)", - "damage dealt to": "Урон нанесён", - "damage received from": "Урон получен от", - "against shields": "Против щитов", - "against hull": "Против корпуса", - "total effective shield": "Общие эффективные щиты", - "ammunition": "Припасы", - "secs": "с", - "rebuildsperbay": "Построек за полосу", - "worst": "Худшее", - "average": "Среднее", - "random": "Случайное", - "best": "Лучшее", - "extreme": "Экстремальное", - "reset": "Сброс", - "dpe": "Урон на МДж энергии", - "dps": "Урон в Секунду", - "sdps": "Поддерживаемый урон в секунду", - "dpssdps": "Урон в секунду (поддерживаемый урон в секунду)", - "eps": "Энергия в секунду", - "epsseps": "Энергия в секунду (поддерживаемая энергия в секунду)", - "hps": "Нагрев в секунду", - "hpsshps": "Нагрев в секунду (поддерживаемый нагрев в секунду)", - "damage by": "Урон", - "damage from": "Урон от", - "shield cells": "Щитонакопители", - "recovery": "включение", - "recharge": "перезарядка", - "engine pips": "Пункты в двигателе", - "4b": "4 пункта и Форсаж", - "speed": "скорость", - "pitch": "Тангаж", - "roll": "Крен", - "yaw": "Рыскание", - "internal protection": "Внутренняя защита", - "external protection": "Внешняя защита", - "engagement range": "Боевое расстояние", - "total": "Всего", - "ammo": "Макс. боекомплект", - "boot": "Время загрузки", - "brokenregen": "Скорость восстановления при пробое", - "burst": "Длина очереди", - "burstrof": "Скорострельность очереди", - "clip": "Размер боекомплекта", - "damage": "Урон", - "distdraw": "Тяга распределителя", - "duration": "Продолжительность", - "eff": "Эффективность", - "engcap": "Ресурс двигателей", - "engrate": "Перезарядка двигателей", - "explres": "Сопротивление взрывам", - "facinglimit": "Ограничение по направлению", - "hullboost": "Увеличение корпуса", - "hullreinforcement": "Укрепление корпуса", - "integrity": "Целостность", - "jitter": "Дрожание", - "kinres": "Сопротивление кинетическому урону", - "maxfuel": "Макс. топлива на прыжок", - "mass": "Масса", - "optmass": "Оптимизированная масса", - "optmul": "Оптимальный усилитель", - "pgen": "Мощность", - "piercing": "Бронебойность", - "power": "Мощность", - "protection": "Защита от повреждений", - "range": "Дальность", - "ranget": "Дальность", - "regen": "Скорость восстановления", - "reload": "Перезагрузить", - "rof": "Скорострельность", - "angle": "Угол сканера", - "scanrate": "Скорость сканера", - "scantime": "Время сканирования", - "shield": "Щит", - "shieldboost": "Усиление щитов", - "shieldreinforcement": "Усилитель щита", - "shotspeed": "Скорость выстрела", - "spinup": "Время раскрутки", - "syscap": "Ресурс систем", - "sysrate": "Перезарядка систем", - "thermload": "Тепловая нагрузка", - "thermres": "Сопротивление термическому урону", - "wepcap": "Орудийный ресурс", - "weprate": "Перезарядка оружия", - "minmass_sg": "Мин. масса корпуса", - "optmass_sg": "Опт. масса корпуса", - "maxmass_sg": "Макс. масса корпуса", - "minmul_sg": "Минимальная прочность", - "optmul_sg": "Оптимальная прочность", - "maxmul_sg": "Максимальная прочность", - "minmass_psg": "Мин. масса корпуса", - "optmass_psg": "Опт. масса корпуса", - "maxmass_psg": "Макс. масса корпуса", - "minmul_psg": "Минимальная прочность", - "optmul_psg": "Оптимальная прочность", - "maxmul_psg": "Максимальная прочность", - "minmass_bsg": "Мин. масса корпуса", - "optmass_bsg": "Опт. масса корпуса", - "maxmass_bsg": "Макс. масса корпуса", - "minmul_bsg": "Минимальная прочность", - "optmul_bsg": "Оптимальная прочность", - "maxmul_bsg": "Максимальная прочность", - "range_s": "Типовой диапозон выброса", - "absolute": "Общий", - "explosive": "Взрывч.", - "kinetic": "Механич.", - "thermal": "Тепл.", - "generator": "Генератор", - "boosters": "Усилители", - "cells": "Ячейки", - "bulkheads": "Переборки", - "reinforcement": "Усилители", - "power and costs": "Энергия и стоимость", - "costs": "Расходы", - "retrofit costs": "цена модификации", - "reload costs": "Стоимость перезарядки", - "profiles": "Графики", - "engine profile": "Двигатели", - "fsd profile": "FSD", - "movement profile": "Движение", - "damage to opponent's shields": "Урон щиту противника", - "damage to opponent's hull": "Урон корпусу противника", - "offence": "Нападение", - "defence": "Оборона", - "shield metrics": "Данные щита", - "raw shield strength": "Чистая мощность щита", - "shield sources": "Ресурсы щита", - "damage taken": "Полученный урон", - "effective shield": "Эффективный щит", - "armour metrics": "Данные брони", - "raw armour strength": "Чистая мощность брони", - "armour sources": "Ресурсы брони", - "raw module armour": "Чистая броня модулей", - "effective armour": "Эффективная броня", - "offence metrics": "Данные нападения", - "defence metrics": "Данные обороны", - "fuel carried": "Топливо на борту", - "cargo carried": "Груз на борту", - "ship control": "Управление кораблём", - "opponent": "Противник", - "opponent's shields": "Щит противника", - "opponent's armour": "Броня противника", - "shield damage sources": "источники урона по щиту", - "armour damage sources": "источники урона по броне", - "never": "Никогда", - "stock": "базовый", - "boost": "форсаж", - "/s": "/с", - "m/s": "м/с", - "Ls": "Св.сек", - "LY": "Св.лет", - "CR": "кр.", - "S": "M", - "M": "С", - "L": "б", - "H": "O", - "U": "B", - "small": "Малый", - "medium": "Средний", - "large": "большой", - "alpha": "Альфа", - "beta": "Бета", - "standard": "Стандартный", - "build name": "название сборки", - "compare all": "сравнить все", - "create new": "Создать новый", - "damage per second": "урон в секунду", - "delete all": "Удалить все", - "detailed export": "Подробный экспорт", - "edit data": "Редактирование", - "empty all": "пусто все", - "Enter Name": "Введите имя", - "farthest range": "быстрый диапазон", - "fuel level": "уровень топлива", - "full tank": "Полный бак", - "internal compartments": "внутренние отсеки", - "jump range": "Дальность прыжка", - "mass lock factor": "Масс. блок", - "max mass": "Максимальная масса", - "net cost": "разница в цене", - "none created": "не создано", - "refuel time": "Время дозаправки", - "retrofit from": "модификация от", - "T-Load": "Тепл.", - "utility mounts": "Вспомогательное оборудование", - "about": "О ...", - "action": "Действие", - "added": "Добавлено", - "armour": "Броня", - "available": "доступно", - "backup": "Резервная копия", - "bins": "контейнеры", - "build": "cборка", - "builds": "cборки", - "buy": "купить", - "cancel": "отменить", - "cargo": "Груз", - "close": "закрыть", - "compare": "сравнить ", - "comparison": "сравнение", - "comparisons": "сравнения", - "cost": "Стоимость", - "create": "создать", - "credits": "Кредиты", - "delete": "Удалить", - "dep": "Вып", - "deployed": "Открыты", - "disabled": "Отключено", - "discount": "Скидка", - "DPS": "УВС", - "efficiency": "Эффективность", - "empty": "пусто", - "ENG": "ДВИ", - "export": "Экспорт", - "forum": "Форум", - "fuel": "Топливо", - "hardpoints": "Орудийные порты", - "hull": "Корпус", - "import": "импортировать ", - "insurance": "Страховка", - "jumps": "Прыжков", - "laden": "Груженый", - "language": "Язык", - "maneuverability": "Маневренность", - "max": "Макс", - "no": "Нет", - "pen": "ПБ", - "permalink": "Постоянная ссылка", - "pri": "Осн", - "proceed": "продолжить", - "PWR": "Эн", - "rate": "скорость", - "rename": "Переименовать", - "repair": "Починка", - "ret": "Убр.", - "retracted": "Убрано", - "ROF": "В/сек", - "save": "Сохранить", - "sell": "Продать", - "settings": "Настройки", - "shields": "Щиты", - "ship": "Корабль", - "ships": "Корабли", - "shortened": "Укороченный", - "size": "размер", - "skip": "пропустить", - "Stock": "Стандартная комплектация", - "SYS": "СИС", - "time": "Время", - "type": "Тип", - "unladen": "Пустой", - "URL": "Ссылка", - "WEP": "ОРУЖ", - "yes": "Да" -} +"PHRASE_ALT_ALL":"Alt + ", +"PHRASE_BACKUP_DESC":" ", +"PHRASE_CONFIRMATION":" ?", +"PHRASE_EXPORT_DESC":" JSON- ", +"PHRASE_FASTEST_RANGE":" ", +"PHRASE_IMPORT":" ", +"PHRASE_LADEN":" ", +"PHRASE_NO_BUILDS":" ", +"PHRASE_NO_RETROCH":" ", +"PHRASE_SELECT_BUILDS":" ", +"PHRASE_SG_RECHARGE":" 50% 100% , ", +"PHRASE_SG_RECOVER":" 0% 50% , ", +"PHRASE_UNLADEN":" ", +"PHRASE_UPDATE_RDY":" . .", +"PHRASE_ENGAGEMENT_RANGE":" ", +"PHRASE_SELECT_BLUEPRINT":" ", +"PHRASE_BLUEPRINT_WORST":" ", +"PHRASE_BLUEPRINT_FIFTY":"50% ", +"PHRASE_BLUEPRINT_SEVEN_FIVE":"75% ", +"PHRASE_BLUEPRINT_RANDOM":" ", +"PHRASE_BLUEPRINT_BEST":" ", +"PHRASE_BLUEPRINT_EXTREME":" ", +"PHRASE_BLUEPRINT_RESET":" ", +"PHRASE_SELECT_SPECIAL":", ", +"PHRASE_NO_SPECIAL":" ", +"PHRASE_SHOPPING_LIST":", ", +"PHRASE_SHOPPING_MATS":" ", +"PHRASE_REFIT_SHOPPING_LIST":", ", +"PHRASE_TOTAL_EFFECTIVE_SHIELD":" , , ", +"PHRASE_TIME_TO_LOSE_SHIELDS":" ", +"PHRASE_TIME_TO_RECOVER_SHIELDS":" ", +"PHRASE_TIME_TO_RECHARGE_SHIELDS":" ", +"PHRASE_SHIELD_SOURCES":" ", +"PHRASE_EFFECTIVE_SHIELD":" ", +"PHRASE_ARMOUR_SOURCES":" ", +"PHRASE_EFFECTIVE_ARMOUR":" ", +"PHRASE_DAMAGE_TAKEN":"% ", +"PHRASE_TIME_TO_LOSE_ARMOUR":" ", +"PHRASE_MODULE_PROTECTION_EXTERNAL":" ", +"PHRASE_MODULE_PROTECTION_INTERNAL":" ", +"PHRASE_OVERALL_DAMAGE":" ", +"PHRASE_SHIELD_DAMAGE":" ", +"PHRASE_ARMOUR_DAMAGE":" ", +"PHRASE_TIME_TO_REMOVE_SHIELDS":" ", +"PHRASE_MULTI_CREW_CAPACITOR_POINTS":" .", +"TT_TIME_TO_REMOVE_SHIELDS":" ", +"PHRASE_TIME_TO_REMOVE_ARMOUR":" ", +"TT_TIME_TO_REMOVE_ARMOUR":" ", +"PHRASE_TIME_TO_DRAIN_WEP":" ", +"TT_TIME_TO_DRAIN_WEP":", ", +"TT_TIME_TO_LOSE_SHIELDS":" ", +"TT_TIME_TO_LOSE_ARMOUR":" ", +"TT_MODULE_ARMOUR":", ", +"TT_MODULE_PROTECTION_EXTERNAL":" , ", +"TT_MODULE_PROTECTION_INTERNAL":" , ", +"TT_EFFECTIVE_SDPS_SHIELDS":" ", +"TT_EFFECTIVENESS_SHIELDS":" 0- 0 ", +"TT_EFFECTIVE_SDPS_ARMOUR":" ", +"TT_EFFECTIVENESS_ARMOUR":" 0- 0 ", +"PHRASE_EFFECTIVE_SDPS_SHIELDS":" ", +"PHRASE_EFFECTIVE_SDPS_ARMOUR":" ", +"TT_SUMMARY_SPEED":" 4 ", +"TT_SUMMARY_SPEED_NONFUNCTIONAL":" ", +"TT_SUMMARY_BOOST":" 4 ", +"TT_SUMMARY_BOOST_INTERVAL":" 4 ", +"TT_SUMMARY_BOOST_NONFUNCTIONAL":" ", +"TT_SUMMARY_SHIELDS":" , ", +"TT_SUMMARY_SHIELDS_SCB":" , SCB", +"TT_SUMMARY_SHIELDS_NONFUNCTIONAL":" ", +"TT_SUMMARY_INTEGRITY":" , ", +"TT_SUMMARY_HULL_MASS":" - ", +"TT_SUMMARY_UNLADEN_MASS":" ", +"TT_SUMMARY_LADEN_MASS":" ", +"TT_SUMMARY_DPS":" ", +"TT_SUMMARY_EPS":" ", +"TT_SUMMARY_TTD":" 4 ", +"TT_SUMMARY_MAX_SINGLE_JUMP":" , ", +"TT_SUMMARY_UNLADEN_SINGLE_JUMP":" ", +"TT_SUMMARY_LADEN_SINGLE_JUMP":" ", +"TT_SUMMARY_UNLADEN_TOTAL_JUMP":" , ", +"TT_SUMMARY_LADEN_TOTAL_JUMP":" , ", +"HELP_MODIFICATIONS_MENU":" , , ", +"PHRASE_FAIL_EDENGINEER":" EDEngineer ( EDEngineer , API , ).", +"PHRASE_FIREFOX_EDENGINEER":" EDEngineer Firefox. , Google Chrome.", +"am":" . ", +"bh":"", +"bl":" ", +"bsg":" ", +"c":"", +"causres":"Caustic resistance", +"cc":" ", +"ch":" ", +"cr":" ", +"cs":" ", +"dc":" ", +"ec":". ", +"fc":" ", +"fh":" ", +"fi":"FSD-", +"fs":"", +"fsd":"- ", +"ft":" ", +"fx":" ", +"hb":" ", +"hr":" ", +"hs":" ", +"kw":" ", +"ls":" ", +"mc":" ", +"axmc":" ", +"ml":" ", +"mr":" ", +"axmr":" ", +"mrp":" ", +"nl":"", +"pa":" ", +"pas":" ", +"pc":" ", +"pce":" -", +"passenger capacity":" ", +"pci":" -", +"pcm":" ", +"pcq":" ", +"pd":" ", +"pl":" ", +"po":" ", +"pp":" ", +"gpp":" C", +"gpd":" ", +"gpc":" ", +"ggc":" ", +"gsrp":" ", +"gfsb":" FSD ", +"ghrp":" ", +"gmrp":" ", +"pwa":" ", +"abl":" ", +"scl":" ", +"sdm":" ", +"tbsc":" ", +"gsc":" ", +"psg":" ", +"pv":" ", +"rf":" ", +"rfl":" ( )", +"rg":" ", +"rsl":"-", +"s":"", +"sb":" ", +"sc":" ", +"scb":"", +"sfn":" ", +"sg":"", +"ss":" ", +"sua":" ", +"t":" ", +"tp":" ", +"ul":" ", +"Send To EDEngineer":" EDEngineer", +"ws":" FSD", +"rpl":"-", +"rcpl":"-", +"xs":" ", +"tbem":" ", +"tbrfl":" ", +"dtl":"-", +"mahr":" ", +"emptyrestricted":" ()", +"damage dealt to":" ", +"damage received from":" ", +"against shields":" ", +"against hull":" ", +"total effective shield":" ", +"ammunition":"", +"secs":"", +"rebuildsperbay":" ", +"mroll":"Roll", +"worst":"", +"average":"", +"random":"", +"best":"", +"extreme":"", +"reset":"", +"dpe":" ", +"dps":" ", +"sdps":" ", +"dpssdps":" ( )", +"eps":" ", +"epsseps":" ( )", +"fallofffromrange":"", +"hps":" ", +"hpsshps":" ( )", +"damage by":"", +"damage from":" ", +"shield cells":"", +"recovery":"", +"recharge":"", +"engine pips":" ", +"4b":"4 ", +"speed":"", +"pitch":"", +"roll":"", +"yaw":"", +"internal protection":" ", +"external protection":" ", +"engagement range":" ", +"boost interval":" ", +"total":"", +"ammo":". ", +"boot":" ", +"hacktime":" ", +"brokenregen":" ", +"burst":" ", +"burstrof":" ", +"clip":" ", +"damage":"", +"distdraw":" ", +"duration":"", +"eff":"", +"engcap":" ", +"engrate":" ", +"explres":" ", +"facinglimit":" ", +"hullboost":" ", +"hullreinforcement":" ", +"integrity":"", +"jitter":"", +"kinres":" ", +"maxfuel":". ", +"mass":"", +"optmass":" ", +"optmul":" ", +"pgen":"", +"piercing":"", +"power":"", +"protection":" ", +"range":"", +"ranget":"", +"regen":" ", +"reload":"", +"rof":"", +"angle":" ", +"scanrate":" ", +"proberadius":" ", +"scantime":" ", +"shield":"", +"armour":"", +"shieldboost":" ", +"shieldreinforcement":" ", +"shotspeed":" ", +"shotdmg":" (DPS)", +"spinup":" ", +"syscap":" ", +"sysrate":" ", +"thermload":" ", +"thermres":" ", +"wepcap":" ", +"weprate":" ", +"minmass_sg":". ", +"optmass_sg":". ", +"maxmass_sg":". ", +"minmul_sg":" ", +"optmul_sg":" ", +"maxmul_sg":" ", +"minmass_psg":". ", +"optmass_psg":". ", +"maxmass_psg":". ", +"minmul_psg":" ", +"optmul_psg":" ", +"maxmul_psg":" ", +"minmass_bsg":". ", +"optmass_bsg":". ", +"maxmass_bsg":". ", +"minmul_bsg":" ", +"optmul_bsg":" ", +"maxmul_bsg":" ", +"range_s":" ", +"absolute":"", +"explosive":".", +"kinetic":".", +"thermal":".", +"caustic":"", +"generator":"", +"boosters":"", +"cells":"", +"shield addition":" ", +"jump addition":" ", +"bulkheads":"", +"reinforcement":"", +"power and costs":" ", +"costs":"", +"retrofit costs":" ", +"reload costs":" ", +"profiles":"", +"engine profile":"", +"fsd profile":"FSD", +"movement profile":"", +"damage to opponent's shields":" ", +"damage to opponent's hull":" ", +"offence":"", +"defence":"", +"shield metrics":" ", +"raw shield strength":" ", +"shield sources":" ", +"damage taken":" ", +"effective shield":" ", +"armour metrics":" ", +"raw armour strength":" ", +"armour sources":" ", +"raw module armour":" ", +"effective armour":" ", +"offence metrics":" ", +"defence metrics":" ", +"fuel carried":" ", +"cargo carried":" ", +"ship control":" ", +"opponent":"", +"opponent's shields":" ", +"opponent's armour":" ", +"overall damage":"overall damage", +"shield damage sources":" ", +"armour damage sources":" ", +"never":"", +"stock":"", +"boost":"", +"tab_defence":"defence", +"federation rank 1":"", +"federation rank 2":"", +"federation rank 3":"", +"federation rank 4":"", +"federation rank 5":" ", +"federation rank 6":"-", +"federation rank 7":"", +"federation rank 8":"", +"federation rank 9":"-", +"federation rank 10":" ", +"federation rank 11":" ", +"federation rank 12":"-", +"federation rank 13":" -", +"federation rank 14":"", +"federation rank required":" ", +"empire rank 1":"", +"empire rank 2":"", +"empire rank 3":"", +"empire rank 4":"", +"empire rank 5":"", +"empire rank 6":"", +"empire rank 7":"", +"empire rank 8":"", +"empire rank 9":"", +"empire rank 10":"", +"empire rank 11":"", +"empire rank 12":"", +"empire rank 13":"", +"empire rank 14":"", +"empire rank required":" ", +"PHRASE_BLUEPRINT_RESET ":" ", +"\/s":"\/", +"m\/s":"\/", +"Ls":".", +"LY":".", +"CR":".", +"S":"M", +"M":"", +"L":"", +"H":"O", +"U":"B", +"small":"", +"medium":"", +"large":"", +"alpha":"", +"beta":"", +"standard":"", +"build name":" ", +"compare all":" ", +"create new":" ", +"damage per second":" ", +"delete all":" ", +"detailed export":" ", +"edit data":"", +"empty all":" ", +"Enter Name":" ", +"farthest range":" ", +"fuel level":" ", +"full tank":" ", +"internal compartments":" ", +"jump range":" ", +"mass lock factor":". ", +"max mass":" ", +"net cost":" ", +"none created":" ", +"refuel time":" ", +"retrofit from":" ", +"T-Load":".", +"utility mounts":" ", +"about":" ...", +"action":"", +"added":"", +"available":"", +"backup":" ", +"bins":"", +"build":"c", +"builds":"c", +"buy":"", +"cancel":"", +"cargo":"", +"close":"", +"compare":" ", +"comparison":"", +"comparisons":"", +"cost":"", +"create":"", +"credits":"", +"delete":"", +"dep":"", +"deployed":"", +"disabled":"", +"discount":"", +"DPS":"", +"efficiency":"", +"empty":"", +"ENG":"", +"export":"", +"forum":"", +"fuel":"", +"hardpoints":" ", +"hull":"", +"import":" ", +"insurance":"", +"jumps":"", +"laden":"", +"language":"", +"maneuverability":"", +"max":"", +"no":"", +"pen":"", +"permalink":" ", +"pri":"", +"proceed":"", +"PWR":"", +"rate":"", +"rename":"", +"repair":"", +"ret":".", +"retracted":"", +"ROF":"\/", +"save":"", +"sell":"", +"settings":"", +"shields":"", +"ship":"", +"ships":"", +"shortened":"", +"size":"", +"skip":"", +"Stock":" ", +"SYS":"", +"time":"", +"type":"", +"unladen":"", +"URL":"", +"WEP":"", +"yes":""} \ No newline at end of file From 0da00d38a4e175486b7527bdc21c145edf78015a Mon Sep 17 00:00:00 2001 From: VAKazakov <47143965+VAKazakov@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:47:44 +0300 Subject: [PATCH 04/15] fixed indentation for easy comparing --- src/app/i18n/ru.json | 927 ++++++++++++++++++++++--------------------- 1 file changed, 464 insertions(+), 463 deletions(-) diff --git a/src/app/i18n/ru.json b/src/app/i18n/ru.json index 114aa636..77badc5d 100644 --- a/src/app/i18n/ru.json +++ b/src/app/i18n/ru.json @@ -1,464 +1,465 @@ { -"PHRASE_ALT_ALL":"Alt + ", -"PHRASE_BACKUP_DESC":" ", -"PHRASE_CONFIRMATION":" ?", -"PHRASE_EXPORT_DESC":" JSON- ", -"PHRASE_FASTEST_RANGE":" ", -"PHRASE_IMPORT":" ", -"PHRASE_LADEN":" ", -"PHRASE_NO_BUILDS":" ", -"PHRASE_NO_RETROCH":" ", -"PHRASE_SELECT_BUILDS":" ", -"PHRASE_SG_RECHARGE":" 50% 100% , ", -"PHRASE_SG_RECOVER":" 0% 50% , ", -"PHRASE_UNLADEN":" ", -"PHRASE_UPDATE_RDY":" . .", -"PHRASE_ENGAGEMENT_RANGE":" ", -"PHRASE_SELECT_BLUEPRINT":" ", -"PHRASE_BLUEPRINT_WORST":" ", -"PHRASE_BLUEPRINT_FIFTY":"50% ", -"PHRASE_BLUEPRINT_SEVEN_FIVE":"75% ", -"PHRASE_BLUEPRINT_RANDOM":" ", -"PHRASE_BLUEPRINT_BEST":" ", -"PHRASE_BLUEPRINT_EXTREME":" ", -"PHRASE_BLUEPRINT_RESET":" ", -"PHRASE_SELECT_SPECIAL":", ", -"PHRASE_NO_SPECIAL":" ", -"PHRASE_SHOPPING_LIST":", ", -"PHRASE_SHOPPING_MATS":" ", -"PHRASE_REFIT_SHOPPING_LIST":", ", -"PHRASE_TOTAL_EFFECTIVE_SHIELD":" , , ", -"PHRASE_TIME_TO_LOSE_SHIELDS":" ", -"PHRASE_TIME_TO_RECOVER_SHIELDS":" ", -"PHRASE_TIME_TO_RECHARGE_SHIELDS":" ", -"PHRASE_SHIELD_SOURCES":" ", -"PHRASE_EFFECTIVE_SHIELD":" ", -"PHRASE_ARMOUR_SOURCES":" ", -"PHRASE_EFFECTIVE_ARMOUR":" ", -"PHRASE_DAMAGE_TAKEN":"% ", -"PHRASE_TIME_TO_LOSE_ARMOUR":" ", -"PHRASE_MODULE_PROTECTION_EXTERNAL":" ", -"PHRASE_MODULE_PROTECTION_INTERNAL":" ", -"PHRASE_OVERALL_DAMAGE":" ", -"PHRASE_SHIELD_DAMAGE":" ", -"PHRASE_ARMOUR_DAMAGE":" ", -"PHRASE_TIME_TO_REMOVE_SHIELDS":" ", -"PHRASE_MULTI_CREW_CAPACITOR_POINTS":" .", -"TT_TIME_TO_REMOVE_SHIELDS":" ", -"PHRASE_TIME_TO_REMOVE_ARMOUR":" ", -"TT_TIME_TO_REMOVE_ARMOUR":" ", -"PHRASE_TIME_TO_DRAIN_WEP":" ", -"TT_TIME_TO_DRAIN_WEP":", ", -"TT_TIME_TO_LOSE_SHIELDS":" ", -"TT_TIME_TO_LOSE_ARMOUR":" ", -"TT_MODULE_ARMOUR":", ", -"TT_MODULE_PROTECTION_EXTERNAL":" , ", -"TT_MODULE_PROTECTION_INTERNAL":" , ", -"TT_EFFECTIVE_SDPS_SHIELDS":" ", -"TT_EFFECTIVENESS_SHIELDS":" 0- 0 ", -"TT_EFFECTIVE_SDPS_ARMOUR":" ", -"TT_EFFECTIVENESS_ARMOUR":" 0- 0 ", -"PHRASE_EFFECTIVE_SDPS_SHIELDS":" ", -"PHRASE_EFFECTIVE_SDPS_ARMOUR":" ", -"TT_SUMMARY_SPEED":" 4 ", -"TT_SUMMARY_SPEED_NONFUNCTIONAL":" ", -"TT_SUMMARY_BOOST":" 4 ", -"TT_SUMMARY_BOOST_INTERVAL":" 4 ", -"TT_SUMMARY_BOOST_NONFUNCTIONAL":" ", -"TT_SUMMARY_SHIELDS":" , ", -"TT_SUMMARY_SHIELDS_SCB":" , SCB", -"TT_SUMMARY_SHIELDS_NONFUNCTIONAL":" ", -"TT_SUMMARY_INTEGRITY":" , ", -"TT_SUMMARY_HULL_MASS":" - ", -"TT_SUMMARY_UNLADEN_MASS":" ", -"TT_SUMMARY_LADEN_MASS":" ", -"TT_SUMMARY_DPS":" ", -"TT_SUMMARY_EPS":" ", -"TT_SUMMARY_TTD":" 4 ", -"TT_SUMMARY_MAX_SINGLE_JUMP":" , ", -"TT_SUMMARY_UNLADEN_SINGLE_JUMP":" ", -"TT_SUMMARY_LADEN_SINGLE_JUMP":" ", -"TT_SUMMARY_UNLADEN_TOTAL_JUMP":" , ", -"TT_SUMMARY_LADEN_TOTAL_JUMP":" , ", -"HELP_MODIFICATIONS_MENU":" , , ", -"PHRASE_FAIL_EDENGINEER":" EDEngineer ( EDEngineer , API , ).", -"PHRASE_FIREFOX_EDENGINEER":" EDEngineer Firefox. , Google Chrome.", -"am":" . ", -"bh":"", -"bl":" ", -"bsg":" ", -"c":"", -"causres":"Caustic resistance", -"cc":" ", -"ch":" ", -"cr":" ", -"cs":" ", -"dc":" ", -"ec":". ", -"fc":" ", -"fh":" ", -"fi":"FSD-", -"fs":"", -"fsd":"- ", -"ft":" ", -"fx":" ", -"hb":" ", -"hr":" ", -"hs":" ", -"kw":" ", -"ls":" ", -"mc":" ", -"axmc":" ", -"ml":" ", -"mr":" ", -"axmr":" ", -"mrp":" ", -"nl":"", -"pa":" ", -"pas":" ", -"pc":" ", -"pce":" -", -"passenger capacity":" ", -"pci":" -", -"pcm":" ", -"pcq":" ", -"pd":" ", -"pl":" ", -"po":" ", -"pp":" ", -"gpp":" C", -"gpd":" ", -"gpc":" ", -"ggc":" ", -"gsrp":" ", -"gfsb":" FSD ", -"ghrp":" ", -"gmrp":" ", -"pwa":" ", -"abl":" ", -"scl":" ", -"sdm":" ", -"tbsc":" ", -"gsc":" ", -"psg":" ", -"pv":" ", -"rf":" ", -"rfl":" ( )", -"rg":" ", -"rsl":"-", -"s":"", -"sb":" ", -"sc":" ", -"scb":"", -"sfn":" ", -"sg":"", -"ss":" ", -"sua":" ", -"t":" ", -"tp":" ", -"ul":" ", -"Send To EDEngineer":" EDEngineer", -"ws":" FSD", -"rpl":"-", -"rcpl":"-", -"xs":" ", -"tbem":" ", -"tbrfl":" ", -"dtl":"-", -"mahr":" ", -"emptyrestricted":" ()", -"damage dealt to":" ", -"damage received from":" ", -"against shields":" ", -"against hull":" ", -"total effective shield":" ", -"ammunition":"", -"secs":"", -"rebuildsperbay":" ", -"mroll":"Roll", -"worst":"", -"average":"", -"random":"", -"best":"", -"extreme":"", -"reset":"", -"dpe":" ", -"dps":" ", -"sdps":" ", -"dpssdps":" ( )", -"eps":" ", -"epsseps":" ( )", -"fallofffromrange":"", -"hps":" ", -"hpsshps":" ( )", -"damage by":"", -"damage from":" ", -"shield cells":"", -"recovery":"", -"recharge":"", -"engine pips":" ", -"4b":"4 ", -"speed":"", -"pitch":"", -"roll":"", -"yaw":"", -"internal protection":" ", -"external protection":" ", -"engagement range":" ", -"boost interval":" ", -"total":"", -"ammo":". ", -"boot":" ", -"hacktime":" ", -"brokenregen":" ", -"burst":" ", -"burstrof":" ", -"clip":" ", -"damage":"", -"distdraw":" ", -"duration":"", -"eff":"", -"engcap":" ", -"engrate":" ", -"explres":" ", -"facinglimit":" ", -"hullboost":" ", -"hullreinforcement":" ", -"integrity":"", -"jitter":"", -"kinres":" ", -"maxfuel":". ", -"mass":"", -"optmass":" ", -"optmul":" ", -"pgen":"", -"piercing":"", -"power":"", -"protection":" ", -"range":"", -"ranget":"", -"regen":" ", -"reload":"", -"rof":"", -"angle":" ", -"scanrate":" ", -"proberadius":" ", -"scantime":" ", -"shield":"", -"armour":"", -"shieldboost":" ", -"shieldreinforcement":" ", -"shotspeed":" ", -"shotdmg":" (DPS)", -"spinup":" ", -"syscap":" ", -"sysrate":" ", -"thermload":" ", -"thermres":" ", -"wepcap":" ", -"weprate":" ", -"minmass_sg":". ", -"optmass_sg":". ", -"maxmass_sg":". ", -"minmul_sg":" ", -"optmul_sg":" ", -"maxmul_sg":" ", -"minmass_psg":". ", -"optmass_psg":". ", -"maxmass_psg":". ", -"minmul_psg":" ", -"optmul_psg":" ", -"maxmul_psg":" ", -"minmass_bsg":". ", -"optmass_bsg":". ", -"maxmass_bsg":". ", -"minmul_bsg":" ", -"optmul_bsg":" ", -"maxmul_bsg":" ", -"range_s":" ", -"absolute":"", -"explosive":".", -"kinetic":".", -"thermal":".", -"caustic":"", -"generator":"", -"boosters":"", -"cells":"", -"shield addition":" ", -"jump addition":" ", -"bulkheads":"", -"reinforcement":"", -"power and costs":" ", -"costs":"", -"retrofit costs":" ", -"reload costs":" ", -"profiles":"", -"engine profile":"", -"fsd profile":"FSD", -"movement profile":"", -"damage to opponent's shields":" ", -"damage to opponent's hull":" ", -"offence":"", -"defence":"", -"shield metrics":" ", -"raw shield strength":" ", -"shield sources":" ", -"damage taken":" ", -"effective shield":" ", -"armour metrics":" ", -"raw armour strength":" ", -"armour sources":" ", -"raw module armour":" ", -"effective armour":" ", -"offence metrics":" ", -"defence metrics":" ", -"fuel carried":" ", -"cargo carried":" ", -"ship control":" ", -"opponent":"", -"opponent's shields":" ", -"opponent's armour":" ", -"overall damage":"overall damage", -"shield damage sources":" ", -"armour damage sources":" ", -"never":"", -"stock":"", -"boost":"", -"tab_defence":"defence", -"federation rank 1":"", -"federation rank 2":"", -"federation rank 3":"", -"federation rank 4":"", -"federation rank 5":" ", -"federation rank 6":"-", -"federation rank 7":"", -"federation rank 8":"", -"federation rank 9":"-", -"federation rank 10":" ", -"federation rank 11":" ", -"federation rank 12":"-", -"federation rank 13":" -", -"federation rank 14":"", -"federation rank required":" ", -"empire rank 1":"", -"empire rank 2":"", -"empire rank 3":"", -"empire rank 4":"", -"empire rank 5":"", -"empire rank 6":"", -"empire rank 7":"", -"empire rank 8":"", -"empire rank 9":"", -"empire rank 10":"", -"empire rank 11":"", -"empire rank 12":"", -"empire rank 13":"", -"empire rank 14":"", -"empire rank required":" ", -"PHRASE_BLUEPRINT_RESET ":" ", -"\/s":"\/", -"m\/s":"\/", -"Ls":".", -"LY":".", -"CR":".", -"S":"M", -"M":"", -"L":"", -"H":"O", -"U":"B", -"small":"", -"medium":"", -"large":"", -"alpha":"", -"beta":"", -"standard":"", -"build name":" ", -"compare all":" ", -"create new":" ", -"damage per second":" ", -"delete all":" ", -"detailed export":" ", -"edit data":"", -"empty all":" ", -"Enter Name":" ", -"farthest range":" ", -"fuel level":" ", -"full tank":" ", -"internal compartments":" ", -"jump range":" ", -"mass lock factor":". ", -"max mass":" ", -"net cost":" ", -"none created":" ", -"refuel time":" ", -"retrofit from":" ", -"T-Load":".", -"utility mounts":" ", -"about":" ...", -"action":"", -"added":"", -"available":"", -"backup":" ", -"bins":"", -"build":"c", -"builds":"c", -"buy":"", -"cancel":"", -"cargo":"", -"close":"", -"compare":" ", -"comparison":"", -"comparisons":"", -"cost":"", -"create":"", -"credits":"", -"delete":"", -"dep":"", -"deployed":"", -"disabled":"", -"discount":"", -"DPS":"", -"efficiency":"", -"empty":"", -"ENG":"", -"export":"", -"forum":"", -"fuel":"", -"hardpoints":" ", -"hull":"", -"import":" ", -"insurance":"", -"jumps":"", -"laden":"", -"language":"", -"maneuverability":"", -"max":"", -"no":"", -"pen":"", -"permalink":" ", -"pri":"", -"proceed":"", -"PWR":"", -"rate":"", -"rename":"", -"repair":"", -"ret":".", -"retracted":"", -"ROF":"\/", -"save":"", -"sell":"", -"settings":"", -"shields":"", -"ship":"", -"ships":"", -"shortened":"", -"size":"", -"skip":"", -"Stock":" ", -"SYS":"", -"time":"", -"type":"", -"unladen":"", -"URL":"", -"WEP":"", -"yes":""} \ No newline at end of file + "PHRASE_ALT_ALL":"Alt + ", + "PHRASE_BACKUP_DESC":" ", + "PHRASE_CONFIRMATION":" ?", + "PHRASE_EXPORT_DESC":" JSON- ", + "PHRASE_FASTEST_RANGE":" ", + "PHRASE_IMPORT":" ", + "PHRASE_LADEN":" ", + "PHRASE_NO_BUILDS":" ", + "PHRASE_NO_RETROCH":" ", + "PHRASE_SELECT_BUILDS":" ", + "PHRASE_SG_RECHARGE":" 50% 100% , ", + "PHRASE_SG_RECOVER":" 0% 50% , ", + "PHRASE_UNLADEN":" ", + "PHRASE_UPDATE_RDY":" . .", + "PHRASE_ENGAGEMENT_RANGE":" ", + "PHRASE_SELECT_BLUEPRINT":" ", + "PHRASE_BLUEPRINT_WORST":" ", + "PHRASE_BLUEPRINT_FIFTY":"50% ", + "PHRASE_BLUEPRINT_SEVEN_FIVE":"75% ", + "PHRASE_BLUEPRINT_RANDOM":" ", + "PHRASE_BLUEPRINT_BEST":" ", + "PHRASE_BLUEPRINT_EXTREME":" ", + "PHRASE_BLUEPRINT_RESET":" ", + "PHRASE_SELECT_SPECIAL":", ", + "PHRASE_NO_SPECIAL":" ", + "PHRASE_SHOPPING_LIST":", ", + "PHRASE_SHOPPING_MATS":" ", + "PHRASE_REFIT_SHOPPING_LIST":", ", + "PHRASE_TOTAL_EFFECTIVE_SHIELD":" , , ", + "PHRASE_TIME_TO_LOSE_SHIELDS":" ", + "PHRASE_TIME_TO_RECOVER_SHIELDS":" ", + "PHRASE_TIME_TO_RECHARGE_SHIELDS":" ", + "PHRASE_SHIELD_SOURCES":" ", + "PHRASE_EFFECTIVE_SHIELD":" ", + "PHRASE_ARMOUR_SOURCES":" ", + "PHRASE_EFFECTIVE_ARMOUR":" ", + "PHRASE_DAMAGE_TAKEN":"% ", + "PHRASE_TIME_TO_LOSE_ARMOUR":" ", + "PHRASE_MODULE_PROTECTION_EXTERNAL":" ", + "PHRASE_MODULE_PROTECTION_INTERNAL":" ", + "PHRASE_OVERALL_DAMAGE":" ", + "PHRASE_SHIELD_DAMAGE":" ", + "PHRASE_ARMOUR_DAMAGE":" ", + "PHRASE_TIME_TO_REMOVE_SHIELDS":" ", + "PHRASE_MULTI_CREW_CAPACITOR_POINTS":" .", + "TT_TIME_TO_REMOVE_SHIELDS":" ", + "PHRASE_TIME_TO_REMOVE_ARMOUR":" ", + "TT_TIME_TO_REMOVE_ARMOUR":" ", + "PHRASE_TIME_TO_DRAIN_WEP":" ", + "TT_TIME_TO_DRAIN_WEP":", ", + "TT_TIME_TO_LOSE_SHIELDS":" ", + "TT_TIME_TO_LOSE_ARMOUR":" ", + "TT_MODULE_ARMOUR":", ", + "TT_MODULE_PROTECTION_EXTERNAL":" , ", + "TT_MODULE_PROTECTION_INTERNAL":" , ", + "TT_EFFECTIVE_SDPS_SHIELDS":" ", + "TT_EFFECTIVENESS_SHIELDS":" 0- 0 ", + "TT_EFFECTIVE_SDPS_ARMOUR":" ", + "TT_EFFECTIVENESS_ARMOUR":" 0- 0 ", + "PHRASE_EFFECTIVE_SDPS_SHIELDS":" ", + "PHRASE_EFFECTIVE_SDPS_ARMOUR":" ", + "TT_SUMMARY_SPEED":" 4 ", + "TT_SUMMARY_SPEED_NONFUNCTIONAL":" ", + "TT_SUMMARY_BOOST":" 4 ", + "TT_SUMMARY_BOOST_INTERVAL":" 4 ", + "TT_SUMMARY_BOOST_NONFUNCTIONAL":" ", + "TT_SUMMARY_SHIELDS":" , ", + "TT_SUMMARY_SHIELDS_SCB":" , SCB", + "TT_SUMMARY_SHIELDS_NONFUNCTIONAL":" ", + "TT_SUMMARY_INTEGRITY":" , ", + "TT_SUMMARY_HULL_MASS":" - ", + "TT_SUMMARY_UNLADEN_MASS":" ", + "TT_SUMMARY_LADEN_MASS":" ", + "TT_SUMMARY_DPS":" ", + "TT_SUMMARY_EPS":" ", + "TT_SUMMARY_TTD":" 4 ", + "TT_SUMMARY_MAX_SINGLE_JUMP":" , ", + "TT_SUMMARY_UNLADEN_SINGLE_JUMP":" ", + "TT_SUMMARY_LADEN_SINGLE_JUMP":" ", + "TT_SUMMARY_UNLADEN_TOTAL_JUMP":" , ", + "TT_SUMMARY_LADEN_TOTAL_JUMP":" , ", + "HELP_MODIFICATIONS_MENU":" , , ", + "PHRASE_FAIL_EDENGINEER":" EDEngineer ( EDEngineer , API , ).", + "PHRASE_FIREFOX_EDENGINEER":" EDEngineer Firefox. , Google Chrome.", + "am":" . ", + "bh":"", + "bl":" ", + "bsg":" ", + "c":"", + "causres":"Caustic resistance", + "cc":" ", + "ch":" ", + "cr":" ", + "cs":" ", + "dc":" ", + "ec":". ", + "fc":" ", + "fh":" ", + "fi":"FSD-", + "fs":"", + "fsd":"- ", + "ft":" ", + "fx":" ", + "hb":" ", + "hr":" ", + "hs":" ", + "kw":" ", + "ls":" ", + "mc":" ", + "axmc":" ", + "ml":" ", + "mr":" ", + "axmr":" ", + "mrp":" ", + "nl":"", + "pa":" ", + "pas":" ", + "pc":" ", + "pce":" -", + "passenger capacity":" ", + "pci":" -", + "pcm":" ", + "pcq":" ", + "pd":" ", + "pl":" ", + "po":" ", + "pp":" ", + "gpp":" C", + "gpd":" ", + "gpc":" ", + "ggc":" ", + "gsrp":" ", + "gfsb":" FSD ", + "ghrp":" ", + "gmrp":" ", + "pwa":" ", + "abl":" ", + "scl":" ", + "sdm":" ", + "tbsc":" ", + "gsc":" ", + "psg":" ", + "pv":" ", + "rf":" ", + "rfl":" ( )", + "rg":" ", + "rsl":"-", + "s":"", + "sb":" ", + "sc":" ", + "scb":"", + "sfn":" ", + "sg":"", + "ss":" ", + "sua":" ", + "t":" ", + "tp":" ", + "ul":" ", + "Send To EDEngineer":" EDEngineer", + "ws":" FSD", + "rpl":"-", + "rcpl":"-", + "xs":" ", + "tbem":" ", + "tbrfl":" ", + "dtl":"-", + "mahr":" ", + "emptyrestricted":" ()", + "damage dealt to":" ", + "damage received from":" ", + "against shields":" ", + "against hull":" ", + "total effective shield":" ", + "ammunition":"", + "secs":"", + "rebuildsperbay":" ", + "mroll":"Roll", + "worst":"", + "average":"", + "random":"", + "best":"", + "extreme":"", + "reset":"", + "dpe":" ", + "dps":" ", + "sdps":" ", + "dpssdps":" ( )", + "eps":" ", + "epsseps":" ( )", + "fallofffromrange":"", + "hps":" ", + "hpsshps":" ( )", + "damage by":"", + "damage from":" ", + "shield cells":"", + "recovery":"", + "recharge":"", + "engine pips":" ", + "4b":"4 ", + "speed":"", + "pitch":"", + "roll":"", + "yaw":"", + "internal protection":" ", + "external protection":" ", + "engagement range":" ", + "boost interval":" ", + "total":"", + "ammo":". ", + "boot":" ", + "hacktime":" ", + "brokenregen":" ", + "burst":" ", + "burstrof":" ", + "clip":" ", + "damage":"", + "distdraw":" ", + "duration":"", + "eff":"", + "engcap":" ", + "engrate":" ", + "explres":" ", + "facinglimit":" ", + "hullboost":" ", + "hullreinforcement":" ", + "integrity":"", + "jitter":"", + "kinres":" ", + "maxfuel":". ", + "mass":"", + "optmass":" ", + "optmul":" ", + "pgen":"", + "piercing":"", + "power":"", + "protection":" ", + "range":"", + "ranget":"", + "regen":" ", + "reload":"", + "rof":"", + "angle":" ", + "scanrate":" ", + "proberadius":" ", + "scantime":" ", + "shield":"", + "armour":"", + "shieldboost":" ", + "shieldreinforcement":" ", + "shotspeed":" ", + "shotdmg":" (DPS)", + "spinup":" ", + "syscap":" ", + "sysrate":" ", + "thermload":" ", + "thermres":" ", + "wepcap":" ", + "weprate":" ", + "minmass_sg":". ", + "optmass_sg":". ", + "maxmass_sg":". ", + "minmul_sg":" ", + "optmul_sg":" ", + "maxmul_sg":" ", + "minmass_psg":". ", + "optmass_psg":". ", + "maxmass_psg":". ", + "minmul_psg":" ", + "optmul_psg":" ", + "maxmul_psg":" ", + "minmass_bsg":". ", + "optmass_bsg":". ", + "maxmass_bsg":". ", + "minmul_bsg":" ", + "optmul_bsg":" ", + "maxmul_bsg":" ", + "range_s":" ", + "absolute":"", + "explosive":".", + "kinetic":".", + "thermal":".", + "caustic":"", + "generator":"", + "boosters":"", + "cells":"", + "shield addition":" ", + "jump addition":" ", + "bulkheads":"", + "reinforcement":"", + "power and costs":" ", + "costs":"", + "retrofit costs":" ", + "reload costs":" ", + "profiles":"", + "engine profile":"", + "fsd profile":"FSD", + "movement profile":"", + "damage to opponent's shields":" ", + "damage to opponent's hull":" ", + "offence":"", + "defence":"", + "shield metrics":" ", + "raw shield strength":" ", + "shield sources":" ", + "damage taken":" ", + "effective shield":" ", + "armour metrics":" ", + "raw armour strength":" ", + "armour sources":" ", + "raw module armour":" ", + "effective armour":" ", + "offence metrics":" ", + "defence metrics":" ", + "fuel carried":" ", + "cargo carried":" ", + "ship control":" ", + "opponent":"", + "opponent's shields":" ", + "opponent's armour":" ", + "overall damage":"overall damage", + "shield damage sources":" ", + "armour damage sources":" ", + "never":"", + "stock":"", + "boost":"", + "tab_defence":"defence", + "federation rank 1":"", + "federation rank 2":"", + "federation rank 3":"", + "federation rank 4":"", + "federation rank 5":" ", + "federation rank 6":"-", + "federation rank 7":"", + "federation rank 8":"", + "federation rank 9":"-", + "federation rank 10":" ", + "federation rank 11":" ", + "federation rank 12":"-", + "federation rank 13":" -", + "federation rank 14":"", + "federation rank required":" ", + "empire rank 1":"", + "empire rank 2":"", + "empire rank 3":"", + "empire rank 4":"", + "empire rank 5":"", + "empire rank 6":"", + "empire rank 7":"", + "empire rank 8":"", + "empire rank 9":"", + "empire rank 10":"", + "empire rank 11":"", + "empire rank 12":"", + "empire rank 13":"", + "empire rank 14":"", + "empire rank required":" ", + "PHRASE_BLUEPRINT_RESET ":" ", + "\/s":"\/", + "m\/s":"\/", + "Ls":".", + "LY":".", + "CR":".", + "S":"M", + "M":"", + "L":"", + "H":"O", + "U":"B", + "small":"", + "medium":"", + "large":"", + "alpha":"", + "beta":"", + "standard":"", + "build name":" ", + "compare all":" ", + "create new":" ", + "damage per second":" ", + "delete all":" ", + "detailed export":" ", + "edit data":"", + "empty all":" ", + "Enter Name":" ", + "farthest range":" ", + "fuel level":" ", + "full tank":" ", + "internal compartments":" ", + "jump range":" ", + "mass lock factor":". ", + "max mass":" ", + "net cost":" ", + "none created":" ", + "refuel time":" ", + "retrofit from":" ", + "T-Load":".", + "utility mounts":" ", + "about":" ...", + "action":"", + "added":"", + "available":"", + "backup":" ", + "bins":"", + "build":"c", + "builds":"c", + "buy":"", + "cancel":"", + "cargo":"", + "close":"", + "compare":" ", + "comparison":"", + "comparisons":"", + "cost":"", + "create":"", + "credits":"", + "delete":"", + "dep":"", + "deployed":"", + "disabled":"", + "discount":"", + "DPS":"", + "efficiency":"", + "empty":"", + "ENG":"", + "export":"", + "forum":"", + "fuel":"", + "hardpoints":" ", + "hull":"", + "import":" ", + "insurance":"", + "jumps":"", + "laden":"", + "language":"", + "maneuverability":"", + "max":"", + "no":"", + "pen":"", + "permalink":" ", + "pri":"", + "proceed":"", + "PWR":"", + "rate":"", + "rename":"", + "repair":"", + "ret":".", + "retracted":"", + "ROF":"\/", + "save":"", + "sell":"", + "settings":"", + "shields":"", + "ship":"", + "ships":"", + "shortened":"", + "size":"", + "skip":"", + "Stock":" ", + "SYS":"", + "time":"", + "type":"", + "unladen":"", + "URL":"", + "WEP":"", + "yes":"" +} \ No newline at end of file From 4001e1e9ac25d4fccb46bad96fc8384509338466 Mon Sep 17 00:00:00 2001 From: VAKazakov <47143965+VAKazakov@users.noreply.github.com> Date: Mon, 25 Jan 2021 21:54:43 +0300 Subject: [PATCH 05/15] changing `:` to `: ` --- src/app/i18n/ru.json | 928 +++++++++++++++++++++---------------------- 1 file changed, 464 insertions(+), 464 deletions(-) diff --git a/src/app/i18n/ru.json b/src/app/i18n/ru.json index 77badc5d..d0fcdd3f 100644 --- a/src/app/i18n/ru.json +++ b/src/app/i18n/ru.json @@ -1,465 +1,465 @@ { - "PHRASE_ALT_ALL":"Alt + ", - "PHRASE_BACKUP_DESC":" ", - "PHRASE_CONFIRMATION":" ?", - "PHRASE_EXPORT_DESC":" JSON- ", - "PHRASE_FASTEST_RANGE":" ", - "PHRASE_IMPORT":" ", - "PHRASE_LADEN":" ", - "PHRASE_NO_BUILDS":" ", - "PHRASE_NO_RETROCH":" ", - "PHRASE_SELECT_BUILDS":" ", - "PHRASE_SG_RECHARGE":" 50% 100% , ", - "PHRASE_SG_RECOVER":" 0% 50% , ", - "PHRASE_UNLADEN":" ", - "PHRASE_UPDATE_RDY":" . .", - "PHRASE_ENGAGEMENT_RANGE":" ", - "PHRASE_SELECT_BLUEPRINT":" ", - "PHRASE_BLUEPRINT_WORST":" ", - "PHRASE_BLUEPRINT_FIFTY":"50% ", - "PHRASE_BLUEPRINT_SEVEN_FIVE":"75% ", - "PHRASE_BLUEPRINT_RANDOM":" ", - "PHRASE_BLUEPRINT_BEST":" ", - "PHRASE_BLUEPRINT_EXTREME":" ", - "PHRASE_BLUEPRINT_RESET":" ", - "PHRASE_SELECT_SPECIAL":", ", - "PHRASE_NO_SPECIAL":" ", - "PHRASE_SHOPPING_LIST":", ", - "PHRASE_SHOPPING_MATS":" ", - "PHRASE_REFIT_SHOPPING_LIST":", ", - "PHRASE_TOTAL_EFFECTIVE_SHIELD":" , , ", - "PHRASE_TIME_TO_LOSE_SHIELDS":" ", - "PHRASE_TIME_TO_RECOVER_SHIELDS":" ", - "PHRASE_TIME_TO_RECHARGE_SHIELDS":" ", - "PHRASE_SHIELD_SOURCES":" ", - "PHRASE_EFFECTIVE_SHIELD":" ", - "PHRASE_ARMOUR_SOURCES":" ", - "PHRASE_EFFECTIVE_ARMOUR":" ", - "PHRASE_DAMAGE_TAKEN":"% ", - "PHRASE_TIME_TO_LOSE_ARMOUR":" ", - "PHRASE_MODULE_PROTECTION_EXTERNAL":" ", - "PHRASE_MODULE_PROTECTION_INTERNAL":" ", - "PHRASE_OVERALL_DAMAGE":" ", - "PHRASE_SHIELD_DAMAGE":" ", - "PHRASE_ARMOUR_DAMAGE":" ", - "PHRASE_TIME_TO_REMOVE_SHIELDS":" ", - "PHRASE_MULTI_CREW_CAPACITOR_POINTS":" .", - "TT_TIME_TO_REMOVE_SHIELDS":" ", - "PHRASE_TIME_TO_REMOVE_ARMOUR":" ", - "TT_TIME_TO_REMOVE_ARMOUR":" ", - "PHRASE_TIME_TO_DRAIN_WEP":" ", - "TT_TIME_TO_DRAIN_WEP":", ", - "TT_TIME_TO_LOSE_SHIELDS":" ", - "TT_TIME_TO_LOSE_ARMOUR":" ", - "TT_MODULE_ARMOUR":", ", - "TT_MODULE_PROTECTION_EXTERNAL":" , ", - "TT_MODULE_PROTECTION_INTERNAL":" , ", - "TT_EFFECTIVE_SDPS_SHIELDS":" ", - "TT_EFFECTIVENESS_SHIELDS":" 0- 0 ", - "TT_EFFECTIVE_SDPS_ARMOUR":" ", - "TT_EFFECTIVENESS_ARMOUR":" 0- 0 ", - "PHRASE_EFFECTIVE_SDPS_SHIELDS":" ", - "PHRASE_EFFECTIVE_SDPS_ARMOUR":" ", - "TT_SUMMARY_SPEED":" 4 ", - "TT_SUMMARY_SPEED_NONFUNCTIONAL":" ", - "TT_SUMMARY_BOOST":" 4 ", - "TT_SUMMARY_BOOST_INTERVAL":" 4 ", - "TT_SUMMARY_BOOST_NONFUNCTIONAL":" ", - "TT_SUMMARY_SHIELDS":" , ", - "TT_SUMMARY_SHIELDS_SCB":" , SCB", - "TT_SUMMARY_SHIELDS_NONFUNCTIONAL":" ", - "TT_SUMMARY_INTEGRITY":" , ", - "TT_SUMMARY_HULL_MASS":" - ", - "TT_SUMMARY_UNLADEN_MASS":" ", - "TT_SUMMARY_LADEN_MASS":" ", - "TT_SUMMARY_DPS":" ", - "TT_SUMMARY_EPS":" ", - "TT_SUMMARY_TTD":" 4 ", - "TT_SUMMARY_MAX_SINGLE_JUMP":" , ", - "TT_SUMMARY_UNLADEN_SINGLE_JUMP":" ", - "TT_SUMMARY_LADEN_SINGLE_JUMP":" ", - "TT_SUMMARY_UNLADEN_TOTAL_JUMP":" , ", - "TT_SUMMARY_LADEN_TOTAL_JUMP":" , ", - "HELP_MODIFICATIONS_MENU":" , , ", - "PHRASE_FAIL_EDENGINEER":" EDEngineer ( EDEngineer , API , ).", - "PHRASE_FIREFOX_EDENGINEER":" EDEngineer Firefox. , Google Chrome.", - "am":" . ", - "bh":"", - "bl":" ", - "bsg":" ", - "c":"", - "causres":"Caustic resistance", - "cc":" ", - "ch":" ", - "cr":" ", - "cs":" ", - "dc":" ", - "ec":". ", - "fc":" ", - "fh":" ", - "fi":"FSD-", - "fs":"", - "fsd":"- ", - "ft":" ", - "fx":" ", - "hb":" ", - "hr":" ", - "hs":" ", - "kw":" ", - "ls":" ", - "mc":" ", - "axmc":" ", - "ml":" ", - "mr":" ", - "axmr":" ", - "mrp":" ", - "nl":"", - "pa":" ", - "pas":" ", - "pc":" ", - "pce":" -", - "passenger capacity":" ", - "pci":" -", - "pcm":" ", - "pcq":" ", - "pd":" ", - "pl":" ", - "po":" ", - "pp":" ", - "gpp":" C", - "gpd":" ", - "gpc":" ", - "ggc":" ", - "gsrp":" ", - "gfsb":" FSD ", - "ghrp":" ", - "gmrp":" ", - "pwa":" ", - "abl":" ", - "scl":" ", - "sdm":" ", - "tbsc":" ", - "gsc":" ", - "psg":" ", - "pv":" ", - "rf":" ", - "rfl":" ( )", - "rg":" ", - "rsl":"-", - "s":"", - "sb":" ", - "sc":" ", - "scb":"", - "sfn":" ", - "sg":"", - "ss":" ", - "sua":" ", - "t":" ", - "tp":" ", - "ul":" ", - "Send To EDEngineer":" EDEngineer", - "ws":" FSD", - "rpl":"-", - "rcpl":"-", - "xs":" ", - "tbem":" ", - "tbrfl":" ", - "dtl":"-", - "mahr":" ", - "emptyrestricted":" ()", - "damage dealt to":" ", - "damage received from":" ", - "against shields":" ", - "against hull":" ", - "total effective shield":" ", - "ammunition":"", - "secs":"", - "rebuildsperbay":" ", - "mroll":"Roll", - "worst":"", - "average":"", - "random":"", - "best":"", - "extreme":"", - "reset":"", - "dpe":" ", - "dps":" ", - "sdps":" ", - "dpssdps":" ( )", - "eps":" ", - "epsseps":" ( )", - "fallofffromrange":"", - "hps":" ", - "hpsshps":" ( )", - "damage by":"", - "damage from":" ", - "shield cells":"", - "recovery":"", - "recharge":"", - "engine pips":" ", - "4b":"4 ", - "speed":"", - "pitch":"", - "roll":"", - "yaw":"", - "internal protection":" ", - "external protection":" ", - "engagement range":" ", - "boost interval":" ", - "total":"", - "ammo":". ", - "boot":" ", - "hacktime":" ", - "brokenregen":" ", - "burst":" ", - "burstrof":" ", - "clip":" ", - "damage":"", - "distdraw":" ", - "duration":"", - "eff":"", - "engcap":" ", - "engrate":" ", - "explres":" ", - "facinglimit":" ", - "hullboost":" ", - "hullreinforcement":" ", - "integrity":"", - "jitter":"", - "kinres":" ", - "maxfuel":". ", - "mass":"", - "optmass":" ", - "optmul":" ", - "pgen":"", - "piercing":"", - "power":"", - "protection":" ", - "range":"", - "ranget":"", - "regen":" ", - "reload":"", - "rof":"", - "angle":" ", - "scanrate":" ", - "proberadius":" ", - "scantime":" ", - "shield":"", - "armour":"", - "shieldboost":" ", - "shieldreinforcement":" ", - "shotspeed":" ", - "shotdmg":" (DPS)", - "spinup":" ", - "syscap":" ", - "sysrate":" ", - "thermload":" ", - "thermres":" ", - "wepcap":" ", - "weprate":" ", - "minmass_sg":". ", - "optmass_sg":". ", - "maxmass_sg":". ", - "minmul_sg":" ", - "optmul_sg":" ", - "maxmul_sg":" ", - "minmass_psg":". ", - "optmass_psg":". ", - "maxmass_psg":". ", - "minmul_psg":" ", - "optmul_psg":" ", - "maxmul_psg":" ", - "minmass_bsg":". ", - "optmass_bsg":". ", - "maxmass_bsg":". ", - "minmul_bsg":" ", - "optmul_bsg":" ", - "maxmul_bsg":" ", - "range_s":" ", - "absolute":"", - "explosive":".", - "kinetic":".", - "thermal":".", - "caustic":"", - "generator":"", - "boosters":"", - "cells":"", - "shield addition":" ", - "jump addition":" ", - "bulkheads":"", - "reinforcement":"", - "power and costs":" ", - "costs":"", - "retrofit costs":" ", - "reload costs":" ", - "profiles":"", - "engine profile":"", - "fsd profile":"FSD", - "movement profile":"", - "damage to opponent's shields":" ", - "damage to opponent's hull":" ", - "offence":"", - "defence":"", - "shield metrics":" ", - "raw shield strength":" ", - "shield sources":" ", - "damage taken":" ", - "effective shield":" ", - "armour metrics":" ", - "raw armour strength":" ", - "armour sources":" ", - "raw module armour":" ", - "effective armour":" ", - "offence metrics":" ", - "defence metrics":" ", - "fuel carried":" ", - "cargo carried":" ", - "ship control":" ", - "opponent":"", - "opponent's shields":" ", - "opponent's armour":" ", - "overall damage":"overall damage", - "shield damage sources":" ", - "armour damage sources":" ", - "never":"", - "stock":"", - "boost":"", - "tab_defence":"defence", - "federation rank 1":"", - "federation rank 2":"", - "federation rank 3":"", - "federation rank 4":"", - "federation rank 5":" ", - "federation rank 6":"-", - "federation rank 7":"", - "federation rank 8":"", - "federation rank 9":"-", - "federation rank 10":" ", - "federation rank 11":" ", - "federation rank 12":"-", - "federation rank 13":" -", - "federation rank 14":"", - "federation rank required":" ", - "empire rank 1":"", - "empire rank 2":"", - "empire rank 3":"", - "empire rank 4":"", - "empire rank 5":"", - "empire rank 6":"", - "empire rank 7":"", - "empire rank 8":"", - "empire rank 9":"", - "empire rank 10":"", - "empire rank 11":"", - "empire rank 12":"", - "empire rank 13":"", - "empire rank 14":"", - "empire rank required":" ", - "PHRASE_BLUEPRINT_RESET ":" ", - "\/s":"\/", - "m\/s":"\/", - "Ls":".", - "LY":".", - "CR":".", - "S":"M", - "M":"", - "L":"", - "H":"O", - "U":"B", - "small":"", - "medium":"", - "large":"", - "alpha":"", - "beta":"", - "standard":"", - "build name":" ", - "compare all":" ", - "create new":" ", - "damage per second":" ", - "delete all":" ", - "detailed export":" ", - "edit data":"", - "empty all":" ", - "Enter Name":" ", - "farthest range":" ", - "fuel level":" ", - "full tank":" ", - "internal compartments":" ", - "jump range":" ", - "mass lock factor":". ", - "max mass":" ", - "net cost":" ", - "none created":" ", - "refuel time":" ", - "retrofit from":" ", - "T-Load":".", - "utility mounts":" ", - "about":" ...", - "action":"", - "added":"", - "available":"", - "backup":" ", - "bins":"", - "build":"c", - "builds":"c", - "buy":"", - "cancel":"", - "cargo":"", - "close":"", - "compare":" ", - "comparison":"", - "comparisons":"", - "cost":"", - "create":"", - "credits":"", - "delete":"", - "dep":"", - "deployed":"", - "disabled":"", - "discount":"", - "DPS":"", - "efficiency":"", - "empty":"", - "ENG":"", - "export":"", - "forum":"", - "fuel":"", - "hardpoints":" ", - "hull":"", - "import":" ", - "insurance":"", - "jumps":"", - "laden":"", - "language":"", - "maneuverability":"", - "max":"", - "no":"", - "pen":"", - "permalink":" ", - "pri":"", - "proceed":"", - "PWR":"", - "rate":"", - "rename":"", - "repair":"", - "ret":".", - "retracted":"", - "ROF":"\/", - "save":"", - "sell":"", - "settings":"", - "shields":"", - "ship":"", - "ships":"", - "shortened":"", - "size":"", - "skip":"", - "Stock":" ", - "SYS":"", - "time":"", - "type":"", - "unladen":"", - "URL":"", - "WEP":"", - "yes":"" -} \ No newline at end of file + "PHRASE_ALT_ALL": "Alt + ", + "PHRASE_BACKUP_DESC": " ", + "PHRASE_CONFIRMATION": " ?", + "PHRASE_EXPORT_DESC": " JSON- ", + "PHRASE_FASTEST_RANGE": " ", + "PHRASE_IMPORT": " ", + "PHRASE_LADEN": " ", + "PHRASE_NO_BUILDS": " ", + "PHRASE_NO_RETROCH": " ", + "PHRASE_SELECT_BUILDS": " ", + "PHRASE_SG_RECHARGE": " 50% 100% , ", + "PHRASE_SG_RECOVER": " 0% 50% , ", + "PHRASE_UNLADEN": " ", + "PHRASE_UPDATE_RDY": " . .", + "PHRASE_ENGAGEMENT_RANGE": " ", + "PHRASE_SELECT_BLUEPRINT": " ", + "PHRASE_BLUEPRINT_WORST": " ", + "PHRASE_BLUEPRINT_FIFTY": "50% ", + "PHRASE_BLUEPRINT_SEVEN_FIVE": "75% ", + "PHRASE_BLUEPRINT_RANDOM": " ", + "PHRASE_BLUEPRINT_BEST": " ", + "PHRASE_BLUEPRINT_EXTREME": " ", + "PHRASE_BLUEPRINT_RESET": " ", + "PHRASE_SELECT_SPECIAL": ", ", + "PHRASE_NO_SPECIAL": " ", + "PHRASE_SHOPPING_LIST": ", ", + "PHRASE_SHOPPING_MATS": " ", + "PHRASE_REFIT_SHOPPING_LIST": ", ", + "PHRASE_TOTAL_EFFECTIVE_SHIELD": " , , ", + "PHRASE_TIME_TO_LOSE_SHIELDS": " ", + "PHRASE_TIME_TO_RECOVER_SHIELDS": " ", + "PHRASE_TIME_TO_RECHARGE_SHIELDS": " ", + "PHRASE_SHIELD_SOURCES": " ", + "PHRASE_EFFECTIVE_SHIELD": " ", + "PHRASE_ARMOUR_SOURCES": " ", + "PHRASE_EFFECTIVE_ARMOUR": " ", + "PHRASE_DAMAGE_TAKEN": "% ", + "PHRASE_TIME_TO_LOSE_ARMOUR": " ", + "PHRASE_MODULE_PROTECTION_EXTERNAL": " ", + "PHRASE_MODULE_PROTECTION_INTERNAL": " ", + "PHRASE_OVERALL_DAMAGE": " ", + "PHRASE_SHIELD_DAMAGE": " ", + "PHRASE_ARMOUR_DAMAGE": " ", + "PHRASE_TIME_TO_REMOVE_SHIELDS": " ", + "PHRASE_MULTI_CREW_CAPACITOR_POINTS": " .", + "TT_TIME_TO_REMOVE_SHIELDS": " ", + "PHRASE_TIME_TO_REMOVE_ARMOUR": " ", + "TT_TIME_TO_REMOVE_ARMOUR": " ", + "PHRASE_TIME_TO_DRAIN_WEP": " ", + "TT_TIME_TO_DRAIN_WEP": ", ", + "TT_TIME_TO_LOSE_SHIELDS": " ", + "TT_TIME_TO_LOSE_ARMOUR": " ", + "TT_MODULE_ARMOUR": ", ", + "TT_MODULE_PROTECTION_EXTERNAL": " , ", + "TT_MODULE_PROTECTION_INTERNAL": " , ", + "TT_EFFECTIVE_SDPS_SHIELDS": " ", + "TT_EFFECTIVENESS_SHIELDS": " 0- 0 ", + "TT_EFFECTIVE_SDPS_ARMOUR": " ", + "TT_EFFECTIVENESS_ARMOUR": " 0- 0 ", + "PHRASE_EFFECTIVE_SDPS_SHIELDS": " ", + "PHRASE_EFFECTIVE_SDPS_ARMOUR": " ", + "TT_SUMMARY_SPEED": " 4 ", + "TT_SUMMARY_SPEED_NONFUNCTIONAL": " ", + "TT_SUMMARY_BOOST": " 4 ", + "TT_SUMMARY_BOOST_INTERVAL": " 4 ", + "TT_SUMMARY_BOOST_NONFUNCTIONAL": " ", + "TT_SUMMARY_SHIELDS": " , ", + "TT_SUMMARY_SHIELDS_SCB": " , SCB", + "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": " ", + "TT_SUMMARY_INTEGRITY": " , ", + "TT_SUMMARY_HULL_MASS": " - ", + "TT_SUMMARY_UNLADEN_MASS": " ", + "TT_SUMMARY_LADEN_MASS": " ", + "TT_SUMMARY_DPS": " ", + "TT_SUMMARY_EPS": " ", + "TT_SUMMARY_TTD": " 4 ", + "TT_SUMMARY_MAX_SINGLE_JUMP": " , ", + "TT_SUMMARY_UNLADEN_SINGLE_JUMP": " ", + "TT_SUMMARY_LADEN_SINGLE_JUMP": " ", + "TT_SUMMARY_UNLADEN_TOTAL_JUMP": " , ", + "TT_SUMMARY_LADEN_TOTAL_JUMP": " , ", + "HELP_MODIFICATIONS_MENU": " , , ", + "PHRASE_FAIL_EDENGINEER": " EDEngineer ( EDEngineer , API , ).", + "PHRASE_FIREFOX_EDENGINEER": " EDEngineer Firefox. , Google Chrome.", + "am": " . ", + "bh": "", + "bl": " ", + "bsg": " ", + "c": "", + "causres": "Caustic resistance", + "cc": " ", + "ch": " ", + "cr": " ", + "cs": " ", + "dc": " ", + "ec": ". ", + "fc": " ", + "fh": " ", + "fi": "FSD-", + "fs": "", + "fsd": "- ", + "ft": " ", + "fx": " ", + "hb": " ", + "hr": " ", + "hs": " ", + "kw": " ", + "ls": " ", + "mc": " ", + "axmc": " ", + "ml": " ", + "mr": " ", + "axmr": " ", + "mrp": " ", + "nl": "", + "pa": " ", + "pas": " ", + "pc": " ", + "pce": " -", + "passenger capacity": " ", + "pci": " -", + "pcm": " ", + "pcq": " ", + "pd": " ", + "pl": " ", + "po": " ", + "pp": " ", + "gpp": " C", + "gpd": " ", + "gpc": " ", + "ggc": " ", + "gsrp": " ", + "gfsb": " FSD ", + "ghrp": " ", + "gmrp": " ", + "pwa": " ", + "abl": " ", + "scl": " ", + "sdm": " ", + "tbsc": " ", + "gsc": " ", + "psg": " ", + "pv": " ", + "rf": " ", + "rfl": " ( )", + "rg": " ", + "rsl": "-", + "s": "", + "sb": " ", + "sc": " ", + "scb": "", + "sfn": " ", + "sg": "", + "ss": " ", + "sua": " ", + "t": " ", + "tp": " ", + "ul": " ", + "Send To EDEngineer": " EDEngineer", + "ws": " FSD", + "rpl": "-", + "rcpl": "-", + "xs": " ", + "tbem": " ", + "tbrfl": " ", + "dtl": "-", + "mahr": " ", + "emptyrestricted": " ()", + "damage dealt to": " ", + "damage received from": " ", + "against shields": " ", + "against hull": " ", + "total effective shield": " ", + "ammunition": "", + "secs": "", + "rebuildsperbay": " ", + "mroll": "Roll", + "worst": "", + "average": "", + "random": "", + "best": "", + "extreme": "", + "reset": "", + "dpe": " ", + "dps": " ", + "sdps": " ", + "dpssdps": " ( )", + "eps": " ", + "epsseps": " ( )", + "fallofffromrange": "", + "hps": " ", + "hpsshps": " ( )", + "damage by": "", + "damage from": " ", + "shield cells": "", + "recovery": "", + "recharge": "", + "engine pips": " ", + "4b": "4 ", + "speed": "", + "pitch": "", + "roll": "", + "yaw": "", + "internal protection": " ", + "external protection": " ", + "engagement range": " ", + "boost interval": " ", + "total": "", + "ammo": ". ", + "boot": " ", + "hacktime": " ", + "brokenregen": " ", + "burst": " ", + "burstrof": " ", + "clip": " ", + "damage": "", + "distdraw": " ", + "duration": "", + "eff": "", + "engcap": " ", + "engrate": " ", + "explres": " ", + "facinglimit": " ", + "hullboost": " ", + "hullreinforcement": " ", + "integrity": "", + "jitter": "", + "kinres": " ", + "maxfuel": ". ", + "mass": "", + "optmass": " ", + "optmul": " ", + "pgen": "", + "piercing": "", + "power": "", + "protection": " ", + "range": "", + "ranget": "", + "regen": " ", + "reload": "", + "rof": "", + "angle": " ", + "scanrate": " ", + "proberadius": " ", + "scantime": " ", + "shield": "", + "armour": "", + "shieldboost": " ", + "shieldreinforcement": " ", + "shotspeed": " ", + "shotdmg": " (DPS)", + "spinup": " ", + "syscap": " ", + "sysrate": " ", + "thermload": " ", + "thermres": " ", + "wepcap": " ", + "weprate": " ", + "minmass_sg": ". ", + "optmass_sg": ". ", + "maxmass_sg": ". ", + "minmul_sg": " ", + "optmul_sg": " ", + "maxmul_sg": " ", + "minmass_psg": ". ", + "optmass_psg": ". ", + "maxmass_psg": ". ", + "minmul_psg": " ", + "optmul_psg": " ", + "maxmul_psg": " ", + "minmass_bsg": ". ", + "optmass_bsg": ". ", + "maxmass_bsg": ". ", + "minmul_bsg": " ", + "optmul_bsg": " ", + "maxmul_bsg": " ", + "range_s": " ", + "absolute": "", + "explosive": ".", + "kinetic": ".", + "thermal": ".", + "caustic": "", + "generator": "", + "boosters": "", + "cells": "", + "shield addition": " ", + "jump addition": " ", + "bulkheads": "", + "reinforcement": "", + "power and costs": " ", + "costs": "", + "retrofit costs": " ", + "reload costs": " ", + "profiles": "", + "engine profile": "", + "fsd profile": "FSD", + "movement profile": "", + "damage to opponent's shields": " ", + "damage to opponent's hull": " ", + "offence": "", + "defence": "", + "shield metrics": " ", + "raw shield strength": " ", + "shield sources": " ", + "damage taken": " ", + "effective shield": " ", + "armour metrics": " ", + "raw armour strength": " ", + "armour sources": " ", + "raw module armour": " ", + "effective armour": " ", + "offence metrics": " ", + "defence metrics": " ", + "fuel carried": " ", + "cargo carried": " ", + "ship control": " ", + "opponent": "", + "opponent's shields": " ", + "opponent's armour": " ", + "overall damage": "overall damage", + "shield damage sources": " ", + "armour damage sources": " ", + "never": "", + "stock": "", + "boost": "", + "tab_defence": "defence", + "federation rank 1": "", + "federation rank 2": "", + "federation rank 3": "", + "federation rank 4": "", + "federation rank 5": " ", + "federation rank 6": "-", + "federation rank 7": "", + "federation rank 8": "", + "federation rank 9": "-", + "federation rank 10": " ", + "federation rank 11": " ", + "federation rank 12": "-", + "federation rank 13": " -", + "federation rank 14": "", + "federation rank required": " ", + "empire rank 1": "", + "empire rank 2": "", + "empire rank 3": "", + "empire rank 4": "", + "empire rank 5": "", + "empire rank 6": "", + "empire rank 7": "", + "empire rank 8": "", + "empire rank 9": "", + "empire rank 10": "", + "empire rank 11": "", + "empire rank 12": "", + "empire rank 13": "", + "empire rank 14": "", + "empire rank required": " ", + "PHRASE_BLUEPRINT_RESET ": " ", + "\/s": "\/", + "m\/s": "\/", + "Ls": ".", + "LY": ".", + "CR": ".", + "S": "M", + "M": "", + "L": "", + "H": "O", + "U": "B", + "small": "", + "medium": "", + "large": "", + "alpha": "", + "beta": "", + "standard": "", + "build name": " ", + "compare all": " ", + "create new": " ", + "damage per second": " ", + "delete all": " ", + "detailed export": " ", + "edit data": "", + "empty all": " ", + "Enter Name": " ", + "farthest range": " ", + "fuel level": " ", + "full tank": " ", + "internal compartments": " ", + "jump range": " ", + "mass lock factor": ". ", + "max mass": " ", + "net cost": " ", + "none created": " ", + "refuel time": " ", + "retrofit from": " ", + "T-Load": ".", + "utility mounts": " ", + "about": " ...", + "action": "", + "added": "", + "available": "", + "backup": " ", + "bins": "", + "build": "c", + "builds": "c", + "buy": "", + "cancel": "", + "cargo": "", + "close": "", + "compare": " ", + "comparison": "", + "comparisons": "", + "cost": "", + "create": "", + "credits": "", + "delete": "", + "dep": "", + "deployed": "", + "disabled": "", + "discount": "", + "DPS": "", + "efficiency": "", + "empty": "", + "ENG": "", + "export": "", + "forum": "", + "fuel": "", + "hardpoints": " ", + "hull": "", + "import": " ", + "insurance": "", + "jumps": "", + "laden": "", + "language": "", + "maneuverability": "", + "max": "", + "no": "", + "pen": "", + "permalink": " ", + "pri": "", + "proceed": "", + "PWR": "", + "rate": "", + "rename": "", + "repair": "", + "ret": ".", + "retracted": "", + "ROF": "\/", + "save": "", + "sell": "", + "settings": "", + "shields": "", + "ship": "", + "ships": "", + "shortened": "", + "size": "", + "skip": "", + "Stock": " ", + "SYS": "", + "time": "", + "type": "", + "unladen": "", + "URL": "", + "WEP": "", + "yes": "" +} From 6d30a549257b10091087e842c964189be38cc66d Mon Sep 17 00:00:00 2001 From: VAKazakov <47143965+VAKazakov@users.noreply.github.com> Date: Mon, 25 Jan 2021 22:10:17 +0300 Subject: [PATCH 06/15] fixing encoding and deleting excess translation --- src/app/i18n/ru.json | 909 +++++++++++++++++++++---------------------- 1 file changed, 454 insertions(+), 455 deletions(-) diff --git a/src/app/i18n/ru.json b/src/app/i18n/ru.json index d0fcdd3f..6a2f5414 100644 --- a/src/app/i18n/ru.json +++ b/src/app/i18n/ru.json @@ -1,465 +1,464 @@ { - "PHRASE_ALT_ALL": "Alt + ", - "PHRASE_BACKUP_DESC": " ", - "PHRASE_CONFIRMATION": " ?", - "PHRASE_EXPORT_DESC": " JSON- ", - "PHRASE_FASTEST_RANGE": " ", - "PHRASE_IMPORT": " ", - "PHRASE_LADEN": " ", - "PHRASE_NO_BUILDS": " ", - "PHRASE_NO_RETROCH": " ", - "PHRASE_SELECT_BUILDS": " ", - "PHRASE_SG_RECHARGE": " 50% 100% , ", - "PHRASE_SG_RECOVER": " 0% 50% , ", - "PHRASE_UNLADEN": " ", - "PHRASE_UPDATE_RDY": " . .", - "PHRASE_ENGAGEMENT_RANGE": " ", - "PHRASE_SELECT_BLUEPRINT": " ", - "PHRASE_BLUEPRINT_WORST": " ", - "PHRASE_BLUEPRINT_FIFTY": "50% ", - "PHRASE_BLUEPRINT_SEVEN_FIVE": "75% ", - "PHRASE_BLUEPRINT_RANDOM": " ", - "PHRASE_BLUEPRINT_BEST": " ", - "PHRASE_BLUEPRINT_EXTREME": " ", - "PHRASE_BLUEPRINT_RESET": " ", - "PHRASE_SELECT_SPECIAL": ", ", - "PHRASE_NO_SPECIAL": " ", - "PHRASE_SHOPPING_LIST": ", ", - "PHRASE_SHOPPING_MATS": " ", - "PHRASE_REFIT_SHOPPING_LIST": ", ", - "PHRASE_TOTAL_EFFECTIVE_SHIELD": " , , ", - "PHRASE_TIME_TO_LOSE_SHIELDS": " ", - "PHRASE_TIME_TO_RECOVER_SHIELDS": " ", - "PHRASE_TIME_TO_RECHARGE_SHIELDS": " ", - "PHRASE_SHIELD_SOURCES": " ", - "PHRASE_EFFECTIVE_SHIELD": " ", - "PHRASE_ARMOUR_SOURCES": " ", - "PHRASE_EFFECTIVE_ARMOUR": " ", - "PHRASE_DAMAGE_TAKEN": "% ", - "PHRASE_TIME_TO_LOSE_ARMOUR": " ", - "PHRASE_MODULE_PROTECTION_EXTERNAL": " ", - "PHRASE_MODULE_PROTECTION_INTERNAL": " ", - "PHRASE_OVERALL_DAMAGE": " ", - "PHRASE_SHIELD_DAMAGE": " ", - "PHRASE_ARMOUR_DAMAGE": " ", - "PHRASE_TIME_TO_REMOVE_SHIELDS": " ", - "PHRASE_MULTI_CREW_CAPACITOR_POINTS": " .", - "TT_TIME_TO_REMOVE_SHIELDS": " ", - "PHRASE_TIME_TO_REMOVE_ARMOUR": " ", - "TT_TIME_TO_REMOVE_ARMOUR": " ", - "PHRASE_TIME_TO_DRAIN_WEP": " ", - "TT_TIME_TO_DRAIN_WEP": ", ", - "TT_TIME_TO_LOSE_SHIELDS": " ", - "TT_TIME_TO_LOSE_ARMOUR": " ", - "TT_MODULE_ARMOUR": ", ", - "TT_MODULE_PROTECTION_EXTERNAL": " , ", - "TT_MODULE_PROTECTION_INTERNAL": " , ", - "TT_EFFECTIVE_SDPS_SHIELDS": " ", - "TT_EFFECTIVENESS_SHIELDS": " 0- 0 ", - "TT_EFFECTIVE_SDPS_ARMOUR": " ", - "TT_EFFECTIVENESS_ARMOUR": " 0- 0 ", - "PHRASE_EFFECTIVE_SDPS_SHIELDS": " ", - "PHRASE_EFFECTIVE_SDPS_ARMOUR": " ", - "TT_SUMMARY_SPEED": " 4 ", - "TT_SUMMARY_SPEED_NONFUNCTIONAL": " ", - "TT_SUMMARY_BOOST": " 4 ", - "TT_SUMMARY_BOOST_INTERVAL": " 4 ", - "TT_SUMMARY_BOOST_NONFUNCTIONAL": " ", - "TT_SUMMARY_SHIELDS": " , ", - "TT_SUMMARY_SHIELDS_SCB": " , SCB", - "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": " ", - "TT_SUMMARY_INTEGRITY": " , ", - "TT_SUMMARY_HULL_MASS": " - ", - "TT_SUMMARY_UNLADEN_MASS": " ", - "TT_SUMMARY_LADEN_MASS": " ", - "TT_SUMMARY_DPS": " ", - "TT_SUMMARY_EPS": " ", - "TT_SUMMARY_TTD": " 4 ", - "TT_SUMMARY_MAX_SINGLE_JUMP": " , ", - "TT_SUMMARY_UNLADEN_SINGLE_JUMP": " ", - "TT_SUMMARY_LADEN_SINGLE_JUMP": " ", - "TT_SUMMARY_UNLADEN_TOTAL_JUMP": " , ", - "TT_SUMMARY_LADEN_TOTAL_JUMP": " , ", - "HELP_MODIFICATIONS_MENU": " , , ", - "PHRASE_FAIL_EDENGINEER": " EDEngineer ( EDEngineer , API , ).", - "PHRASE_FIREFOX_EDENGINEER": " EDEngineer Firefox. , Google Chrome.", - "am": " . ", - "bh": "", - "bl": " ", - "bsg": " ", - "c": "", + "PHRASE_ALT_ALL": "Alt + Нажатие для заполнения всех слотов", + "PHRASE_BACKUP_DESC": "Сохраните все данные перед переносом в другой браузер или устройство", + "PHRASE_CONFIRMATION": "Вы уверены?", + "PHRASE_EXPORT_DESC": "Детальный JSON-экспорт вашей сборки для использования в других местах и инструментах", + "PHRASE_FASTEST_RANGE": "Последовательные прыжки максимальной дальности", + "PHRASE_IMPORT": "Для импорта вставьте код в эту форму", + "PHRASE_LADEN": "Масса корабля с учётом топлива и грузов", + "PHRASE_NO_BUILDS": "Нечего сравнивать", + "PHRASE_NO_RETROCH": "Нет ранних версий сборки", + "PHRASE_SELECT_BUILDS": "Выберите конфигурацию для сравнения", + "PHRASE_SG_RECHARGE": "Восстановление с 50% до 100% объема щита, учитывая полный аккумулятор СИС в начале", + "PHRASE_SG_RECOVER": "Восстановление с 0% до 50% объема щита, учитывая полный аккумулятор СИС в начале", + "PHRASE_UNLADEN": "Масса корабля без учета топлива и грузов", + "PHRASE_UPDATE_RDY": "Доступна новая версия. Нажмите для обновления.", + "PHRASE_ENGAGEMENT_RANGE": "Дистанция между кораблём и целью", + "PHRASE_SELECT_BLUEPRINT": "Нажмите чтобы выбрать чертёж", + "PHRASE_BLUEPRINT_WORST": "Худшие основные значения для чертежа", + "PHRASE_BLUEPRINT_FIFTY": "50% значения для чертежа", + "PHRASE_BLUEPRINT_SEVEN_FIVE": "75% значения для чертежа", + "PHRASE_BLUEPRINT_RANDOM": "Случайный выбор между худшими и лучшими значениями для этого чертежа", + "PHRASE_BLUEPRINT_BEST": "Лучшие основные значения для чертежа", + "PHRASE_BLUEPRINT_EXTREME": "Лучшие положительные и худшие отрицательные основные значения для чертежа", + "PHRASE_BLUEPRINT_RESET": "Сбросить все модификаторы и чертеж", + "PHRASE_SELECT_SPECIAL": "Нажмите, чтобы выбрать экспериментальный эффект", + "PHRASE_NO_SPECIAL": "Без экспериментального эффекта", + "PHRASE_SHOPPING_LIST": "Станции, что продают эту сборку", + "PHRASE_SHOPPING_MATS": "Материалы которые нужны для сборки", + "PHRASE_REFIT_SHOPPING_LIST": "Станции, что продают необходимые модули", + "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Общий урон, что может быть нанесён в каждым типе, если используются все щитонакопители", + "PHRASE_TIME_TO_LOSE_SHIELDS": "Щиты продержатся", + "PHRASE_TIME_TO_RECOVER_SHIELDS": "Щиты восстановятся за", + "PHRASE_TIME_TO_RECHARGE_SHIELDS": "Щиты будут заряжены за", + "PHRASE_SHIELD_SOURCES": "Подробности энергии щита", + "PHRASE_EFFECTIVE_SHIELD": "Эффективная сила щита против разных типов урона", + "PHRASE_ARMOUR_SOURCES": "Подробности состава брони", + "PHRASE_EFFECTIVE_ARMOUR": "Эффективная сила брони против разных типов урона", + "PHRASE_DAMAGE_TAKEN": "% общих повреждений полученных в разных типах урона", + "PHRASE_TIME_TO_LOSE_ARMOUR": "Броня продержится", + "PHRASE_MODULE_PROTECTION_EXTERNAL": "Защита гнёзд", + "PHRASE_MODULE_PROTECTION_INTERNAL": "Защита всех остальных модулей", + "PHRASE_OVERALL_DAMAGE": "Разбивка источников устойчивого ДПС", + "PHRASE_SHIELD_DAMAGE": "Подробности источников поддерживаемого ДПС против щитов", + "PHRASE_ARMOUR_DAMAGE": "Подробности источников поддерживаемого ДПС против брони", + "PHRASE_TIME_TO_REMOVE_SHIELDS": "Снимет щиты за", + "PHRASE_MULTI_CREW_CAPACITOR_POINTS": "Щелкните правой кновкой мыши чтобы объединить в группу.", + "TT_TIME_TO_REMOVE_SHIELDS": "Непрерывным огнём из всех орудий", + "PHRASE_TIME_TO_REMOVE_ARMOUR": "Снимет броню за", + "TT_TIME_TO_REMOVE_ARMOUR": "Непрерывным огнём из всех орудий", + "PHRASE_TIME_TO_DRAIN_WEP": "Опустошит ОРУЖ за", + "TT_TIME_TO_DRAIN_WEP": "Время, за которое опустошится аккумулятор ОРУЖ при стрельбе из всех орудий", + "TT_TIME_TO_LOSE_SHIELDS": "Против поддерживаемой стрельбы из всех орудий противника", + "TT_TIME_TO_LOSE_ARMOUR": "Против поддерживаемой стрельбы из всех орудий противника", + "TT_MODULE_ARMOUR": "Броня, защищающая модули от урона", + "TT_MODULE_PROTECTION_EXTERNAL": "Процент урона, перенаправленного от гнёзд на наборы для усиления модулей", + "TT_MODULE_PROTECTION_INTERNAL": "Процент урона, перенаправленного от модулей вне гнёзд на наборы для усиления модулей", + "TT_EFFECTIVE_SDPS_SHIELDS": "Реальный поддерживаемый ДПС пока аккумулятор ОРУЖ не пуст", + "TT_EFFECTIVENESS_SHIELDS": "Эффективность в сравнении с попаданием по цели с 0-сопротивляемостью без пунктов в СИС на 0 метрах", + "TT_EFFECTIVE_SDPS_ARMOUR": "Реальный поддерживаемый ДПС пока аккумулятор ОРУЖ не пуст", + "TT_EFFECTIVENESS_ARMOUR": "Эффективность в сравнении с попаданием по цели с 0-сопротивляемостью на 0 метрах", + "PHRASE_EFFECTIVE_SDPS_SHIELDS": "ПДПС против щитов", + "PHRASE_EFFECTIVE_SDPS_ARMOUR": "ПДПС против брони", + "TT_SUMMARY_SPEED": "С полным топливным баком и 4 пунктами в ДВИ", + "TT_SUMMARY_SPEED_NONFUNCTIONAL": "Маневровые двигатели выключены или превышена максимальная масса с топливом и грузом", + "TT_SUMMARY_BOOST": "С полным топливным баком и 4 пунктами в ДВИ", + "TT_SUMMARY_BOOST_INTERVAL": "Время заполнения с 4 пунктами в СИС", + "TT_SUMMARY_BOOST_NONFUNCTIONAL": "Распределитель питания не может обеспечить достаточно энергии для форсажа", + "TT_SUMMARY_SHIELDS": "Чистая сила щита, включая усилители", + "TT_SUMMARY_SHIELDS_SCB": "Прочность щита, включая бустеры и SCB", + "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": "Шитогенератор отсутствует или выключен", + "TT_SUMMARY_INTEGRITY": "Целостность корабля, включая переборки и наборы для усиления корпуса", + "TT_SUMMARY_HULL_MASS": "Масса корпуса без каких-либо модулей", + "TT_SUMMARY_UNLADEN_MASS": "Масса корпуса и модулей без топлива и груза", + "TT_SUMMARY_LADEN_MASS": "Масса корпуса и модулей с топливом и грузом", + "TT_SUMMARY_DPS": "Урон в секунду при стрельбе из всех орудий", + "TT_SUMMARY_EPS": "Расход аккумулятора ОРУЖ в секунду при стрельбе из всех орудий", + "TT_SUMMARY_TTD": "Время расхода аккумулятора ОРУЖ при стрельбе из всех орудий и с 4 пунктами в ОРУЖ", + "TT_SUMMARY_MAX_SINGLE_JUMP": "Самый дальний возможный прыжок без груза и с топливом, достаточным только на сам прыжок", + "TT_SUMMARY_UNLADEN_SINGLE_JUMP": "Самый дальний возможный прыжок без груза и с полным топливным баком", + "TT_SUMMARY_LADEN_SINGLE_JUMP": "Самый дальний возможный прыжок с полным грузовым отсеком и с полным топливным баком", + "TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Самая дальняя общая дистанция без груза, с полным топливным баком и при прыжках на максимальное расстояние", + "TT_SUMMARY_LADEN_TOTAL_JUMP": "Самая дальняя общая дистанция с полным грузовым отсеком, с полным топливным баком и при прыжках на максимальное расстояние", + "HELP_MODIFICATIONS_MENU": "Нажмите на номер, чтобы ввести новое значение, или потяните вдоль полосы для малых изменений", + "PHRASE_FAIL_EDENGINEER": "Не удалось отправить в EDEngineer (запустите EDEngineer и убедитесь, что API запущен, затем обновите страницу).", + "PHRASE_FIREFOX_EDENGINEER": "Отправка в EDEngineer несовместима с настройками безопасности Firefox. Пожалуйста, попробуйте еще раз в Google Chrome.", + "am": "Блок Автом. Полевого Ремонта", + "bh": "Переборки", + "bl": "Пучковый лазер", + "bsg": "Двухпоточный щитогенератор", + "c": "Орудие", "causres": "Caustic resistance", - "cc": " ", - "ch": " ", - "cr": " ", - "cs": " ", - "dc": " ", - "ec": ". ", - "fc": " ", - "fh": " ", - "fi": "FSD-", - "fs": "", - "fsd": "- ", - "ft": " ", - "fx": " ", - "hb": " ", - "hr": " ", - "hs": " ", - "kw": " ", - "ls": " ", - "mc": " ", - "axmc": " ", - "ml": " ", - "mr": " ", - "axmr": " ", - "mrp": " ", - "nl": "", - "pa": " ", - "pas": " ", - "pc": " ", - "pce": " -", - "passenger capacity": " ", - "pci": " -", - "pcm": " ", - "pcq": " ", - "pd": " ", - "pl": " ", - "po": " ", - "pp": " ", - "gpp": " C", - "gpd": " ", - "gpc": " ", - "ggc": " ", - "gsrp": " ", - "gfsb": " FSD ", - "ghrp": " ", - "gmrp": " ", - "pwa": " ", - "abl": " ", - "scl": " ", - "sdm": " ", - "tbsc": " ", - "gsc": " ", - "psg": " ", - "pv": " ", - "rf": " ", - "rfl": " ( )", - "rg": " ", - "rsl": "-", - "s": "", - "sb": " ", - "sc": " ", - "scb": "", - "sfn": " ", - "sg": "", - "ss": " ", - "sua": " ", - "t": " ", - "tp": " ", - "ul": " ", - "Send To EDEngineer": " EDEngineer", - "ws": " FSD", - "rpl": "-", - "rcpl": "-", - "xs": " ", - "tbem": " ", - "tbrfl": " ", - "dtl": "-", - "mahr": " ", - "emptyrestricted": " ()", - "damage dealt to": " ", - "damage received from": " ", - "against shields": " ", - "against hull": " ", - "total effective shield": " ", - "ammunition": "", - "secs": "", - "rebuildsperbay": " ", + "cc": "Контроллер магнитного снаряда для сбора", + "ch": "Разбрасыватель дипольных отражателей", + "cr": "Грузовой стеллаж", + "cs": "Сканер содержимого", + "dc": "Стыковочный компьютер", + "ec": "Электр. противодействие", + "fc": "Залповое орудие", + "fh": "Ангар для истребителя", + "fi": "FSD-перехватчик", + "fs": "Топливозаборник", + "fsd": "Рамочно-сместительный двигатель", + "ft": "Топливный бак", + "fx": "Контроллер магнитного снаряда для топлива", + "hb": "Контроллер магнитного снаряда для взлома трюма", + "hr": "Набор для усиления корпуса", + "hs": "Теплоотводная катапульта", + "kw": "Сканер преступников", + "ls": "Система жизнеобеспечения", + "mc": "Многоствольное орудие", + "axmc": "Многоствольное орудие АИ", + "ml": "Проходочный лазер", + "mr": "Ракетный лоток", + "axmr": "Блок ракет АИ", + "mrp": "Набор для усиления модуля", + "nl": "Мины", + "pa": "Ускоритель плазмы", + "pas": "Комплект для сближения с планетой", + "pc": "Контроллер магнитного снаряда для геологоразведки", + "pce": "Каюта пассажира эконом-класса", + "passenger capacity": "количество пассажиров", + "pci": "Каюта пассажира бизнес-класса", + "pcm": "Каюта пассажира первого класса", + "pcq": "Каюта пассажира класса люкс", + "pd": "Распределитель питания", + "pl": "Импульсный лазер", + "po": "Точечная оборона", + "pp": "Силовая установка", + "gpp": "Силовая установка Cтражей", + "gpd": "Гибридный распределитель питания Стражей", + "gpc": "Плазменная пушка Стражей", + "ggc": "Пушка Гаусса Стражей", + "gsrp": "Набор для усиления щита Стражей", + "gfsb": "Ускоритель FSD Стражей", + "ghrp": "Набор для усиления корпуса Стражей", + "gmrp": "Набор для усиления модуля Стражей", + "pwa": "Анализатор импульсных волн", + "abl": "Абразивный бластер", + "scl": "Пусковая установка для сейсмических снарядов", + "sdm": "Вытесняющая ракета для добычи глубинных залежей", + "tbsc": "Шоковое орудие", + "gsc": "Осколочное орудие Стражей", + "psg": "Призматический щитогенератор", + "pv": "Гараж для планетарного транспорта", + "rf": "Устройство переработки", + "rfl": "Зенитная установка (снаряды с дистанционным подрывом)", + "rg": "Электромагнитная пушка", + "rsl": "Дроны-исследователи", + "s": "Сенсоры", + "sb": "Усилитель щита", + "sc": "Сканер обнаружения", + "scb": "Щитонакопитель", + "sfn": "Нейтрализатор глушащего поля", + "sg": "Щитогенератор", + "ss": "Сканер поверхностей", + "sua": "Помощь в гиперкрейсерском режиме", + "t": "Маневровые двигатели", + "tp": "Торпедная стойка", + "ul": "Пульсирующие лазеры", + "Send To EDEngineer": "Отправить в EDEngineer", + "ws": "Сканер следа FSD", + "rpl": "Дроны-ремонтники", + "rcpl": "ДРоны-разведчики", + "xs": "Сканер «инопланетянин»", + "tbem": "Блок энзимных ракет", + "tbrfl": "Установка для стрельбы стреловидными снарядами с дистанционным подрывом", + "dtl": "Дроны-очистители", + "mahr": "Набор для усиления корпуса из Метасплава", + "emptyrestricted": "пусто (ограниченно)", + "damage dealt to": "Урон нанесён", + "damage received from": "Урон получен от", + "against shields": "Против щитов", + "against hull": "Против корпуса", + "total effective shield": "Общие эффективные щиты", + "ammunition": "Припасы", + "secs": "с", + "rebuildsperbay": "Построек за полосу", "mroll": "Roll", - "worst": "", - "average": "", - "random": "", - "best": "", - "extreme": "", - "reset": "", - "dpe": " ", - "dps": " ", - "sdps": " ", - "dpssdps": " ( )", - "eps": " ", - "epsseps": " ( )", - "fallofffromrange": "", - "hps": " ", - "hpsshps": " ( )", - "damage by": "", - "damage from": " ", - "shield cells": "", - "recovery": "", - "recharge": "", - "engine pips": " ", - "4b": "4 ", - "speed": "", - "pitch": "", - "roll": "", - "yaw": "", - "internal protection": " ", - "external protection": " ", - "engagement range": " ", - "boost interval": " ", - "total": "", - "ammo": ". ", - "boot": " ", - "hacktime": " ", - "brokenregen": " ", - "burst": " ", - "burstrof": " ", - "clip": " ", - "damage": "", - "distdraw": " ", - "duration": "", - "eff": "", - "engcap": " ", - "engrate": " ", - "explres": " ", - "facinglimit": " ", - "hullboost": " ", - "hullreinforcement": " ", - "integrity": "", - "jitter": "", - "kinres": " ", - "maxfuel": ". ", - "mass": "", - "optmass": " ", - "optmul": " ", - "pgen": "", - "piercing": "", - "power": "", - "protection": " ", - "range": "", - "ranget": "", - "regen": " ", - "reload": "", - "rof": "", - "angle": " ", - "scanrate": " ", - "proberadius": " ", - "scantime": " ", - "shield": "", - "armour": "", - "shieldboost": " ", - "shieldreinforcement": " ", - "shotspeed": " ", - "shotdmg": " (DPS)", - "spinup": " ", - "syscap": " ", - "sysrate": " ", - "thermload": " ", - "thermres": " ", - "wepcap": " ", - "weprate": " ", - "minmass_sg": ". ", - "optmass_sg": ". ", - "maxmass_sg": ". ", - "minmul_sg": " ", - "optmul_sg": " ", - "maxmul_sg": " ", - "minmass_psg": ". ", - "optmass_psg": ". ", - "maxmass_psg": ". ", - "minmul_psg": " ", - "optmul_psg": " ", - "maxmul_psg": " ", - "minmass_bsg": ". ", - "optmass_bsg": ". ", - "maxmass_bsg": ". ", - "minmul_bsg": " ", - "optmul_bsg": " ", - "maxmul_bsg": " ", - "range_s": " ", - "absolute": "", - "explosive": ".", - "kinetic": ".", - "thermal": ".", - "caustic": "", - "generator": "", - "boosters": "", - "cells": "", - "shield addition": " ", - "jump addition": " ", - "bulkheads": "", - "reinforcement": "", - "power and costs": " ", - "costs": "", - "retrofit costs": " ", - "reload costs": " ", - "profiles": "", - "engine profile": "", + "worst": "Худшее", + "average": "Среднее", + "random": "Случайное", + "best": "Лучшее", + "extreme": "Экстремальное", + "reset": "Сброс", + "dpe": "Урон на МДж энергии", + "dps": "Урон в Секунду", + "sdps": "Поддерживаемый урон в секунду", + "dpssdps": "Урон в секунду (поддерживаемый урон в секунду)", + "eps": "Энергия в секунду", + "epsseps": "Энергия в секунду (поддерживаемая энергия в секунду)", + "fallofffromrange": "Спад", + "hps": "Нагрев в секунду", + "hpsshps": "Нагрев в секунду (поддерживаемый нагрев в секунду)", + "damage by": "Урон", + "damage from": "Урон от", + "shield cells": "Щитонакопители", + "recovery": "включение", + "recharge": "перезарядка", + "engine pips": "Пункты в двигателе", + "4b": "4 пункта и Форсаж", + "speed": "скорость", + "pitch": "Тангаж", + "roll": "Крен", + "yaw": "Рыскание", + "internal protection": "Внутренняя защита", + "external protection": "Внешняя защита", + "engagement range": "Боевое расстояние", + "boost interval": "Интервал повышения", + "total": "Всего", + "ammo": "Макс. боекомплект", + "boot": "Время загрузки", + "hacktime": "Время взлома", + "brokenregen": "Скорость восстановления при пробое", + "burst": "Длина очереди", + "burstrof": "Скорострельность очереди", + "clip": "Размер боекомплекта", + "damage": "Урон", + "distdraw": "Тяга распределителя", + "duration": "Продолжительность", + "eff": "Эффективность", + "engcap": "Ресурс двигателей", + "engrate": "Перезарядка двигателей", + "explres": "Сопротивление взрывам", + "facinglimit": "Ограничение по направлению", + "hullboost": "Увеличение корпуса", + "hullreinforcement": "Укрепление корпуса", + "integrity": "Целостность", + "jitter": "Дрожание", + "kinres": "Сопротивление кинетическому урону", + "maxfuel": "Макс. топлива на прыжок", + "mass": "Масса", + "optmass": "Оптимизированная масса", + "optmul": "Оптимальный усилитель", + "pgen": "Мощность", + "piercing": "Бронебойность", + "power": "Мощность", + "protection": "Защита от повреждений", + "range": "Дальность", + "ranget": "Дальность", + "regen": "Скорость восстановления", + "reload": "Перезагрузить", + "rof": "Скорострельность", + "angle": "Угол сканера", + "scanrate": "Скорость сканера", + "proberadius": "Радиус зонда", + "scantime": "Время сканирования", + "shield": "Щит", + "armour": "Броня", + "shieldboost": "Усиление щитов", + "shieldreinforcement": "Усилитель щита", + "shotspeed": "Скорость выстрела", + "shotdmg": "Урон за выстрел(DPS)", + "spinup": "Время раскрутки", + "syscap": "Ресурс систем", + "sysrate": "Перезарядка систем", + "thermload": "Тепловая нагрузка", + "thermres": "Сопротивление термическому урону", + "wepcap": "Орудийный ресурс", + "weprate": "Перезарядка оружия", + "minmass_sg": "Мин. масса корпуса", + "optmass_sg": "Опт. масса корпуса", + "maxmass_sg": "Макс. масса корпуса", + "minmul_sg": "Минимальная прочность", + "optmul_sg": "Оптимальная прочность", + "maxmul_sg": "Максимальная прочность", + "minmass_psg": "Мин. масса корпуса", + "optmass_psg": "Опт. масса корпуса", + "maxmass_psg": "Макс. масса корпуса", + "minmul_psg": "Минимальная прочность", + "optmul_psg": "Оптимальная прочность", + "maxmul_psg": "Максимальная прочность", + "minmass_bsg": "Мин. масса корпуса", + "optmass_bsg": "Опт. масса корпуса", + "maxmass_bsg": "Макс. масса корпуса", + "minmul_bsg": "Минимальная прочность", + "optmul_bsg": "Оптимальная прочность", + "maxmul_bsg": "Максимальная прочность", + "range_s": "Типовой диапозон выброса", + "absolute": "Общий", + "explosive": "Взрывч.", + "kinetic": "Механич.", + "thermal": "Тепл.", + "caustic": "Каустик", + "generator": "Генератор", + "boosters": "Усилители", + "cells": "Ячейки", + "shield addition": "ДОбавления к щиту", + "jump addition": "ДОбавления к прыжку", + "bulkheads": "Переборки", + "reinforcement": "Усилители", + "power and costs": "Энергия и стоимость", + "costs": "Расходы", + "retrofit costs": "цена модификации", + "reload costs": "Стоимость перезарядки", + "profiles": "Графики", + "engine profile": "Двигатели", "fsd profile": "FSD", - "movement profile": "", - "damage to opponent's shields": " ", - "damage to opponent's hull": " ", - "offence": "", - "defence": "", - "shield metrics": " ", - "raw shield strength": " ", - "shield sources": " ", - "damage taken": " ", - "effective shield": " ", - "armour metrics": " ", - "raw armour strength": " ", - "armour sources": " ", - "raw module armour": " ", - "effective armour": " ", - "offence metrics": " ", - "defence metrics": " ", - "fuel carried": " ", - "cargo carried": " ", - "ship control": " ", - "opponent": "", - "opponent's shields": " ", - "opponent's armour": " ", + "movement profile": "Движение", + "damage to opponent's shields": "Урон щиту противника", + "damage to opponent's hull": "Урон корпусу противника", + "offence": "Нападение", + "defence": "Оборона", + "shield metrics": "Данные щита", + "raw shield strength": "Чистая мощность щита", + "shield sources": "Ресурсы щита", + "damage taken": "Полученный урон", + "effective shield": "Эффективный щит", + "armour metrics": "Данные брони", + "raw armour strength": "Чистая мощность брони", + "armour sources": "Ресурсы брони", + "raw module armour": "Чистая броня модулей", + "effective armour": "Эффективная броня", + "offence metrics": "Данные нападения", + "defence metrics": "Данные обороны", + "fuel carried": "Топливо на борту", + "cargo carried": "Груз на борту", + "ship control": "Управление кораблём", + "opponent": "Противник", + "opponent's shields": "Щит противника", + "opponent's armour": "Броня противника", "overall damage": "overall damage", - "shield damage sources": " ", - "armour damage sources": " ", - "never": "", - "stock": "", - "boost": "", + "shield damage sources": "источники урона по щиту", + "armour damage sources": "источники урона по броне", + "never": "Никогда", + "stock": "базовый", + "boost": "форсаж", "tab_defence": "defence", - "federation rank 1": "", - "federation rank 2": "", - "federation rank 3": "", - "federation rank 4": "", - "federation rank 5": " ", - "federation rank 6": "-", - "federation rank 7": "", - "federation rank 8": "", - "federation rank 9": "-", - "federation rank 10": " ", - "federation rank 11": " ", - "federation rank 12": "-", - "federation rank 13": " -", - "federation rank 14": "", - "federation rank required": " ", - "empire rank 1": "", - "empire rank 2": "", - "empire rank 3": "", - "empire rank 4": "", - "empire rank 5": "", - "empire rank 6": "", - "empire rank 7": "", - "empire rank 8": "", - "empire rank 9": "", - "empire rank 10": "", - "empire rank 11": "", - "empire rank 12": "", - "empire rank 13": "", - "empire rank 14": "", - "empire rank required": " ", - "PHRASE_BLUEPRINT_RESET ": " ", - "\/s": "\/", - "m\/s": "\/", - "Ls": ".", - "LY": ".", - "CR": ".", + "federation rank 1": "Рекрут", + "federation rank 2": "Кадет", + "federation rank 3": "Гардемарин", + "federation rank 4": "Старшина", + "federation rank 5": "Главный старшина", + "federation rank 6": "Уорент-офицер", + "federation rank 7": "Энсин", + "federation rank 8": "Лейтенант", + "federation rank 9": "Капитан-лейтенант", + "federation rank 10": "Начальник гарнизона", + "federation rank 11": "Командир корабля", + "federation rank 12": "Контр-адмирал", + "federation rank 13": " Вице-адмирал", + "federation rank 14": "Адмирал", + "federation rank required": "Минимальный ранг федерации для покупки", + "empire rank 1": "Чужак", + "empire rank 2": "Крепостной", + "empire rank 3": "Мастер", + "empire rank 4": "Оруженосец", + "empire rank 5": "Рыцарь", + "empire rank 6": "Лорд", + "empire rank 7": "Барон", + "empire rank 8": "Виконт", + "empire rank 9": "Граф", + "empire rank 10": "Эрл", + "empire rank 11": "Маркиз", + "empire rank 12": "Герцог", + "empire rank 13": "Принц", + "empire rank 14": "Король", + "empire rank required": "Минимальный ранг империи для покупки", + "\/s": "\/с", + "m\/s": "м\/с", + "Ls": "Св.сек", + "LY": "Св.лет", + "CR": "кр.", "S": "M", - "M": "", - "L": "", + "M": "С", + "L": "б", "H": "O", "U": "B", - "small": "", - "medium": "", - "large": "", - "alpha": "", - "beta": "", - "standard": "", - "build name": " ", - "compare all": " ", - "create new": " ", - "damage per second": " ", - "delete all": " ", - "detailed export": " ", - "edit data": "", - "empty all": " ", - "Enter Name": " ", - "farthest range": " ", - "fuel level": " ", - "full tank": " ", - "internal compartments": " ", - "jump range": " ", - "mass lock factor": ". ", - "max mass": " ", - "net cost": " ", - "none created": " ", - "refuel time": " ", - "retrofit from": " ", - "T-Load": ".", - "utility mounts": " ", - "about": " ...", - "action": "", - "added": "", - "available": "", - "backup": " ", - "bins": "", - "build": "c", - "builds": "c", - "buy": "", - "cancel": "", - "cargo": "", - "close": "", - "compare": " ", - "comparison": "", - "comparisons": "", - "cost": "", - "create": "", - "credits": "", - "delete": "", - "dep": "", - "deployed": "", - "disabled": "", - "discount": "", - "DPS": "", - "efficiency": "", - "empty": "", - "ENG": "", - "export": "", - "forum": "", - "fuel": "", - "hardpoints": " ", - "hull": "", - "import": " ", - "insurance": "", - "jumps": "", - "laden": "", - "language": "", - "maneuverability": "", - "max": "", - "no": "", - "pen": "", - "permalink": " ", - "pri": "", - "proceed": "", - "PWR": "", - "rate": "", - "rename": "", - "repair": "", - "ret": ".", - "retracted": "", - "ROF": "\/", - "save": "", - "sell": "", - "settings": "", - "shields": "", - "ship": "", - "ships": "", - "shortened": "", - "size": "", - "skip": "", - "Stock": " ", - "SYS": "", - "time": "", - "type": "", - "unladen": "", - "URL": "", - "WEP": "", - "yes": "" + "small": "Малый", + "medium": "Средний", + "large": "большой", + "alpha": "Альфа", + "beta": "Бета", + "standard": "Стандартный", + "build name": "название сборки", + "compare all": "сравнить все", + "create new": "Создать новый", + "damage per second": "урон в секунду", + "delete all": "Удалить все", + "detailed export": "Подробный экспорт", + "edit data": "Редактирование", + "empty all": "пусто все", + "Enter Name": "Введите имя", + "farthest range": "быстрый диапазон", + "fuel level": "уровень топлива", + "full tank": "Полный бак", + "internal compartments": "внутренние отсеки", + "jump range": "Дальность прыжка", + "mass lock factor": "Масс. блок", + "max mass": "Максимальная масса", + "net cost": "разница в цене", + "none created": "не создано", + "refuel time": "Время дозаправки", + "retrofit from": "модификация от", + "T-Load": "Тепл.", + "utility mounts": "Вспомогательное оборудование", + "about": "О ...", + "action": "Действие", + "added": "Добавлено", + "available": "доступно", + "backup": "Резервная копия", + "bins": "контейнеры", + "build": "cборка", + "builds": "cборки", + "buy": "купить", + "cancel": "отменить", + "cargo": "Груз", + "close": "закрыть", + "compare": "сравнить ", + "comparison": "сравнение", + "comparisons": "сравнения", + "cost": "Стоимость", + "create": "создать", + "credits": "Кредиты", + "delete": "Удалить", + "dep": "Вып", + "deployed": "Открыты", + "disabled": "Отключено", + "discount": "Скидка", + "DPS": "УВС", + "efficiency": "Эффективность", + "empty": "пусто", + "ENG": "ДВИ", + "export": "Экспорт", + "forum": "Форум", + "fuel": "Топливо", + "hardpoints": "Орудийные порты", + "hull": "Корпус", + "import": "импортировать ", + "insurance": "Страховка", + "jumps": "Прыжков", + "laden": "Груженый", + "language": "Язык", + "maneuverability": "Маневренность", + "max": "Макс", + "no": "Нет", + "pen": "ПБ", + "permalink": "Постоянная ссылка", + "pri": "Осн", + "proceed": "продолжить", + "PWR": "Эн", + "rate": "скорость", + "rename": "Переименовать", + "repair": "Починка", + "ret": "Убр.", + "retracted": "Убрано", + "ROF": "В\/сек", + "save": "Сохранить", + "sell": "Продать", + "settings": "Настройки", + "shields": "Щиты", + "ship": "Корабль", + "ships": "Корабли", + "shortened": "Укороченный", + "size": "размер", + "skip": "пропустить", + "Stock": "Стандартная комплектация", + "SYS": "СИС", + "time": "Время", + "type": "Тип", + "unladen": "Пустой", + "URL": "Ссылка", + "WEP": "ОРУЖ", + "yes": "Да" } From 46ba782911e5b0c27c048b6c84ca0cc563cf0d4a Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 23 Jan 2021 15:15:38 +0100 Subject: [PATCH 07/15] Remove hosting from repository --- .dockerignore | 77 ------------------------------------- .gitlab-ci.yml | 13 ------- Dockerfile | 36 ----------------- Dockerfile.dev | 36 ----------------- docker-compose.yml | 44 --------------------- nginx.conf | 96 ---------------------------------------------- 6 files changed, 302 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .gitlab-ci.yml delete mode 100644 Dockerfile delete mode 100644 Dockerfile.dev delete mode 100644 docker-compose.yml delete mode 100644 nginx.conf diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index c43179e2..00000000 --- a/.dockerignore +++ /dev/null @@ -1,77 +0,0 @@ -node_modules -npm-debug.log -### Node template -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 85d3a7f5..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,13 +0,0 @@ -image: docker:stable -services: - - docker:dind - -stages: - - Build image - -docker build: - stage: Build image - script: - - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME . - - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin - - img push edcd/coriolis:$CI_COMMIT_REF_NAME diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index fb4d3284..00000000 --- a/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -### STAGE 1: Build ### -FROM node:9.11.1-alpine as builder -ENV BRANCH=master -WORKDIR /src/app -RUN mkdir -p /src/app/coriolis -RUN mkdir -p /src/app/coriolis-data - -RUN apk add --update git - -RUN npm i -g npm -ADD https://api.github.com/repos/edcd/coriolis-data/git/refs/heads/master /tmp/version.json - -# Set up coriolis-data -WORKDIR /src/app/coriolis-data -RUN git clone https://github.com/EDCD/coriolis-data.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm start - - -ADD https://api.github.com/repos/edcd/coriolis/git/refs/heads/master /tmp/version.json -# Set up coriolis -WORKDIR /src/app/coriolis -RUN git clone https://github.com/EDCD/coriolis.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm run build - - -### STAGE 2: Production Environment ### -FROM fholzer/nginx-brotli as web -COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html -WORKDIR /usr/share/nginx/html -EXPOSE 80 -CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"] diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index 9934de70..00000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,36 +0,0 @@ -### STAGE 1: Build ### -FROM node:9.11.1-alpine as builder -ENV BRANCH=develop -WORKDIR /src/app -RUN mkdir -p /src/app/coriolis -RUN mkdir -p /src/app/coriolis-data - -RUN apk add --update git - -RUN npm i -g npm - -ADD https://api.github.com/repos/edcd/coriolis-data/git/refs/heads/develop /tmp/version.json -# Set up coriolis-data -WORKDIR /src/app/coriolis-data -RUN git clone https://github.com/EDCD/coriolis-data.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm start - - -ADD https://api.github.com/repos/edcd/coriolis/git/refs/heads/develop /tmp/version.json -# Set up coriolis -WORKDIR /src/app/coriolis -RUN git clone https://github.com/EDCD/coriolis.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm run build - - -### STAGE 2: Production Environment ### -FROM fholzer/nginx-brotli as web -COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html -WORKDIR /usr/share/nginx/html -EXPOSE 80 -CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 4fbaee70..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: '3.6' - -services: - master: - image: edcd/coriolis:master - build: - dockerfile: Dockerfile - context: . - args: - branch: master - restart: always - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - networks: - - web - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io" - - "traefik.basic.port=80" - - "traefik.basic.protocol=http" - - develop: - image: edcd/coriolis:develop - build: - dockerfile: Dockerfile.dev - context: . - args: - branch: develop - restart: always - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - networks: - - web - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "traefik.basic.frontend.rule=Host:beta.coriolis.io,beta.coriolis.edcd.io" - - "traefik.basic.port=80" - - "traefik.basic.protocol=http" - -networks: - web: - external: true diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 874aefa0..00000000 --- a/nginx.conf +++ /dev/null @@ -1,96 +0,0 @@ -worker_processes 1; -user nobody nobody; -error_log /tmp/error.log; -pid /tmp/nginx.pid; - -events { - - worker_connections 1024; -} - -http { - - include /etc/nginx/mime.types; - default_type application/octet-stream; - sendfile on; - client_body_temp_path /tmp/client_body; - fastcgi_temp_path /tmp/fastcgi_temp; - proxy_temp_path /tmp/proxy_temp; - scgi_temp_path /tmp/scgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - access_log /tmp/access.log; - error_log /tmp/error.log; - - # https://nginx.org/en/docs/http/ngx_http_gzip_module.html - # Enable gzip compression. - # Default: off - gzip off; - - # Compression level (1-9). - # 5 is a perfect compromise between size and CPU usage, offering about - # 75% reduction for most ASCII files (almost identical to level 9). - # Default: 1 - gzip_comp_level 5; - - # Don't compress anything that's already small and unlikely to shrink much - # if at all (the default is 20 bytes, which is bad as that usually leads to - # larger files after gzipping). - # Default: 20 - gzip_min_length 256; - - # Compress data even for clients that are connecting to us via proxies, - # identified by the "Via" header (required for CloudFront). - # Default: off - gzip_proxied any; - - # Tell proxies to cache both the gzipped and regular version of a resource - # whenever the client's Accept-Encoding capabilities header varies; - # Avoids the issue where a non-gzip capable client (which is extremely rare - # today) would display gibberish if their proxy gave them the gzipped version. - # Default: off - gzip_vary on; - - # Compress all output labeled with one of the following MIME-types. - # text/html is always compressed by gzip module. - # Default: text/html - gzip_types *; - brotli on; - # brotli_static on; - brotli_types *; - # This should be turned on if you are going to have pre-compressed copies (.gz) of - # static files available. If not it should be left off as it will cause extra I/O - # for the check. It is best if you enable this in a location{} block for - # a specific directory, or on an individual server{} level. - # gzip_static on; - keepalive_timeout 3000; - server { - listen 80; - listen [::]:80; - index index.html; - server_name localhost; - root /usr/share/nginx/html; - autoindex on; - - location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ { - add_header Access-Control-Allow-Origin *; - add_header Access-Control-Allow-Credentials true; - add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; - add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; - access_log off; - } - location /service-worker.js { - expires -1; - add_header Access-Control-Allow-Origin *; - add_header Access-Control-Allow-Credentials true; - add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; - add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; - access_log off; - } - location / { - try_files $uri $uri/ /index.html =404; - } - location /iframe.html { - try_files $uri $uri/ /iframe.html =404; - } - } -} From 50401410962c80e6809d105788cb1620d54285f3 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sun, 31 Jan 2021 16:52:40 +0100 Subject: [PATCH 08/15] Remove dead announcements code --- src/app/Coriolis.jsx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx index c90049ad..47485ae4 100644 --- a/src/app/Coriolis.jsx +++ b/src/app/Coriolis.jsx @@ -73,7 +73,6 @@ export default class Coriolis extends React.Component { route: {}, sizeRatio: Persist.getSizeRatio() }; - // this._getAnnouncements(); Router('', (r) => this._setPage(ShipyardPage, r)); Router('/import?', (r) => this._importBuild(r)); Router('/import/:data', (r) => this._importBuild(r)); @@ -127,16 +126,6 @@ export default class Coriolis extends React.Component { } } - async _getAnnouncements() { - try { - const announces = await request.get('https://api.orbis.zone/announcements') - .query({ coriolis: true }); - this.setState({ announcements: announces.body }); - } catch (err) { - console.error(err) - } - } - /** * Updates / Sets the page and route context * @param {[type]} page The page to be shown From 888f807a7b418981566f79f8fc3d0eeb143b0d9a Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sun, 31 Jan 2021 16:57:55 +0100 Subject: [PATCH 09/15] Remove orbis related code --- src/app/components/Header.jsx | 39 ------- src/app/components/ModalBatchOrbis.jsx | 93 ---------------- src/app/components/ModalOrbis.jsx | 141 ------------------------- src/app/components/SvgIcons.jsx | 3 +- src/app/pages/OutfittingPage.jsx | 25 ----- src/app/stores/Persist.js | 24 ----- 6 files changed, 2 insertions(+), 323 deletions(-) delete mode 100644 src/app/components/ModalBatchOrbis.jsx delete mode 100644 src/app/components/ModalOrbis.jsx diff --git a/src/app/components/Header.jsx b/src/app/components/Header.jsx index 6c56e504..18cca21a 100644 --- a/src/app/components/Header.jsx +++ b/src/app/components/Header.jsx @@ -10,7 +10,6 @@ import { Ships } from 'coriolis-data/dist'; import Persist from '../stores/Persist'; import { toDetailedExport } from '../shipyard/Serializer'; import Ship from '../shipyard/Ship'; -import ModalBatchOrbis from './ModalBatchOrbis'; import ModalDeleteAll from './ModalDeleteAll'; import ModalExport from './ModalExport'; import ModalHelp from './ModalHelp'; @@ -241,43 +240,6 @@ export default class Header extends TranslatedComponent { />); }; - /** - * Uploads all ship-builds to orbis - * @param {e} e Event - */ - _uploadAllBuildsToOrbis(e) { - e.preventDefault(); - const data = Persist.getBuilds(); - let postObject = []; - for (const ship in data) { - for (const code in data[ship]) { - const shipModel = ship; - if (!shipModel) { - throw 'No such ship found: "' + ship + '"'; - } - const shipTemplate = Ships[shipModel]; - const shipPostObject = {}; - let shipInstance = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots); - shipInstance.buildWith(null); - shipInstance.buildFrom(data[ship][code]); - shipPostObject.coriolisId = shipInstance.id; - shipPostObject.coriolisShip = shipInstance; - - shipPostObject.coriolisShip.url = window.location.origin + outfitURL(shipModel, data[ship][code], code); - shipPostObject.title = code || shipInstance.id; - shipPostObject.description = code || shipInstance.id; - shipPostObject.ShipName = shipInstance.id; - shipPostObject.Ship = shipInstance.id; - postObject.push(shipPostObject); - } - } - console.log(postObject); - - this.context.showModal(); - } - /** * Show export modal with detailed export * @param {SyntheticEvent} e Event @@ -499,7 +461,6 @@ export default class Header extends TranslatedComponent { {translate('builds')} & {translate('comparisons')}
  • {translate('backup')}
  • {translate('detailed export')}
    • -
  • {translate('upload all builds to orbis')}
  • {translate('import')}
  • {translate('delete all')}
    • diff --git a/src/app/components/ModalBatchOrbis.jsx b/src/app/components/ModalBatchOrbis.jsx deleted file mode 100644 index 3e1c9ad5..00000000 --- a/src/app/components/ModalBatchOrbis.jsx +++ /dev/null @@ -1,93 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import request from 'superagent'; -import TranslatedComponent from './TranslatedComponent'; -import { orbisUpload } from '../utils/ShortenUrl'; -import Persist from '../stores/Persist'; - -/** - * Permalink modal - */ -export default class ModalBatchOrbis extends TranslatedComponent { - - static propTypes = { - ships: PropTypes.any.isRequired - }; - - /** - * Constructor - * @param {Object} props React Component properties - */ - constructor(props) { - super(props); - - this.state = { - orbisCreds: Persist.getOrbisCreds(), - resp: '' - }; - } - - /** - * Send ship to Orbis.zone - * @param {SyntheticEvent} e React Event - * @return {Promise} Promise sending post request to orbis - */ - sendToOrbis(e) { - let agent; - try { - agent = request.agent(); // apparently this crashes somehow - } catch (e) { - console.error(e); - } - if (!agent) { - agent = request; - } - const API_ORBIS = 'https://orbis.zone/api/builds/add/batch'; - return new Promise((resolve, reject) => { - try { - agent - .post(API_ORBIS) - .withCredentials() - .redirects(0) - .set('Content-Type', 'application/json') - .send(this.props.ships) - .end((err, response) => { - console.log(response); - if (err) { - console.error(err); - this.setState({ resp: response.text }); - reject('Bad Request'); - } else { - this.setState({ resp: 'All builds uploaded. Check https://orbis.zone' }); - resolve('All builds uploaded. Check https://orbis.zone'); - } - }); - } catch (e) { - console.log(e); - reject(e.message ? e.message : e); - } - }); - } - - /** - * Render the modal - * @return {React.Component} Modal Content - */ - render() { - let translate = this.context.language.translate; - this.sendToOrbis = this.sendToOrbis.bind(this); - - return
    e.stopPropagation() }> -

    {translate('permalink')}

    -
    - Log in / signup to Orbis -

    -

    {translate('success')}

    - e.target.select() }/> -

    -

    Orbis.zone is currently in a trial period, and may be wiped at any time as development progresses. Some elements are also still placeholders.

    - - -
    ; - } -} diff --git a/src/app/components/ModalOrbis.jsx b/src/app/components/ModalOrbis.jsx deleted file mode 100644 index 9580fdfb..00000000 --- a/src/app/components/ModalOrbis.jsx +++ /dev/null @@ -1,141 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import TranslatedComponent from './TranslatedComponent'; -import { orbisUpload } from '../utils/ShortenUrl'; -import Persist from '../stores/Persist'; - -/** - * Permalink modal - */ -export default class ModalOrbis extends TranslatedComponent { - - static propTypes = { - ship: PropTypes.any.isRequired - }; - - /** - * Constructor - * @param {Object} props React Component properties - */ - constructor(props) { - super(props); - - this.state = { - orbisCreds: Persist.getOrbisCreds(), - orbisUrl: '...', - ship: this.props.ship, - authenticatedStatus: 'Checking...' - }; - this.orbisCategory = this.orbisCategory.bind(this); - } - - /** - * Send ship to Orbis.zone - * @param {SyntheticEvent} e React Event - */ - sendToOrbis(e) { - const target = e.target; - target.disabled = true; - this.setState({ orbisUrl: 'Sending...' }, () => { - orbisUpload(this.props.ship, this.state.orbisCreds) - .then(orbisUrl => { - target.disabled = false; - this.setState({ orbisUrl }); - }) - .catch(err => { - target.disabled = false; - this.setState({ orbisUrl: 'Error - ' + err }); - }); - }); - } - - /** - * Get Orbis.zone auth status - * @returns {Object} auth status - */ - getOrbisAuthStatus() { - return fetch('https://orbis.zone/api/checkauth', { - credentials: 'include', - mode: 'cors' - }) - .then(data => data.json()) - .then(res => { - this.setState({ authenticatedStatus: res.status || res.error }); - }) - .catch(err => { - console.error(err); - this.setState({ authenticatedStatus: err.message }); - }); - } - - /** - * Handler for changing cmdr name - * @param {SyntheticEvent} e React Event - */ - orbisPasswordHandler(e) { - let password = e.target.value; - this.setState({ orbisCreds: { email: this.state.orbisCreds.email, password } }, () => { - Persist.setOrbisCreds(this.state.orbisCreds); - }); - } - - /** - * Handler for changing cmdr name - * @param {SyntheticEvent} e React Event - */ - orbisUsername(e) { - let orbisUsername = e.target.value; - this.setState({ orbisCreds: { email: orbisUsername, password: this.state.orbisCreds.password } }, () => { - Persist.setOrbisCreds(this.state.orbisCreds); - }); - } - - /** - * Handler for changing category - * @param {SyntheticEvent} e React Event - */ - orbisCategory(e) { - let ship = this.state.ship; - let cat = e.target.value; - ship.category = cat; - this.setState({ship}); - } - - /** - * Render the modal - * @return {React.Component} Modal Content - */ - render() { - let translate = this.context.language.translate; - this.orbisPasswordHandler = this.orbisPasswordHandler.bind(this); - this.orbisUsername = this.orbisUsername.bind(this); - this.sendToOrbis = this.sendToOrbis.bind(this); - this.getOrbisAuthStatus(); - return
    e.stopPropagation() }> -

    {translate('upload to orbis')}

    -
    - - e.target.select() }/> -

    - Log in / signup to Orbis -

    -

    Category

    - -

    -

    {translate('Orbis link')}

    - e.target.select() }/> -

    -

    Orbis.zone is currently in a trial period, and may be wiped at any time as development progresses. Some elements are also still placeholders.

    - - -
    ; - } -} diff --git a/src/app/components/SvgIcons.jsx b/src/app/components/SvgIcons.jsx index c226f892..ce4627eb 100644 --- a/src/app/components/SvgIcons.jsx +++ b/src/app/components/SvgIcons.jsx @@ -247,7 +247,8 @@ export class OrbisIcon extends SvgIcon { - ); + + ); } } diff --git a/src/app/pages/OutfittingPage.jsx b/src/app/pages/OutfittingPage.jsx index 3b709258..adc89f58 100644 --- a/src/app/pages/OutfittingPage.jsx +++ b/src/app/pages/OutfittingPage.jsx @@ -19,7 +19,6 @@ import { LinkIcon, ShoppingIcon, MatIcon, - OrbisIcon } from '../components/SvgIcons'; import LZString from 'lz-string'; import ShipSummaryTable from '../components/ShipSummaryTable'; @@ -37,7 +36,6 @@ import OutfittingSubpages from '../components/OutfittingSubpages'; import ModalExport from '../components/ModalExport'; import ModalPermalink from '../components/ModalPermalink'; import ModalShoppingList from '../components/ModalShoppingList'; -import ModalOrbis from '../components/ModalOrbis'; /** * Document Title Generator @@ -680,22 +678,6 @@ export default class OutfittingPage extends Page { this.context.showModal(); } - /** - * Generate Orbis link - */ - _genOrbis() { - const data = {}; - const ship = this.state.ship; - data.title = this.state.buildName || ship.id; - data.description = this.state.buildName || ship.id; - data.body = ship; - data.url = `https://coriolis.io${outfitURL(ship.id, ship.toString(), data.title)}`; - ship.type = ship.id; - - console.log(data); - this.context.showModal(); - } - /** * Open up a window for EDDB with a shopping list of our components */ @@ -945,13 +927,6 @@ export default class OutfittingPage extends Page { > -