Skip to content

Commit 734e2e9

Browse files
UngeziefiUngeziefi
committed
Ok button and version
1 parent 7b47a17 commit 734e2e9

File tree

3 files changed

+72
-46
lines changed

3 files changed

+72
-46
lines changed

‎src/organizer_en.ts

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<message>
1818
<location filename="aboutdialog.ui" line="110"/>
1919
<source>USVFS:</source>
20-
<oldsource>usvfs:</oldsource>
2120
<translation type="unfinished"></translation>
2221
</message>
2322
<message>
@@ -6228,158 +6227,187 @@ Continue?</source>
62286227
<context>
62296228
<name>PluginList</name>
62306229
<message>
6231-
<location filename="pluginlist.cpp" line="92"/>
6230+
<location filename="pluginlist.cpp" line="93"/>
62326231
<source>Name</source>
62336232
<translation type="unfinished"></translation>
62346233
</message>
62356234
<message>
6236-
<location filename="pluginlist.cpp" line="94"/>
6235+
<location filename="pluginlist.cpp" line="95"/>
62376236
<source>Priority</source>
62386237
<translation type="unfinished"></translation>
62396238
</message>
62406239
<message>
6241-
<location filename="pluginlist.cpp" line="96"/>
6240+
<location filename="pluginlist.cpp" line="97"/>
62426241
<source>Mod Index</source>
62436242
<translation type="unfinished"></translation>
62446243
</message>
62456244
<message>
6246-
<location filename="pluginlist.cpp" line="98"/>
6245+
<location filename="pluginlist.cpp" line="99"/>
62476246
<source>Flags</source>
62486247
<translation type="unfinished"></translation>
62496248
</message>
62506249
<message>
6251-
<location filename="pluginlist.cpp" line="100"/>
6252-
<location filename="pluginlist.cpp" line="118"/>
6250+
<location filename="pluginlist.cpp" line="101"/>
6251+
<location filename="pluginlist.cpp" line="119"/>
62536252
<source>unknown</source>
62546253
<translation type="unfinished"></translation>
62556254
</message>
62566255
<message>
6257-
<location filename="pluginlist.cpp" line="108"/>
6256+
<location filename="pluginlist.cpp" line="109"/>
62586257
<source>Name of the plugin</source>
62596258
<translation type="unfinished"></translation>
62606259
</message>
62616260
<message>
6262-
<location filename="pluginlist.cpp" line="110"/>
6261+
<location filename="pluginlist.cpp" line="111"/>
62636262
<source>Emblems to highlight things that might require attention.</source>
62646263
<translation type="unfinished"></translation>
62656264
</message>
62666265
<message>
6267-
<location filename="pluginlist.cpp" line="112"/>
6266+
<location filename="pluginlist.cpp" line="113"/>
62686267
<source>Load priority of plugins. The higher, the more &quot;important&quot; it is and thus overwrites data from plugins with lower priority.</source>
62696268
<translation type="unfinished"></translation>
62706269
</message>
62716270
<message>
6272-
<location filename="pluginlist.cpp" line="116"/>
6271+
<location filename="pluginlist.cpp" line="117"/>
62736272
<source>Determines the formids of objects originating from this mods.</source>
62746273
<translation type="unfinished"></translation>
62756274
</message>
62766275
<message>
6277-
<location filename="pluginlist.cpp" line="251"/>
6276+
<location filename="pluginlist.cpp" line="252"/>
62786277
<source>failed to update esp info for file %1 (source id: %2), error: %3</source>
62796278
<translation type="unfinished"></translation>
62806279
</message>
62816280
<message>
6282-
<location filename="pluginlist.cpp" line="411"/>
6281+
<location filename="pluginlist.cpp" line="412"/>
62836282
<source>Plugin not found: %1</source>
62846283
<translation type="unfinished"></translation>
62856284
</message>
62866285
<message>
6287-
<location filename="pluginlist.cpp" line="1273"/>
6286+
<location filename="pluginlist.cpp" line="1274"/>
62886287
<source>Origin</source>
62896288
<translation type="unfinished"></translation>
62906289
</message>
62916290
<message>
6292-
<location filename="pluginlist.cpp" line="1277"/>
6291+
<location filename="pluginlist.cpp" line="1278"/>
62936292
<source>This plugin can&apos;t be disabled or moved (enforced by the game).</source>
62946293
<translation type="unfinished"></translation>
62956294
</message>
62966295
<message>
6297-
<location filename="pluginlist.cpp" line="1283"/>
6296+
<location filename="pluginlist.cpp" line="1284"/>
62986297
<source>This plugin can&apos;t be disabled (enforced by the game).</source>
62996298
<translation type="unfinished"></translation>
63006299
</message>
63016300
<message>
6302-
<location filename="pluginlist.cpp" line="1287"/>
6301+
<location filename="pluginlist.cpp" line="1288"/>
63036302
<source>Author</source>
63046303
<translation type="unfinished"></translation>
63056304
</message>
63066305
<message>
6307-
<location filename="pluginlist.cpp" line="1292"/>
6306+
<location filename="pluginlist.cpp" line="1293"/>
63086307
<source>Description</source>
63096308
<translation type="unfinished"></translation>
63106309
</message>
63116310
<message>
6312-
<location filename="pluginlist.cpp" line="1297"/>
6311+
<location filename="pluginlist.cpp" line="1298"/>
63136312
<source>Missing Masters</source>
63146313
<translation type="unfinished"></translation>
63156314
</message>
63166315
<message>
6317-
<location filename="pluginlist.cpp" line="1309"/>
6316+
<location filename="pluginlist.cpp" line="1310"/>
63186317
<source>Enabled Masters</source>
63196318
<translation type="unfinished"></translation>
63206319
</message>
63216320
<message>
6322-
<location filename="pluginlist.cpp" line="1320"/>
6321+
<location filename="pluginlist.cpp" line="1321"/>
63236322
<source>Loads Archives</source>
63246323
<translation type="unfinished"></translation>
63256324
</message>
63266325
<message>
6327-
<location filename="pluginlist.cpp" line="1321"/>
6326+
<location filename="pluginlist.cpp" line="1322"/>
63286327
<source>There are Archives connected to this plugin. Their assets will be added to your game, overwriting in case of conflicts following the plugin order. Loose files will always overwrite assets from Archives. (This flag only checks for Archives from the same mod as the plugin)</source>
63296328
<translation type="unfinished"></translation>
63306329
</message>
63316330
<message>
6332-
<location filename="pluginlist.cpp" line="1329"/>
6331+
<location filename="pluginlist.cpp" line="1330"/>
63336332
<source>Loads INI settings</source>
63346333
<translation type="unfinished"></translation>
63356334
</message>
63366335
<message>
6337-
<location filename="pluginlist.cpp" line="1332"/>
6336+
<location filename="pluginlist.cpp" line="1333"/>
63386337
<source>There is an ini file connected to this plugin. Its settings will be added to your game settings, overwriting in case of conflicts.</source>
63396338
<translation type="unfinished"></translation>
63406339
</message>
63416340
<message>
6342-
<location filename="pluginlist.cpp" line="1339"/>
6341+
<location filename="pluginlist.cpp" line="1340"/>
63436342
<source>This %1 is flagged as an ESL. It will adhere to the %1 load order but the records will be loaded in ESL space.</source>
63446343
<translation type="unfinished"></translation>
63456344
</message>
63466345
<message>
6347-
<location filename="pluginlist.cpp" line="1356"/>
6346+
<location filename="pluginlist.cpp" line="1357"/>
63486347
<source>This is a dummy plugin. It contains no records and is typically used to load a paired archive file.</source>
63496348
<translation type="unfinished"></translation>
63506349
</message>
63516350
<message>
6352-
<location filename="pluginlist.cpp" line="1363"/>
6351+
<location filename="pluginlist.cpp" line="1364"/>
63536352
<source>Light plugins (ESL) are not supported by this game.</source>
63546353
<translation type="unfinished"></translation>
63556354
</message>
63566355
<message>
6357-
<location filename="pluginlist.cpp" line="1365"/>
6356+
<location filename="pluginlist.cpp" line="1366"/>
63586357
<source>This game does not currently permit custom plugin loading. There may be manual workarounds.</source>
63596358
<translation type="unfinished"></translation>
63606359
</message>
63616360
<message>
6362-
<location filename="pluginlist.cpp" line="1397"/>
6361+
<location filename="pluginlist.cpp" line="1398"/>
63636362
<source>Incompatible with %1</source>
63646363
<translation type="unfinished"></translation>
63656364
</message>
63666365
<message>
6367-
<location filename="pluginlist.cpp" line="1403"/>
6366+
<location filename="pluginlist.cpp" line="1404"/>
63686367
<source>Depends on missing %1</source>
63696368
<translation type="unfinished"></translation>
63706369
</message>
63716370
<message>
6372-
<location filename="pluginlist.cpp" line="1411"/>
6371+
<location filename="pluginlist.cpp" line="1412"/>
63736372
<source>Warning</source>
63746373
<translation type="unfinished"></translation>
63756374
</message>
63766375
<message>
6377-
<location filename="pluginlist.cpp" line="1415"/>
6376+
<location filename="pluginlist.cpp" line="1416"/>
63786377
<source>Error</source>
63796378
<translation type="unfinished"></translation>
63806379
</message>
63816380
<message>
6382-
<location filename="pluginlist.cpp" line="1698"/>
6381+
<location filename="pluginlist.cpp" line="1637"/>
6382+
<location filename="pluginlist.cpp" line="1652"/>
6383+
<location filename="pluginlist.cpp" line="1682"/>
6384+
<location filename="pluginlist.cpp" line="1697"/>
6385+
<source>Invalid plugin load order</source>
6386+
<translation type="unfinished"></translation>
6387+
</message>
6388+
<message>
6389+
<location filename="pluginlist.cpp" line="1638"/>
6390+
<source>Plugins cannot be loaded among master plugins.</source>
6391+
<oldsource>Plugins cannot be loaded among master plugins.&lt;br&gt;&lt;br&gt;Acknowledge?</oldsource>
6392+
<translation type="unfinished"></translation>
6393+
</message>
6394+
<message>
6395+
<location filename="pluginlist.cpp" line="1652"/>
6396+
<source>Master plugins cannot be loaded among plugins.</source>
6397+
<translation type="unfinished"></translation>
6398+
</message>
6399+
<message>
6400+
<location filename="pluginlist.cpp" line="1682"/>
6401+
<source>Plugins cannot be loaded before their masters.</source>
6402+
<translation type="unfinished"></translation>
6403+
</message>
6404+
<message>
6405+
<location filename="pluginlist.cpp" line="1697"/>
6406+
<source>Masters cannot be moved below ones that require them.</source>
6407+
<translation type="unfinished"></translation>
6408+
</message>
6409+
<message>
6410+
<location filename="pluginlist.cpp" line="1730"/>
63836411
<source>failed to restore load order for %1</source>
63846412
<translation type="unfinished"></translation>
63856413
</message>
@@ -7733,12 +7761,12 @@ Destination:<byte value="xd"/>
77337761
<translation type="unfinished"></translation>
77347762
</message>
77357763
<message>
7736-
<location filename="pluginlist.cpp" line="715"/>
7764+
<location filename="pluginlist.cpp" line="716"/>
77377765
<source>failed to access %1</source>
77387766
<translation type="unfinished"></translation>
77397767
</message>
77407768
<message>
7741-
<location filename="pluginlist.cpp" line="729"/>
7769+
<location filename="pluginlist.cpp" line="730"/>
77427770
<source>failed to set file time %1</source>
77437771
<translation type="unfinished"></translation>
77447772
</message>
@@ -8789,7 +8817,6 @@ p, li { white-space: pre-wrap; }
87898817
<location filename="settingsdialog.ui" line="262"/>
87908818
<location filename="settingsdialog.ui" line="265"/>
87918819
<source>Use the file name as default during installation, instead of the mod&apos;s.</source>
8792-
<oldsource>Use the file name as default instead of the mod&apos;s.</oldsource>
87938820
<translation type="unfinished"></translation>
87948821
</message>
87958822
<message>

‎src/pluginlist.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,9 +1635,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16351635
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
16361636
QApplication::activeModalWidget(), "dontAllowESPAboveESM",
16371637
tr("Invalid plugin load order"),
1638-
tr("Plugins cannot be loaded among master plugins.<br><br>Acknowledge?"),
1639-
QDialogButtonBox::Yes,
1640-
QDialogButtonBox::Yes);
1638+
tr("Plugins cannot be loaded among master plugins."),
1639+
QDialogButtonBox::Ok);
16411640
qWarning("Plugins cannot be loaded among master plugins.");
16421641
++newPriorityTemp;
16431642
}
@@ -1650,8 +1649,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16501649

16511650
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
16521651
QApplication::activeModalWidget(), "dontAllowESMBelowESP",
1653-
tr("Invalid plugin load order"), tr("Master plugins cannot be loaded among plugins.<br><br>Acknowledge?"),
1654-
QDialogButtonBox::Yes, QDialogButtonBox::Yes);
1652+
tr("Invalid plugin load order"), tr("Master plugins cannot be loaded among plugins."),
1653+
QDialogButtonBox::Ok);
16551654
qWarning("Master plugins cannot be loaded among plugins.");
16561655
--newPriorityTemp;
16571656
}
@@ -1680,8 +1679,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16801679

16811680
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
16821681
QApplication::activeModalWidget(), "dontAllowChildrenAboveMaster",
1683-
tr("Invalid plugin load order"), tr("Plugins cannot be loaded before their masters.<br><br>Acknowledge?"),
1684-
QDialogButtonBox::Yes, QDialogButtonBox::Yes);
1682+
tr("Invalid plugin load order"), tr("Plugins cannot be loaded before their masters."),
1683+
QDialogButtonBox::Ok);
16851684
qWarning("Plugins cannot be loaded before their masters.");
16861685
newPriorityTemp = masterPriority + 1;
16871686
}
@@ -1695,8 +1694,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
16951694
if (master.compare(m_ESPs[row].name, Qt::CaseInsensitive) == 0) {
16961695
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
16971696
QApplication::activeModalWidget(), "dontAllowMasterBelowChildren",
1698-
tr("Invalid plugin load order"), tr("Masters cannot be moved below ones that require them.<br><br>Acknowledge?"),
1699-
QDialogButtonBox::Yes, QDialogButtonBox::Yes);
1697+
tr("Invalid plugin load order"), tr("Masters cannot be moved below ones that require them."),
1698+
QDialogButtonBox::Ok);
17001699
qWarning("Masters cannot be moved below ones that require them.");
17011700
newPriorityTemp = otherInfo->priority - 1;
17021701
break;

‎src/version.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
55
// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
66
#define VER_FILEVERSION 2,5,1
7-
#define VER_FILEVERSION_STR "2.5.1rc2-ML1.3\0"
7+
#define VER_FILEVERSION_STR "2.5.1rc2-ML1.4\0"
88

99
VS_VERSION_INFO VERSIONINFO
1010
FILEVERSION VER_FILEVERSION

0 commit comments

Comments
 (0)