Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-08 14:33:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Felix Linker
2021-08-08 11:24:07 +02:00
parent 86b95981f1 688eebb9ea
commit 821daefeb8
5 changed files with 1669 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/ModificationsMenu.jsx
View File

@@ -436,7 +436,7 @@ export default class ModificationsMenu extends TranslatedComponent {
let specialLabel;
let specialTt;
if (m.blueprint && m.blueprint.special) {
specialLabel = m.blueprint.special.name;
specialLabel = translate(m.blueprint.special.name);
specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.edname);
} else {
specialLabel = translate('PHRASE_SELECT_SPECIAL');

900
src/app/i18n/de.json
View File

File diff suppressed because one or more lines are too long

668
src/app/i18n/pt.json
View File

File diff suppressed because one or more lines are too long

1237
src/app/i18n/ru.json
View File

File diff suppressed because it is too large Load Diff

4
src/app/pages/ShipyardPage.jsx
View File

@@ -544,7 +544,7 @@ export default class ShipyardPage extends Page {
</th>
<th
className="sortable"
onMouseEnter={termtip.bind(null, 'power distriubtor')}
onMouseEnter={termtip.bind(null, 'power distributor')}
onMouseLeave={hide}
onClick={sortShips('standard', 4)}
>
@@ -615,7 +615,7 @@ export default class ShipyardPage extends Page {
</div>
</div>
<div className="table-tools" >
<label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>Group highlighted ships</label>
<label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>{translate('Group highlighted ships')}</label>
</div>
</div>
</div>