More interface translations

LuaUI/Configs/lang/common.en.json

@@ -38,12 +38,16 @@
 	"repeating" : "repeating",
 	"current_project" : "Current project",
 	"lmb" : "Left-click",
+	"lmb_1" : "Left mouse",
 	"mmb" : "Middle-click",
 	"rmb" : "Right-click",
+	"leftrightmb" : "Left/Right click",
 	"clear" : "Clear",
 	"button" : "Button",
 	"shift" : "Shift",
+	"hold" : "Hold",
 	"health" : "Health",
+	"health_absent" : "Health",
 	"value" : "Value",
 	"special" : "Special",
 	"ready" : "Ready",

LuaUI/Configs/lang/common.ru.json

@@ -38,12 +38,16 @@
 	"repeating" : "повторяется",
 	"current_project" : "Текущий проект",
 	"lmb" : "Левый клик",
+	"lmb_1" : "Левый клик",
 	"mmb" : "Средний клик",
 	"rmb" : "Правый клик",
+	"leftrightmb" : "Левый/Правый клик",
 	"clear" : "Очистить",
 	"button" : "Кнопка",
 	"shift" : "Shift",
+	"hold" : "Удерж",
 	"health" : "Здоровье",
+	"health_absent" : "Здоровья",
 	"value" : "Стоимость",
 	"special" : "Особые",
 	"ready" : "Готов",

LuaUI/Configs/lang/interface.en.json

@@ -106,5 +106,136 @@
 		"few" : "%{count} units in queue",
 		"many" : "%{count} units in queue",
 		"other" : "%{count} units in queue"
-	}
+	},
+	"commandpanel_orders" : "Orders",
+	"commandpanel_econ" : "Econ",
+	"commandpanel_defence" : "Defence",
+	"commandpanel_special" : "Special",
+	"commandpanel_factory" : "Factory",
+	"commandpanel_units" : "Units",
+	"facqueue_tooltip_1" : "Add to/subtract from queue",
+	"facqueue_tooltip_2" : "Drag to a different position in queue",
+	"states_activation" : "Activation",
+	"states_activation_tooltip" : "Toggles unit abilities such as radar, shield charge, and radar jamming.",
+	"states_unitai" : "Unit AI",
+	"states_unitai_tooltip" : "Move intelligently in combat.",
+	"states_repeat" : "Repeat",
+	"states_repeat_tooltip" : "Loop factory construction, or the command queue for units.",
+	"states_perscloak" : "Cloak",
+	"states_perscloak_tooltip" : "Turn invisible. Disrupted by damage, firing, abilities, and nearby enemies.",
+	"states_areacloak" : "Area Cloaker",
+	"states_areacloak_tooltip" : "Cloak all friendly units in the area. Does not apply to structures or shield bearers.",
+	"states_priority" : "Construction Priority",
+	"states_priority_tooltip" : "Higher priority construction takes resources before lower priorities.",
+	"states_miscpriority" : "Misc. Priority",
+	"states_miscpriority_tooltip" : "Priority for other resource use, such as morph, stockpile and radar.",
+	"states_autoassist" : "Auto Assist",
+	"states_autoassist_tooltip" : "Newly built constructors stay to assist and boost production.",
+	"states_calltransport" : "Call Transports",
+	"states_calltransport_tooltip" : "Automatically call transports between constructor tasks.",
+	"states_glbuild" : "Global Build Command",
+	"states_glbuild_tooltip" : "Sets constructors to execute global build orders.",
+	"states_holdposition" : "Hold Position",
+	"states_holdposition_tooltip" : "Prevent units from moving when idle. States are persistent and togglable.",
+	"states_movestate" : "Move State",
+	"states_movestate_tooltip" : "Sets how far out of its way a unit will move to attack enemies.",
+	"states_movestate_hold" : "Hold Position",
+	"states_movestate_manuever" : "Maneuver",
+	"states_movestate_roam" : "Roam",
+	"states_holdfire" : "Hold Fire",
+	"states_holdfire_tooltip" : "Prevent units from firing unless a direct command or target is set.",
+	"states_firestate" : "Fire State",
+	"states_firestate_tooltip" : "Sets when a unit will automatically shoot.",
+	"states_firestate_hold" : "Hold Fire",
+	"states_firestate_return" : "Return Fire",
+	"states_firestate_weaponsfree" : "Fire At Will",
+	"states_retreat" : "Retreat",
+	"states_retreat_tooltip" : "Retreat to the closest Airpad or Retreat Zone (placed via the top left of the screen). Right click to disable.",
+	"states_airidle" : "Air Idle State",
+	"states_airidle_tooltip" : "Set whether aircraft lands when idle.",
+	"states_factoryairidle" : "Air Factory Idle State",
+	"states_factoryairidle_tooltip" : "Set whether produced aircraft land when idle.",
+	"states_planeland_no" : "Fly",
+	"states_planeland_yes" : "Land",
+	"states_divebombing" : "Bomber Dive State",
+	"states_divebombing_tooltip" : "Set when Ravens dive.",
+	"states_divebombing_flyhigh" : "Always Fly High",
+	"states_divebombing_shieldandunits" : "Against Shields and Units",
+	"states_divebombing_units" : "Against Units",
+	"states_divebombing_golow" : "Always Fly Low",
+	"states_killcap" : "Kill Captured",
+	"states_killcap_tooltip" : "Set whether to kill captured units.",
+	"states_killcap_kill" : "Kill",
+	"states_killcap_keep" : "Keep",
+	"states_puppygoo" : "Puppy Replication",
+	"states_puppygoo_tooltip" : "Set whether Puppies use nearby wrecks to make more Puppies.",
+	"states_puppygoo_onbutcloaked" : "On except cloaked",
+	"states_puppygoo_onalways" : "On always",
+	"states_attackcom" : "Allow attack commands",
+	"states_attackcom_tooltip" : "Set whether the unit responds to attack commands.",
+	"states_attackcom_allowed" : "Allowed",
+	"states_attackcom_blocked" : "Blocked",
+	"states_pushpull" : "Impulse Mode",
+	"states_pushpull_tooltip" : "Set whether gravity guns push or pull.",
+	"states_pushpull_pull" : "Pull",
+	"states_pushpull_push" : "Push",
+	"states_radartargeting" : "Fire At Radar State",
+	"states_radartargeting_tooltip" : "Set whether precise units with high reload time fire at radar dots.",
+	"states_radartargeting_fire" : "Fire",
+	"states_radartargeting_hold" : "Hold Fire",
+	"states_overkill" : "Overkill Prevention",
+	"states_overkill_tooltip" : "Prevents units from shooting at already doomed enemies.",
+	"states_firearc" : "Trajectory",
+	"states_firearc_tooltip" : "Set whether units fire at a high or low arc.",
+	"states_firearc_low" : "Low",
+	"states_firearc_high" : "High",
+	"states_gsstrafe" : "Gunship Strafe",
+	"states_gsstrafe_no" : "No Strafe",
+	"states_gsstrafe_yes" : "Strafe",
+	"states_gsstrafe_tooltip" : "Set whether gunships strafe when fighting.",
+	"states_waterfloat" : "Float State",
+	"states_waterfloat_tooltip" : "Set when certain amphibious units float to the surface.",
+	"states_waterfloat_never" : "Never Float",
+	"states_waterfloat_tofire" : "Float To Fire",
+	"states_waterfloat_always" : "Always Float",
+	"states_selectionrank" : "Selection Rank",
+	"states_selectionrank_tooltip" : "Priority for selection filtering.",
+	"states_drones" : "Drone Construction",
+	"states_drones_tooltip" : "Toggle drone creation.",
+	"states_smthng_off" : "Off",
+	"states_smthng_on" : "On",
+	"states_smthng_disabled" : "Disabled",
+	"states_smthng_enabled" : "Enabled",
+	"states_smthng_low" : "Low",
+	"states_smthng_normal" : "Normal",
+	"states_smthng_high" : "High",
+	"commands_newton_firezone" : "Set a Newton firezone. Newtons will fire at all units in the area (including allies).",
+	"commands_newton_firezone_stop" : "Disasociate Newton from current firezone.",
+	"commands_forcefire" : "Force Fire: Shoot at a particular target or position.",
+	"commands_stop" : "Stop: Halt the unit and clear its command queue.",
+	"commands_attackmove" : "Attack Move: Move to a position engaging targets on the way.",
+	"commands_patrol" : "Patrol: Attack Move back and forth between one or more waypoints.",
+	"commands_wait" : "Wait: Pause the units command queue and have it hold its current position.",
+	"commands_repair" : "Repair: Assist construction or repair a unit. Click and drag for area repair.",
+	"commands_reclaim" : "Reclaim: Take resources from a wreck. Click and drag for area reclaim.",
+	"commands_res" : "Resurrect: Spend energy to turn a wreck into a unit.",
+	"commands_dgun" : "Fire Special Weapon: Fire the unit's special weapon.",
+	"commands_stockpile" : "Stockpile: Queue missile production. Right click to reduce the queue.",
+	"commands_load" : "Load: Pick up a unit. Click and drag to load unit in an area.",
+	"commands_unload" : "Unload: Set down a carried unit. Click and drag to unload in an area.",
+	"commands_areaattack" : "Area Attack: Indiscriminately bomb the terrain in an area.",
+	"commands_guard" : "Guard: Protect the target and assist its production.",
+	"commands_resupply" : "Resupply: Return to nearest repair pad for health and ammo.",
+	"commands_settarget" : "Set Target: Set a priority target that is indepdent of the units command queue.",
+	"commands_canceltarget" : "Cancel Target: Cancel the units priority target.",
+	"startup_commenu_sitelink" : "You can customize your commanders on the Zero-K site: https://zero-k.info",
+	"startup_commenu_tooltips" : "Module tooltips",
+	"startup_commenu_title" : "COMMANDER SELECTOR",
+	"startup_commenu_open" : "Open comm selection screen",
+	"startup_commenu_close" : "CLOSE",
+	"com_upgrademenu_title" : "Modules",
+	"com_upgrademenu_start" : "Start upgrade",
+	"com_upgrademenu_currentupgrades" : "View current modules",
+	"com_upgrademenu_cancel" : "Cancel module selection",
+	"com_upgrademenu_tooltip" : "Upgrade Commander"
 }

LuaUI/Configs/lang/interface.ru.json

@@ -106,5 +106,136 @@
 		"few" : "%{count} юнита в очереди.",
 		"many" : "%{count} юнитов в очереди.",
 		"other" : "%{count} юнитов в очереди."
-	}
+	},
+	"commandpanel_orders" : "Приказы",
+	"commandpanel_econ" : "Эко",
+	"commandpanel_defence" : "Оборона",
+	"commandpanel_special" : "Спец",
+	"commandpanel_factory" : "Заводы",
+	"commandpanel_units" : "Юниты",
+	"facqueue_tooltip_1" : "Добавить/убрать из очереди строительства",
+	"facqueue_tooltip_2" : "Перетянуть в другую позицию в очереди",
+	"states_activation" : "Activation",
+	"states_activation_tooltip" : "Toggles unit abilities such as radar, shield charge, and radar jamming.",
+	"states_unitai" : "Unit AI",
+	"states_unitai_tooltip" : "Move intelligently in combat.",
+	"states_repeat" : "Repeat",
+	"states_repeat_tooltip" : "Loop factory construction, or the command queue for units.",
+	"states_perscloak" : "Cloak",
+	"states_perscloak_tooltip" : "Turn invisible. Disrupted by damage, firing, abilities, and nearby enemies.",
+	"states_areacloak" : "Area Cloaker",
+	"states_areacloak_tooltip" : "Cloak all friendly units in the area. Does not apply to structures or shield bearers.",
+	"states_priority" : "Construction Priority",
+	"states_priority_tooltip" : "Higher priority construction takes resources before lower priorities.",
+	"states_miscpriority" : "Misc. Priority",
+	"states_miscpriority_tooltip" : "Priority for other resource use, such as morph, stockpile and radar.",
+	"states_autoassist" : "Auto Assist",
+	"states_autoassist_tooltip" : "Newly built constructors stay to assist and boost production.",
+	"states_calltransport" : "Call Transports",
+	"states_calltransport_tooltip" : "Automatically call transports between constructor tasks.",
+	"states_glbuild" : "Global Build Command",
+	"states_glbuild_tooltip" : "Sets constructors to execute global build orders.",
+	"states_holdposition" : "Hold Position",
+	"states_holdposition_tooltip" : "Prevent units from moving when idle. States are persistent and togglable.",
+	"states_movestate" : "Move State",
+	"states_movestate_tooltip" : "Sets how far out of its way a unit will move to attack enemies.",
+	"states_movestate_hold" : "Hold Position",
+	"states_movestate_manuever" : "Maneuver",
+	"states_movestate_roam" : "Roam",
+	"states_holdfire" : "Hold Fire",
+	"states_holdfire_tooltip" : "Prevent units from firing unless a direct command or target is set.",
+	"states_firestate" : "Fire State",
+	"states_firestate_tooltip" : "Sets when a unit will automatically shoot.",
+	"states_firestate_hold" : "Hold Fire",
+	"states_firestate_return" : "Return Fire",
+	"states_firestate_weaponsfree" : "Fire At Will",
+	"states_retreat" : "Retreat",
+	"states_retreat_tooltip" : "Retreat to the closest Airpad or Retreat Zone (placed via the top left of the screen). Right click to disable.",
+	"states_airidle" : "Air Idle State",
+	"states_airidle_tooltip" : "Set whether aircraft lands when idle.",
+	"states_factoryairidle" : "Air Factory Idle State",
+	"states_factoryairidle_tooltip" : "Set whether produced aircraft land when idle.",
+	"states_planeland_no" : "Fly",
+	"states_planeland_yes" : "Land",
+	"states_divebombing" : "Bomber Dive State",
+	"states_divebombing_tooltip" : "Set when Ravens dive.",
+	"states_divebombing_flyhigh" : "Always Fly High",
+	"states_divebombing_shieldandunits" : "Against Shields and Units",
+	"states_divebombing_units" : "Against Units",
+	"states_divebombing_golow" : "Always Fly Low",
+	"states_killcap" : "Kill Captured",
+	"states_killcap_tooltip" : "Set whether to kill captured units.",
+	"states_killcap_kill" : "Kill",
+	"states_killcap_keep" : "Keep",
+	"states_puppygoo" : "Puppy Replication",
+	"states_puppygoo_tooltip" : "Set whether Puppies use nearby wrecks to make more Puppies.",
+	"states_puppygoo_onbutcloaked" : "On except cloaked",
+	"states_puppygoo_onalways" : "On always",
+	"states_attackcom" : "Allow attack commands",
+	"states_attackcom_tooltip" : "Set whether the unit responds to attack commands.",
+	"states_attackcom_allowed" : "Allowed",
+	"states_attackcom_blocked" : "Blocked",
+	"states_pushpull" : "Impulse Mode",
+	"states_pushpull_tooltip" : "Set whether gravity guns push or pull.",
+	"states_pushpull_pull" : "Pull",
+	"states_pushpull_push" : "Push",
+	"states_radartargeting" : "Fire At Radar State",
+	"states_radartargeting_tooltip" : "Set whether precise units with high reload time fire at radar dots.",
+	"states_radartargeting_fire" : "Fire",
+	"states_radartargeting_hold" : "Hold Fire",
+	"states_overkill" : "Overkill Prevention",
+	"states_overkill_tooltip" : "Prevents units from shooting at already doomed enemies.",
+	"states_firearc" : "Trajectory",
+	"states_firearc_tooltip" : "Set whether units fire at a high or low arc.",
+	"states_firearc_low" : "Low",
+	"states_firearc_high" : "High",
+	"states_gsstrafe" : "Gunship Strafe",
+	"states_gsstrafe_no" : "No Strafe",
+	"states_gsstrafe_yes" : "Strafe",
+	"states_gsstrafe_tooltip" : "Set whether gunships strafe when fighting.",
+	"states_waterfloat" : "Float State",
+	"states_waterfloat_tooltip" : "Set when certain amphibious units float to the surface.",
+	"states_waterfloat_never" : "Never Float",
+	"states_waterfloat_tofire" : "Float To Fire",
+	"states_waterfloat_always" : "Always Float",
+	"states_selectionrank" : "Selection Rank",
+	"states_selectionrank_tooltip" : "Priority for selection filtering.",
+	"states_drones" : "Drone Construction",
+	"states_drones_tooltip" : "Toggle drone creation.",
+	"states_smthng_off" : "Выкл",
+	"states_smthng_on" : "Вкл",
+	"states_smthng_disabled" : "Отключено",
+	"states_smthng_enabled" : "Включено",
+	"states_smthng_low" : "Низкий",
+	"states_smthng_normal" : "Средний",
+	"states_smthng_high" : "Высокий",
+	"commands_newton_firezone" : "Установить зону стрельбы турелей Ньютон. Они будут открывать огонь по всем целям в выбранной зоне (включая союзников).",
+	"commands_newton_firezone_stop" : "Прекращает огонь по установленной зоне стрельбы.",
+	"commands_forcefire" : "Атака: Открыть огонь по выбранной цели или местности.",
+	"commands_stop" : "Stop: Halt the unit and clear its command queue.",
+	"commands_attackmove" : "Наступление: Двигаться к выбранной позиции нападая на любых противников на маршруте.",
+	"commands_patrol" : "Patrol: Attack Move back and forth between one or more waypoints.",
+	"commands_wait" : "Ожидать: Приостановить выполнение текущих приказов и удерживать позицию.",
+	"commands_repair" : "Repair: Assist construction or repair a unit. Click and drag for area repair.",
+	"commands_reclaim" : "Reclaim: Take resources from a wreck. Click and drag for area reclaim.",
+	"commands_res" : "Resurrect: Spend energy to turn a wreck into a unit.",
+	"commands_dgun" : "Использовать экспериментальное вооружение: Атаковать с использованием специального оружия юнита.",
+	"commands_stockpile" : "Stockpile: Queue missile production. Right click to reduce the queue.",
+	"commands_load" : "Load: Pick up a unit. Click and drag to load unit in an area.",
+	"commands_unload" : "Unload: Set down a carried unit. Click and drag to unload in an area.",
+	"commands_areaattack" : "Area Attack: Indiscriminately bomb the terrain in an area.",
+	"commands_guard" : "Охранять: Защишать цель и содействовать её производству.",
+	"commands_resupply" : "Переоснащение: Возвратиться к ближайщей ВВП для ремонта и перезарядки.",
+	"commands_settarget" : "Особая цель: Устанавливает приоритетную цель. Юниты и сооружения будут атаковать её вне зависимости от иных команд.",
+	"commands_canceltarget" : "Отменить цель: Удалить приоритетную цель выбранных юнитов и сооружений.",
+	"startup_commenu_sitelink" : "Персонализация командира доступна на сайте Zero-K: https://zero-k.info",
+	"startup_commenu_tooltips" : "          Модули",
+	"startup_commenu_title" : "ВЫБОР КОМАНДИРА",
+	"startup_commenu_open" : "Открыть окно выбора командира",
+	"startup_commenu_close" : "ЗАКРЫТЬ",
+	"com_upgrademenu_title" : "Модули",
+	"com_upgrademenu_start" : "Модификация командира",
+	"com_upgrademenu_currentupgrades" : "Обзор установленных модулей",
+	"com_upgrademenu_cancel" : "Закрыть окно выбора модулей",
+	"com_upgrademenu_tooltip" : "Начать модификацию"
 }

LuaUI/Widgets/api_i18n.lua

@@ -138,7 +138,10 @@ local function shutdownTranslation(widget_name)
 end
 
 local function Translate (db, text, data)
-	return translations[db].i18n(text, data)
+	if not translations[db] then
+		Spring.Log("i18n", LOG.ERROR, "attempt to translate string "..text.." from absent db "..db);
+	end
+	return translations[db].i18n(text, data) or text
 end
 
 WG.lang = lang

LuaUI/Widgets/cmd_newton_firezone.lua

@@ -53,7 +53,7 @@ local CMD_STOP_NEWTON_FIREZONE = 10284
 local cmdFirezone = {
 	id      = CMD_NEWTON_FIREZONE,
 	type    = CMDTYPE.ICON_UNIT_OR_RECTANGLE,
-	tooltip = 'Set a Newton firezone. Newtons will fire at all units in the area (including allies).',
+	tooltip = WG.Translate("interface", "commands_newton_firezone"),
 	cursor  = 'Attack',
 	action  = 'setfirezone',
 	params  = { },
@@ -64,7 +64,7 @@ local cmdFirezone = {
 local cmdStopFirezone = {
 	id      = CMD_STOP_NEWTON_FIREZONE,
 	type    = CMDTYPE.ICON ,
-	tooltip = 'Disasociate Newton from current firezone.',
+	tooltip = WG.Translate("interface", "commands_newton_firezone_stop"),
 	cursor  = 'Stop',
 	action  = 'cancelfirezone',
 	params  = { },