Merge upstream 0.2.2 and resolve reroll conflicts (#408)

public/i18n/en.json

@@ -104,6 +104,9 @@
   "复制密钥": "Copy Key",
   "复制链接": "Copy Link",
   "由创建者选择": "Chosen by the Host",
+  "由创建者设置": "Set by the Host",
+  "AI 队友最后选择": "AI Teammates Pick Last",
+  "策略与机变轮选时，所有博士先于 AI 队友选择": "In the Strategy and Improv drafts, every Doctor picks before the AI teammates",
   "连接中断，请稍候重试": "Connection lost, please try again shortly",
   "离开同盟": "Leave Alliance",
   "你是同盟的创建者，离开后创建者身份将移交或同盟解散。确定离开吗？": "You are the Host of this Alliance. If you leave, host duties will be handed over or the Alliance will disband. Leave anyway?",
@@ -148,6 +151,7 @@
   "完成": "Done",
   "背景音乐": "Music",
   "干员语音": "Operator Voices",
+  "语音语言": "Voice Language",
   "音效": "Sound Effects",
   "静音": "Mute",
   "显示伤害数字": "Damage Numbers",
@@ -382,6 +386,12 @@
   "CONTINGENCY // 机变阶段": "CONTINGENCY // Improv Phase",
   "选择一项": "Choose one",
   "倒计时结束后仍未选定将自动分配": "If no choice is made before the countdown ends, one will be assigned automatically",
+  "教鞭选择": "Pointing Stick Choice",
+  "教鞭 · 战术特训": "Pointing Stick · Tactical Training",
+  "请选择一项战术特训": "Choose a Tactical Training bounty",
+  "请先完成教鞭选择": "Complete the Pointing Stick choice first",
+  "休整期结束时未选择将自动选定": "An unselected bounty will be picked automatically when the Rest Phase ends",
+  "从候选中选择一项战术特训": "Choose one Tactical Training bounty from the offered cards",
   "选择一项（无时间限制）": "Choose one (no time limit)",
   " · 点击卡牌选中，再次点击确认": " · Tap a card to select, tap again to confirm",
   "已完成选择": "Choice made",
@@ -681,6 +691,7 @@
   " · 未装备模组": " · No Module equipped",
   "已购买": "Purchased",
   "已招募": "Recruited",
+  "空栏位：刷新或下回合开始时补满": "Empty slot: filled by the next refresh or at the start of the next round",
   "再次点击确认升级（{price} 资金）": "Tap again to confirm upgrade ({price} Funds)",
   "升级调度中心（{price} 资金） · {key}": "Upgrade Dispatch Center ({price} Funds) · {key}",
   "已满级": "Max Level",
@@ -777,6 +788,7 @@
   "观战席": "Spectators",
   "移出观战者 {name}": "Remove spectator {name}",
   "移出该观战者": "Remove this spectator",
+  "观战者不占博士席位，只能观看；创建者可以把观战者移出，被移出的人不再收到战场画面。": "Spectators take no Doctor seat and can only watch; the Host can remove a spectator, who then no longer receives the battlefield.",
   "入座": "Take a Seat",
   "移出同盟": "Remove from Alliance",
   "确定将「{name}」移出同盟吗？对方可以凭同盟密钥重新加入。": "Remove \"{name}\" from the Alliance? They can rejoin with the Alliance Key.",
@@ -808,6 +820,15 @@
   "已恢复默认快捷键": "Default hotkeys restored",
   "快捷键需要实体键盘；触屏设备连接键盘后可用": "Hotkeys need a physical keyboard; connect one to use them on a touch device",
   "查看 / 更改快捷键": "Show / change hotkeys",
+  "问题反馈": "Report a problem",
+  "复制诊断信息": "Copy diagnostics",
+  "遇到问题时，复制诊断信息并粘贴到 GitHub issue 中，开发者就能看到出错时的情况。诊断信息只在本机生成，不会自动上传；玩家名和房间号会被替换。": "If something goes wrong, copy the diagnostics and paste them into a GitHub issue so the developers can see what happened. They are generated on this device and never uploaded; player names and the room code are replaced.",
+  "已记录的错误": "Errors recorded",
+  "附上本场战斗": "Attach this battle",
+  "开发者可以用附上的战斗数据重现这场战斗。": "Developers can replay this battle from the attached data.",
+  "已复制诊断信息，可以粘贴到 GitHub issue 中": "Diagnostics copied. Paste them into a GitHub issue.",
+  "无法写入剪贴板，请手动复制下面的内容": "Couldn't write to the clipboard. Copy the text below by hand.",
+  "诊断信息": "Diagnostics",
   "观战中无法进行该操作": "Spectators cannot do that",
   "标准": "Standard",
   "险境": "Perilous",
@@ -815,6 +836,8 @@
   "终极": "Ultimate",
   "rounds::回合": "Rounds",
   "{who}：获得{name}": "{who}: obtained {name}",
+  "{who}：卡池中已没有{name}": "{who}: no {name} left in the shared pool",
+  "{who}：没有可获得的同盟约干员": "{who}: no Operator of the same Alliance can be obtained",
   "获得{name}": "Obtained {name}",
   "联防阶段：{names} 迎战突破防线的敌人": "Unite Phase: {names} take on the enemies that broke through",
   "地形变化：{names}无法停留在原位置，已撤回整备区": "Terrain change: {names} can no longer stay in place and returned to the Bench",
@@ -903,6 +926,22 @@
   "地面单位可通过": "Ground units can pass",
   "地形机制": "Terrain Mechanics",
   "这一格": "This Tile",
+  "场地装置": "Stage Device",
+  "装置机制": "Device Mechanics",
+  "挡在地面上的工事：地面敌人会绕开它走；只有无路可走时才会撞上来，把它摧毁后继续前进": "An obstacle on the ground: ground enemies walk around it, and only run into it when there is no other way through, destroying it before moving on",
+  "生命 {hp} 点，被摧毁后从场上消失": "{hp} HP; it disappears from the battlefield once destroyed",
+  "自动攻击射程内的一名敌人，造成法术伤害，命中的敌人附加脆弱": "Automatically attacks one enemy in range for Arts damage; the enemy hit is inflicted with Fragile",
+  "按当前层数最高的盟约计算：每 1 层，攻击速度 +{aspd}（至多 +{aspdMax}），附加的脆弱 +{frag}%（至多 +{fragMax}%）": "Scales with the Alliance that currently has the most stacks: per stack, ASPD +{aspd} (up to +{aspdMax}) and the Fragile it inflicts +{frag}% (up to +{fragMax}%)",
+  "脆弱持续 {sec} 秒": "The Fragile lasts {sec} {sec|second|seconds}",
+  "高台位装置：地面敌人不能走上这一格": "A high-ground device: ground enemies cannot walk onto this tile",
+  "远程位干员可以部署在其上；站上去的干员在高位，不阻挡敌人": "Ranged-position Operators can be deployed on it; an Operator standing on it is on high ground and does not block enemies",
+  "向前方 {n} 格吹出气流（这一台朝{dir}）": "Blows an airflow {n} {n|tile|tiles} ahead (this one faces {dir})",
+  "朝向与风向相同的攻击力 {v}": "ATK {v} when facing the same way as the airflow",
+  "相反的 {v}": "{v} when facing the opposite way",
+  "部署在气流里的干员：{mods}": "Operators deployed in the airflow: {mods}",
+  "顺风移动速度 ×{v}": "Movement Speed ×{v} moving with the airflow",
+  "逆风 ×{v}": "×{v} moving against it",
+  "在气流里移动的敌人：{mods}": "Enemies moving in the airflow: {mods}",
   "全部清空": "Clear All",
   "清空全部 {n} 个自选名额？": "Clear all {n} Custom Squad {n|slot|slots}?",
   "文件过大，请选择「导出」下载的自选编队文件": "The file is too large. Choose a Custom Squad file downloaded with \"Export\".",
@@ -1056,6 +1095,95 @@
   "选择朝向": "Choose a facing",
   "朝向：{dir}": "Facing: {dir}",
   "开发版 · 不稳定，请勿用于公开服务器": "Development build · unstable, not for public servers",
+  "统计数据": "Statistics",
+  "统计": "Stats",
+  "总览": "Overview",
+  "总局数": "Games",
+  "胜场": "Wins",
+  "胜率": "Win rate",
+  "到达隐秘核心": "Hidden Core reached",
+  "通关隐秘核心": "Hidden Core cleared",
+  "最远回合": "Best round",
+  "累计时长": "Time played",
+  "{n} 分": "{n} min",
+  "难度": "Difficulty",
+  "局数": "Games",
+  "隐秘核心通关": "Hidden Core clears",
+  "使用局数": "Used",
+  "通过局数": "Cleared",
+  "通过率": "Clear rate",
+  "称号": "Titles",
+  "战斗累计": "Combat totals",
+  "时间": "Time",
+  "模式": "Mode",
+  "结果": "Result",
+  "点击查看该局结算": "View this match's settlement",
+  "单人": "Solo",
+  "同盟": "Co-op",
+  "胜": "Win",
+  "负": "Loss",
+  "已导出 {n} 条对局记录": "Exported {n} match {n|record|records}",
+  "已导入 {added} 条记录{tail}": "Imported {added} {added|record|records}{tail}",
+  "（跳过重复 {skipped} 条）": " ({skipped} {skipped|duplicate|duplicates} skipped)",
+  "没有新记录（全部与现有数据重复）": "Nothing new (everything already exists)",
+  "导入失败：不是有效的统计导出文件": "Import failed: not a valid stats export file",
+  "已清空本机统计数据": "Local stats cleared",
+  "本机数据 · 仅记录本浏览器中你参与的对局": "Local data · only matches you took part in, in this browser",
+  "检测到更新版本的统计数据，请先升级客户端再查看，以免覆盖数据。": "Stats data from a newer version detected — upgrade the client before viewing, or the data could be overwritten.",
+  "还没有记录 —— 完成一局对局后，这里会开始积累。": "No records yet — finish a match and the page starts filling in.",
+  "未知": "Unknown",
+  "对局记录": "Match history",
+  "{n} 小时": "{n} h",
+  "计入统计：打到结算的对局，以及中途退出前至少清完 1 个回合的对局；更早退出的对局只留在对局记录里。": "Counted: matches played to the settlement, and matches given up after clearing at least 1 round. Matches given up earlier stay in the match history only.",
+  "另有 {n} 局未计入统计": "{n} more {n|match|matches} not counted",
+  "没有清完第一个回合就退出，不计入统计": "Left before clearing the first round — not counted",
+  "中途退出的对局没有结算可看": "A match given up has no settlement to view",
+  "较早的对局只保留汇总，不能回看结算": "Older matches keep only their summary — no settlement to view",
+  "中途退出": "Left early",
+  "不计入统计": "Not counted",
+  "显示更多（还有 {n} 局）": "Show more ({n} left)",
+  "点击一行，回看该局结算；中途退出的对局只留记录。": "Click a row to re-view that match's settlement; a match given up only leaves its entry.",
+  "最多保留最近 {max} 局，只有最新的 {full} 局能回看结算。": "Only the latest {max} matches are kept, and only the newest {full} can show their settlement again.",
+  "返回统计": "Back to Stats",
+  "文件过大，无法导入": "File too large to import",
+  "无法写入本机存储，可能已满": "Could not write to local storage — it may be full",
+  "（{n} 条无法读取）": " ({n} unreadable)",
+  "导入失败：这份文件由更新版本的客户端导出，请先升级客户端": "Import failed: this file was exported by a newer client — upgrade the client first",
+  "清空统计数据": "Clear Statistics",
+  "将删除本机保存的 {n} 条对局记录，无法恢复。": "This deletes the {n} match {n|record|records} stored on this device. It cannot be undone.",
+  "导出为文件（可在别的设备上导入）": "Export to a file (import it on another device)",
+  "从导出的文件导入（与现有记录合并）": "Import from an exported file (merged with the current records)",
+  "清空本机的统计数据": "Clear the statistics stored on this device",
+  "本机数据：只保存在这个浏览器里，不会上传到服务器；同盟对局里队友的代号也会存在本机（导出文件里也有）。": "Local data: kept only in this browser, never uploaded to the server. Teammates' names from Team Simulations are stored here too (and appear in an export file).",
+  "本机保存的统计数据无法读取，已另存为备份，从现在起重新记录。": "The stats stored on this device could not be read. They were set aside as a backup and recording starts afresh.",
+  "有 {n} 条记录已损坏，已忽略。": "{n} damaged {n|record was|records were} ignored.",
+  "攻回": "Offensive",
+  "受回": "Defensive",
+  "自回": "Auto",
+  "常驻": "Always",
+  "瞬发": "Instant",
+  "部署触发": "On deployment",
+  "未精英化": "Non-Elite",
+  "精英阶段1": "Elite 1",
+  "精英阶段2": "Elite 2",
+  "精英阶段2-60级": "Elite 2 Lv.60",
+  "潜能": "Potential",
+  "潜能 {n}": "Potential {n}",
+  "练度": "Development",
+  "潜能与练度": "Potential & development",
+  "满潜能 · 精英2 Lv.60": "Max potential · Elite 2 Lv.60",
+  "干员持有中标记为未持有：替补干员没有潜能与练度；这里的设置在改回「持有」后生效": "Marked as not owned on Operator Roster: the stand-in has no potential or development; these settings apply once it is owned again",
+  "原型干员没有潜能与练度": "A prototype Operator has no potential or development",
+  "模组仅在精锐形态生效": "Modules apply only to the Elite form",
+  "未持有（干员持有）：由替补干员上场，替补干员没有潜能与练度": "Not owned (Operator Roster): its stand-in fights, with no potential or development",
+  "含潜能与练度；": "Potential and development included; ",
+  "将 {nChanged} 名干员的技能、模组、潜能与练度恢复为默认配置？": "Reset the skills, modules, potential and development of {nChanged} Operators to their defaults?",
+  "已导入 {n} 名干员的潜能与练度": "Imported the potential and development of {n} Operators",
+  "精英1": "E1",
+  "精英2": "E2",
+  "精英2 Lv.60": "E2 Lv.60",
+  "开始模拟前可调整干员携带的技能与模组，以及潜能与练度；干员的局内等级不可调整": "Before the simulation starts you can change the Skills and Modules your Operators carry, and their potential and development; Operator levels in the match cannot be changed",
+  "默认满潜能、精英2 Lv.60（满加成）。官方的潜能取你自己的潜能，练度是自持有加成（已持有的同名干员的养成，攻击 / 防御 / 生命单独乘算）；未持有的特许干员在官方按潜能1、没有加成，要照官方打请手动设为潜能1、未精英化。": "Default: max Potential, Elite 2 Lv.60 (the full bonus). Officially, Potential is your own and development is the owned-operator bonus (your training of the same Operator: ATK / DEF / HP, a separate multiplier); a licensed Operator you do not own fights at Potential 1 with no bonus — to play it that way, set Potential 1 and Non-Elite here.",
 	"重刷本局": "Reroll Setup",
 	"重刷本局投票：{agreed}/{total}": "Setup Reroll Vote: {agreed}/{total}",
 	"全员同意后重新随机战场、领袖、特训敌人和禁用；确认倒计时已暂停。": "Unanimous consent rerolls the battlefield, leader, special enemies and bans. The briefing countdown is paused.",