diff options
| author | Mikaël Capelle <capelle.mikael@gmail.com> | 2024-05-26 11:09:56 +0200 |
|---|---|---|
| committer | Mikaël Capelle <capelle.mikael@gmail.com> | 2024-05-26 11:12:08 +0200 |
| commit | 1871f32a8db7e707a6d96a41f09147d8558e0003 (patch) | |
| tree | 9408b610e0373dbf8ff48c04a1dd0ad7098c79b4 | |
| parent | fa82d1cca1544c401bc06c341ce265a346a498b9 (diff) | |
Use `lootGameName()` and `displayGameName()` in initial places. (#2030)
* Use `displayGameName()` in create instance dialogs & the main window, this doesn't cover all places `gameName()` was being used for purely display reasons, but it covers the bulk.
* Use `lootGameName()` instead of `gameShortName()` for LOOT cli initiation.
* Use game display name in status bar.
---------
Co-authored-by: Twinki <Twinki@users.noreply.github.com>
| -rw-r--r-- | src/createinstancedialogpages.cpp | 32 | ||||
| -rw-r--r-- | src/loot.cpp | 2 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/organizer_en.ts | 514 | ||||
| -rw-r--r-- | src/statusbar.cpp | 2 |
5 files changed, 267 insertions, 285 deletions
diff --git a/src/createinstancedialogpages.cpp b/src/createinstancedialogpages.cpp index 27bd4062..66f4c31c 100644 --- a/src/createinstancedialogpages.cpp +++ b/src/createinstancedialogpages.cpp @@ -296,7 +296,8 @@ void GamePage::select(IPluginGame* game, const QString& dir) // ask the user const auto path = QFileDialog::getExistingDirectory( - &m_dlg, QObject::tr("Find game installation for %1").arg(game->gameName())); + &m_dlg, + QObject::tr("Find game installation for %1").arg(game->displayGameName())); if (path.isEmpty()) { // cancelled @@ -388,7 +389,7 @@ void GamePage::warnUnrecognized(const QString& path) // put the list of supported games in the details textbox QString supportedGames; for (auto* game : sortedGamePlugins()) { - supportedGames += game->gameName() + "\n"; + supportedGames += game->displayGameName() + "\n"; } QMessageBox dlg(&m_dlg); @@ -417,7 +418,7 @@ std::vector<IPluginGame*> GamePage::sortedGamePlugins() const // natsort std::sort(v.begin(), v.end(), [](auto* a, auto* b) { - return (naturalCompare(a->gameName(), b->gameName()) < 0); + return (naturalCompare(a->displayGameName(), b->displayGameName()) < 0); }); return v; @@ -469,7 +470,7 @@ void GamePage::updateButton(Game* g) return; } - g->button->setText(g->game->gameName().replace("&", "&&")); + g->button->setText(g->game->displayGameName().replace("&", "&&")); g->button->setIcon(g->game->gameIcon()); if (g->installed) { @@ -570,7 +571,8 @@ void GamePage::fillList() continue; } - if (!m_filter.matches(g->game->gameName())) { + if (!m_filter.matches(g->game->gameName()) && + !m_filter.matches(g->game->displayGameName())) { // filtered out continue; } @@ -667,9 +669,10 @@ bool GamePage::confirmMicrosoftStore(const QString& path, IPluginGame* game) "Organizer" " and will not work properly.") .arg(path)) - .button({game ? QObject::tr("Use this folder for %1").arg(game->gameName()) - : QObject::tr("Use this folder"), - QObject::tr("I know what I'm doing"), QMessageBox::Ignore}) + .button( + {game ? QObject::tr("Use this folder for %1").arg(game->displayGameName()) + : QObject::tr("Use this folder"), + QObject::tr("I know what I'm doing"), QMessageBox::Ignore}) .button({QObject::tr("Cancel"), QMessageBox::Cancel}) .exec(); @@ -688,8 +691,8 @@ bool GamePage::confirmUnknown(const QString& path, IPluginGame* game) "bold;\">%2</span> or " "for any other game Mod Organizer can manage.") .arg(path) - .arg(game->gameName())) - .button({QObject::tr("Use this folder for %1").arg(game->gameName()), + .arg(game->displayGameName())) + .button({QObject::tr("Use this folder for %1").arg(game->displayGameName()), QObject::tr("I know what I'm doing"), QMessageBox::Ignore}) .button({QObject::tr("Cancel"), QMessageBox::Cancel}) .exec(); @@ -711,11 +714,12 @@ IPluginGame* GamePage::confirmOtherGame(const QString& path, IPluginGame* select "not " "<span style=\"white-space: nowrap; font-weight: bold;\">%3</span>.") .arg(path) - .arg(guessedGame->gameName()) - .arg(selectedGame->gameName())) - .button({QObject::tr("Manage %1 instead").arg(guessedGame->gameName()), + .arg(guessedGame->displayGameName()) + .arg(selectedGame->displayGameName())) + .button({QObject::tr("Manage %1 instead").arg(guessedGame->displayGameName()), QMessageBox::Ok}) - .button({QObject::tr("Use this folder for %1").arg(selectedGame->gameName()), + .button({QObject::tr("Use this folder for %1") + .arg(selectedGame->displayGameName()), QObject::tr("I know what I'm doing"), QMessageBox::Ignore}) .button({QObject::tr("Cancel"), QMessageBox::Cancel}) .exec(); diff --git a/src/loot.cpp b/src/loot.cpp index 5ff56987..2c52aaa1 100644 --- a/src/loot.cpp +++ b/src/loot.cpp @@ -462,7 +462,7 @@ bool Loot::spawnLootcli(QWidget* parent, bool didUpdateMasterList, const auto logLevel = m_core.settings().diagnostics().lootLogLevel(); QStringList parameters; - parameters << "--game" << m_core.managedGame()->gameShortName() + parameters << "--game" << m_core.managedGame()->lootGameName() << "--gamePath" << QString("\"%1\"").arg( diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2c62e731..ca738c78 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -647,7 +647,7 @@ void MainWindow::updateWindowTitle(const APIUserAccount& user) { //"\xe2\x80\x93" is an "em dash", a longer "-" QString title = QString("%1 \xe2\x80\x93 Mod Organizer v%2") - .arg(m_OrganizerCore.managedGame()->gameName(), + .arg(m_OrganizerCore.managedGame()->displayGameName(), m_OrganizerCore.getVersion().displayString(3)); if (!user.name().isEmpty()) { diff --git a/src/organizer_en.ts b/src/organizer_en.ts index 83849d97..1295a362 100644 --- a/src/organizer_en.ts +++ b/src/organizer_en.ts @@ -260,11 +260,26 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> + <location filename="categoriesdialog.ui" line="130"/> + <source>Parent ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="categoriesdialog.ui" line="133"/> + <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="categoriesdialog.ui" line="138"/> <source>Nexus Categories</source> <translation type="unfinished"></translation> </message> <message> + <location filename="categoriesdialog.ui" line="141"/> + <source>Comma-Separated list of Nexus IDs to be matched to the internal ID.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="categoriesdialog.ui" line="144"/> <source> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -275,14 +290,6 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.</span></p></body></html> </source> - <oldsource> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> - p, li { white-space: pre-wrap; } - </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You can match one or multiple nexus categories to an internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.</span></p> - <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.</span></p></body></html> - </oldsource> <translation type="unfinished"></translation> </message> <message> @@ -296,21 +303,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="categoriesdialog.ui" line="141"/> - <source>Comma-Separated list of Nexus IDs to be matched to the internal ID.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="categoriesdialog.ui" line="130"/> - <source>Parent ID</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="categoriesdialog.ui" line="133"/> - <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="categoriesdialog.cpp" line="372"/> <source>Error %1: Request to Nexus failed: %2</source> <translation type="unfinished"></translation> @@ -334,26 +326,19 @@ p, li { white-space: pre-wrap; } <context> <name>CategoryFactory</name> <message> - <location filename="categories.cpp" line="127"/> - <source>invalid category id {}</source> + <location filename="categories.cpp" line="77"/> + <source>invalid category id {0}</source> <translation type="unfinished"></translation> </message> <message> <location filename="categories.cpp" line="87"/> <location filename="categories.cpp" line="96"/> <source>invalid category line {0}: {1}</source> - <oldsource>invalid category line {}: {}</oldsource> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="categories.cpp" line="77"/> - <source>invalid category id {0}</source> <translation type="unfinished"></translation> </message> <message> <location filename="categories.cpp" line="102"/> <source>invalid category line {0}: {1} ({2} cells)</source> - <oldsource>invalid category line {}: {} ({} cells)</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -362,9 +347,13 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> + <location filename="categories.cpp" line="127"/> + <source>invalid category id {}</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="categories.cpp" line="132"/> <source>invalid nexus category line {0}: {1} ({2} cells)</source> - <oldsource>invalid nexus category line {}: {} ({} cells)</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -1283,68 +1272,6 @@ File %3: %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="downloadmanager.cpp" line="1302"/> - <source>display name: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1323"/> - <source>file name: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1332"/> - <source>file time: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1351"/> - <source>file size: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1360"/> - <source>progress: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1369"/> - <source>state: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1378"/> - <source>infocomplete: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1392"/> - <location filename="downloadmanager.cpp" line="1400"/> - <location filename="downloadmanager.cpp" line="1413"/> - <source>mod id: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1421"/> - <source>ishidden: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1429"/> - <source>file info: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1438"/> - <source>mark installed: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="downloadmanager.cpp" line="1479"/> - <source>mark uninstalled: invalid download index %1</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="downloadmanager.cpp" line="1059"/> <source>Please enter the nexus mod id</source> <translation type="unfinished"></translation> @@ -1440,6 +1367,68 @@ File %3: %4</source> <translation type="unfinished"></translation> </message> <message> + <location filename="downloadmanager.cpp" line="1302"/> + <source>display name: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1323"/> + <source>file name: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1332"/> + <source>file time: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1351"/> + <source>file size: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1360"/> + <source>progress: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1369"/> + <source>state: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1378"/> + <source>infocomplete: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1392"/> + <location filename="downloadmanager.cpp" line="1400"/> + <location filename="downloadmanager.cpp" line="1413"/> + <source>mod id: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1421"/> + <source>ishidden: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1429"/> + <source>file info: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1438"/> + <source>mark installed: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="downloadmanager.cpp" line="1479"/> + <source>mark uninstalled: invalid download index %1</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="downloadmanager.cpp" line="1644"/> <source>%1% - %2 - ~%3</source> <translation type="unfinished"></translation> @@ -3030,7 +3019,7 @@ This is likely due to a corrupted or incompatible download or unrecognized archi <context> <name>MOBase::TutorialManager</name> <message> - <location filename="../../uibase/src/tutorialmanager.cpp" line="49"/> + <location filename="../../uibase/src/tutorialmanager.cpp" line="50"/> <source>tutorial manager not set up yet</source> <translation type="unfinished"></translation> </message> @@ -3112,9 +3101,6 @@ This is likely due to a corrupted or incompatible download or unrecognized archi Show: always show separators Hide: never show separators </source> - <oldsource>Filter: only show the separators that match the current filters -Show: always show separators -Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -3128,6 +3114,18 @@ Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> + <location filename="mainwindow.ui" line="258"/> + <source> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } + </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Create profiles here. Each profile contains its own list of active mods and esps. This way you can quickly switch between setups for different playthroughs.</span></p> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Please note that right now your esp load order is not kept separate for different profiles.</span></p></body></html> + </source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="mainwindow.ui" line="291"/> <source>Open list options...</source> <translation type="unfinished"></translation> @@ -3202,11 +3200,34 @@ Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> + <location filename="mainwindow.ui" line="628"/> + <source> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } + </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Choose the program to run. Once you start using ModOrganizer, you should always run your game and tools from here or through shortcuts created here, otherwise mods installed through MO will not be visible.</span></p> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You can add new Tools to this list, but I can't promise tools I haven't tested will work.</span></p></body></html> + </source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="mainwindow.ui" line="677"/> <source>Run program</source> <translation type="unfinished"></translation> </message> <message> + <location filename="mainwindow.ui" line="680"/> + <source> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } + </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Run the selected program with ModOrganizer enabled.</span></p></body></html> + </source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="mainwindow.ui" line="692"/> <source>Run</source> <translation type="unfinished"></translation> @@ -3217,6 +3238,17 @@ Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> + <location filename="mainwindow.ui" line="736"/> + <source> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } + </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This creates a start menu shortcut that directly starts the selected program with the MO active.</span></p></body></html> + </source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="mainwindow.ui" line="745"/> <source>Shortcut</source> <translation type="unfinished"></translation> @@ -3289,6 +3321,16 @@ Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> + <location filename="mainwindow.ui" line="1049"/> + <source> + BSA files are archives (comparable to .zip files) that contain data assets (meshes, textures, ...) to be used by the game. As such they "compete" with loose files in your data directory over which is loaded. + By default, BSAs that share their base name with an enabled ESP (i.e. plugin.esp and plugin.bsa) are automatically loaded and will have precedence over all loose files, the installation order you set up to the left is then ignored! + + BSAs checked here are loaded in such a way that your installation order is obeyed properly. + </source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="mainwindow.ui" line="1080"/> <source>Data</source> <translation type="unfinished"></translation> @@ -3339,62 +3381,6 @@ Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.ui" line="258"/> - <source> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> - p, li { white-space: pre-wrap; } - </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Create profiles here. Each profile contains its own list of active mods and esps. This way you can quickly switch between setups for different playthroughs.</span></p> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Please note that right now your esp load order is not kept separate for different profiles.</span></p></body></html> - </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.ui" line="628"/> - <source> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> - p, li { white-space: pre-wrap; } - </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Choose the program to run. Once you start using ModOrganizer, you should always run your game and tools from here or through shortcuts created here, otherwise mods installed through MO will not be visible.</span></p> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You can add new Tools to this list, but I can't promise tools I haven't tested will work.</span></p></body></html> - </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.ui" line="680"/> - <source> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> - p, li { white-space: pre-wrap; } - </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Run the selected program with ModOrganizer enabled.</span></p></body></html> - </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.ui" line="736"/> - <source> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> - p, li { white-space: pre-wrap; } - </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> - <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This creates a start menu shortcut that directly starts the selected program with the MO active.</span></p></body></html> - </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.ui" line="1049"/> - <source> - BSA files are archives (comparable to .zip files) that contain data assets (meshes, textures, ...) to be used by the game. As such they "compete" with loose files in your data directory over which is loaded. - By default, BSAs that share their base name with an enabled ESP (i.e. plugin.esp and plugin.bsa) are automatically loaded and will have precedence over all loose files, the installation order you set up to the left is then ignored! - - BSAs checked here are loaded in such a way that your installation order is obeyed properly. - </source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="mainwindow.ui" line="1220"/> <source> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3766,11 +3752,6 @@ Hide: never show separators</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="3056"/> - <source>There is no supported sort mechanism for this game. You will probably have to use a third-party tool.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="mainwindow.cpp" line="639"/> <source>Crash on exit</source> <translation type="unfinished"></translation> @@ -4120,6 +4101,11 @@ You will have to visit the mod page on the %1 Nexus site to change your mind.</s <translation type="unfinished"></translation> </message> <message> + <location filename="mainwindow.cpp" line="3056"/> + <source>There is no supported sort mechanism for this game. You will probably have to use a third-party tool.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="mainwindow.cpp" line="3153"/> <source>None of your %1 mods appear to have had recent file updates.</source> <translation type="unfinished"></translation> @@ -5467,6 +5453,13 @@ Please enter a name:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="modlistviewactions.cpp" line="267"/> + <location filename="modlistviewactions.cpp" line="1076"/> + <location filename="modlistviewactions.cpp" line="1395"/> + <source>Are you sure?</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="modlistviewactions.cpp" line="269"/> <source>This action will remove any existing categories on any mod with a valid Nexus category mapping. Are you certain you want to proceed?</source> <translation type="unfinished"></translation> @@ -5668,13 +5661,6 @@ This function will guess the versioning scheme under the assumption that the ins <translation type="unfinished"></translation> </message> <message> - <location filename="modlistviewactions.cpp" line="267"/> - <location filename="modlistviewactions.cpp" line="1076"/> - <location filename="modlistviewactions.cpp" line="1395"/> - <source>Are you sure?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="modlistviewactions.cpp" line="1077"/> <source>About to restore all hidden files in: </source> @@ -7157,7 +7143,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="createinstancedialogpages.cpp" line="37"/> - <location filename="createinstancedialogpages.cpp" line="1232"/> + <location filename="createinstancedialogpages.cpp" line="1236"/> <source>Instance type: %1</source> <translation type="unfinished"></translation> </message> @@ -7167,81 +7153,81 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="299"/> + <location filename="createinstancedialogpages.cpp" line="300"/> <source>Find game installation for %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="347"/> + <location filename="createinstancedialogpages.cpp" line="348"/> <source>Find game installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="396"/> - <location filename="createinstancedialogpages.cpp" line="683"/> - <location filename="createinstancedialogpages.cpp" line="684"/> + <location filename="createinstancedialogpages.cpp" line="397"/> + <location filename="createinstancedialogpages.cpp" line="686"/> + <location filename="createinstancedialogpages.cpp" line="687"/> <source>Unrecognized game</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="398"/> + <location filename="createinstancedialogpages.cpp" line="399"/> <source>The folder %1 does not seem to contain a game Mod Organizer can manage.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="401"/> + <location filename="createinstancedialogpages.cpp" line="402"/> <source>See details for the list of supported games.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="478"/> + <location filename="createinstancedialogpages.cpp" line="479"/> <source>No installation found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="549"/> + <location filename="createinstancedialogpages.cpp" line="550"/> <source>Browse...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="550"/> + <location filename="createinstancedialogpages.cpp" line="551"/> <source>The folder must contain a valid game installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="661"/> - <location filename="createinstancedialogpages.cpp" line="662"/> + <location filename="createinstancedialogpages.cpp" line="663"/> + <location filename="createinstancedialogpages.cpp" line="664"/> <source>Microsoft Store game</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="664"/> + <location filename="createinstancedialogpages.cpp" line="666"/> <source>The folder %1 seems to be a Microsoft Store game install. Games installed through the Microsoft Store are not supported by Mod Organizer and will not work properly.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="670"/> - <location filename="createinstancedialogpages.cpp" line="692"/> - <location filename="createinstancedialogpages.cpp" line="718"/> + <location filename="createinstancedialogpages.cpp" line="673"/> + <location filename="createinstancedialogpages.cpp" line="695"/> + <location filename="createinstancedialogpages.cpp" line="721"/> <source>Use this folder for %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="671"/> + <location filename="createinstancedialogpages.cpp" line="674"/> <source>Use this folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="672"/> - <location filename="createinstancedialogpages.cpp" line="693"/> - <location filename="createinstancedialogpages.cpp" line="719"/> + <location filename="createinstancedialogpages.cpp" line="675"/> + <location filename="createinstancedialogpages.cpp" line="696"/> + <location filename="createinstancedialogpages.cpp" line="723"/> <source>I know what I'm doing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="673"/> - <location filename="createinstancedialogpages.cpp" line="694"/> - <location filename="createinstancedialogpages.cpp" line="720"/> + <location filename="createinstancedialogpages.cpp" line="676"/> + <location filename="createinstancedialogpages.cpp" line="697"/> + <location filename="createinstancedialogpages.cpp" line="724"/> <location filename="settingsdialognexus.cpp" line="270"/> <location filename="settingsdialognexus.cpp" line="277"/> <location filename="settingsdialogworkarounds.cpp" line="142"/> @@ -7257,103 +7243,103 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="686"/> + <location filename="createinstancedialogpages.cpp" line="689"/> <source>The folder %1 does not seem to contain an installation for <span style="white-space: nowrap; font-weight: bold;">%2</span> or for any other game Mod Organizer can manage.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="705"/> - <location filename="createinstancedialogpages.cpp" line="706"/> + <location filename="createinstancedialogpages.cpp" line="708"/> + <location filename="createinstancedialogpages.cpp" line="709"/> <source>Incorrect game</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="708"/> + <location filename="createinstancedialogpages.cpp" line="711"/> <source>The folder %1 seems to contain an installation for <span style="white-space: nowrap; font-weight: bold;">%2</span>, not <span style="white-space: nowrap; font-weight: bold;">%3</span>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="716"/> + <location filename="createinstancedialogpages.cpp" line="719"/> <source>Manage %1 instead</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1234"/> + <location filename="createinstancedialogpages.cpp" line="1238"/> <source>Instance location: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1237"/> + <location filename="createinstancedialogpages.cpp" line="1241"/> <source>Instance name: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1240"/> + <location filename="createinstancedialogpages.cpp" line="1244"/> <source>Profile settings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1242"/> + <location filename="createinstancedialogpages.cpp" line="1246"/> <source> Local INIs: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1243"/> - <location filename="createinstancedialogpages.cpp" line="1246"/> - <location filename="createinstancedialogpages.cpp" line="1248"/> + <location filename="createinstancedialogpages.cpp" line="1247"/> + <location filename="createinstancedialogpages.cpp" line="1250"/> + <location filename="createinstancedialogpages.cpp" line="1252"/> <source>yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1243"/> - <location filename="createinstancedialogpages.cpp" line="1246"/> - <location filename="createinstancedialogpages.cpp" line="1249"/> + <location filename="createinstancedialogpages.cpp" line="1247"/> + <location filename="createinstancedialogpages.cpp" line="1250"/> + <location filename="createinstancedialogpages.cpp" line="1253"/> <source>no</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1245"/> + <location filename="createinstancedialogpages.cpp" line="1249"/> <source> Local Saves: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1247"/> + <location filename="createinstancedialogpages.cpp" line="1251"/> <source> Automatic Archive Invalidation: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1254"/> <location filename="createinstancedialogpages.cpp" line="1258"/> + <location filename="createinstancedialogpages.cpp" line="1262"/> <source>Base directory: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1259"/> + <location filename="createinstancedialogpages.cpp" line="1263"/> <source>Downloads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1260"/> + <location filename="createinstancedialogpages.cpp" line="1264"/> <source>Mods</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1261"/> + <location filename="createinstancedialogpages.cpp" line="1265"/> <source>Profiles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1262"/> + <location filename="createinstancedialogpages.cpp" line="1266"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1271"/> + <location filename="createinstancedialogpages.cpp" line="1275"/> <source>Game: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="createinstancedialogpages.cpp" line="1272"/> + <location filename="createinstancedialogpages.cpp" line="1276"/> <source>Game location: %1</source> <translation type="unfinished"></translation> </message> @@ -8038,7 +8024,6 @@ Example: <message> <location filename="shared/fileregister.cpp" line="77"/> <source>invalid file index for remove</source> - <oldsource>invalid file index for remove: {}</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -8054,7 +8039,6 @@ Example: <message> <location filename="shared/originconnection.cpp" line="101"/> <source>failed to change name lookup from {0} to {1}</source> - <oldsource>failed to change name lookup from {} to {}</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -8734,7 +8718,6 @@ p, li { white-space: pre-wrap; } <message> <location filename="settingsdialog.ui" line="104"/> <source><a href="https://discord.gg/ewUVAqyrQX">Help translate Mod Organizer on Discord</a></source> - <oldsource><a href="https://discord.gg/NRGqdt5suP">Help translate Mod Organizer on Discord</a></oldsource> <translation type="unfinished"></translation> </message> <message> @@ -9596,7 +9579,6 @@ For the other games this is not a sufficient replacement for AI!</source> <message> <location filename="settingsdialog.ui" line="2211"/> <source>Click a link to open the location</source> - <oldsource>Hint: right click link and copy link location</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -9896,7 +9878,6 @@ On Windows XP: <message> <location filename="tutorials/tutorial_conflictresolution_main.js" line="5"/> <source>Welcome to the conflict resolution tutorial. This tutorial is very dense with information, so take it slow and feel free to revisit as needed - until you have a solid grasp of the types of conflicts and tools to manage them.</source> - <oldsource>There are multiple types of conflicts you may encounter when dealing with Mods. This tutorial will try to cover and explain how to deal with all of them.</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -9905,6 +9886,11 @@ On Windows XP: <translation type="unfinished"></translation> </message> <message> + <location filename="tutorials/tutorial_conflictresolution_main.js" line="16"/> + <source>There are multiple types of conflicts you may encounter when dealing with mods. This tutorial will try to cover and explain how to deal with all of them.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="tutorials/tutorial_conflictresolution_main.js" line="21"/> <source>First up are file conflicts. These occur when two mods contain the same file. Most commonly this happens when several mods replace the same standard asset from the game, like the texture of an armor.</source> <translation type="unfinished"></translation> @@ -9935,6 +9921,31 @@ On Windows XP: <translation type="unfinished"></translation> </message> <message> + <location filename="tutorials/tutorial_conflictresolution_main.js" line="59"/> + <source><img src="qrc:///MO/gui/emblem_conflict_overwrite" /> indicates that the mod overwrites files that are also available in another mod.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_conflictresolution_main.js" line="63"/> + <source><img src="qrc:///MO/gui/emblem_conflict_overwritten" /> indicates that the mod is <b>partially</b> overwritten by another.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_conflictresolution_main.js" line="67"/> + <source><img src="qrc:///MO/gui/emblem_conflict_mixed" /> indicates that both of the these are true.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_conflictresolution_main.js" line="71"/> + <source><img src="qrc:///MO/gui/emblem_conflict_redundant" /> indicates that the mod is completely overwritten. It provides no active files and is essentially disabled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_conflictresolution_main.js" line="75"/> + <source>There are two ways to see the individual files involved in a conflict:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="tutorials/tutorial_conflictresolution_main.js" line="79"/> <source>Option A: Switch to the "Data" tab.</source> <translation type="unfinished"></translation> @@ -10019,37 +10030,6 @@ On Windows XP: <source>This completes the tutorial. Hopefully you have a better grasp on the intricacies of conflict resolution. Good luck, and happy modding!</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="tutorials/tutorial_conflictresolution_main.js" line="16"/> - <source>There are multiple types of conflicts you may encounter when dealing with mods. This tutorial will try to cover and explain how to deal with all of them.</source> - <oldsource>As an example, say you install "ModA" which contains stylish new iron and leather armor. Then you install "ModB" which contains sexy ebony and leather armor. Obviously there is a conflict now: which leather armor to use?</oldsource> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_conflictresolution_main.js" line="59"/> - <source><img src="qrc:///MO/gui/emblem_conflict_overwrite" /> indicates that the mod overwrites files that are also available in another mod.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_conflictresolution_main.js" line="63"/> - <source><img src="qrc:///MO/gui/emblem_conflict_overwritten" /> indicates that the mod is <b>partially</b> overwritten by another.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_conflictresolution_main.js" line="67"/> - <source><img src="qrc:///MO/gui/emblem_conflict_mixed" /> indicates that both of the these are true.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_conflictresolution_main.js" line="71"/> - <source><img src="qrc:///MO/gui/emblem_conflict_redundant" /> indicates that the mod is completely overwritten. It provides no active files and is essentially disabled.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_conflictresolution_main.js" line="75"/> - <source>There are two ways to see the individual files involved in a conflict:</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>tutorial_conflictresolution_modinfo</name> @@ -10084,8 +10064,6 @@ On Windows XP: <source>Welcome to the Mod Organizer Tutorial! This will guide you through the most common features of MO2. It is highly recommended for first-time users to complete the tutorial from beginning to end to properly demonstrate key components of the tool.</source> - <oldsource>Welcome to the ModOrganizer Tutorial! This will guide you through the most common features of MO. -Please go along with the tutorial because some things can't be demonstrated if you skip something.</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -10138,11 +10116,21 @@ It appears you have one now, however you can hold off on clearing it until after <translation type="unfinished"></translation> </message> <message> + <location filename="tutorials/tutorial_firststeps_main.js" line="94"/> + <source>You can also install mods from disk using the "Install Mod" button.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="tutorials/tutorial_firststeps_main.js" line="100"/> <source>Downloads will appear on the "Downloads" tab here. You have to download and install at least one mod to proceed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="tutorials/tutorial_firststeps_main.js" line="109"/> + <source>Great, you just installed your first mod. Please note that the installation procedure may differ based on how a mod was packaged.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="tutorials/tutorial_firststeps_main.js" line="116"/> <source>Now you know all about downloading and installing mods, but they are not enabled yet...</source> <translation type="unfinished"></translation> @@ -10153,6 +10141,11 @@ It appears you have one now, however you can hold off on clearing it until after <translation type="unfinished"></translation> </message> <message> + <location filename="tutorials/tutorial_firststeps_main.js" line="130"/> + <source>For some mods, enabling it on the left pane is all you have to do...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="tutorials/tutorial_firststeps_main.js" line="135"/> <source>...but for some games they may contain plugins. These are files the game must load and are required to change or add aspects of the game (new weapons, armors, quests, areas, ...). @@ -10186,21 +10179,6 @@ It's important you always start the game from inside MO, otherwise the mods <source>This completes the basic tutorial. Feel free to play the game and try out your new mods! Once you have installed a larger number, you may want to continue with the tutorial on conflict resolution.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="tutorials/tutorial_firststeps_main.js" line="94"/> - <source>You can also install mods from disk using the "Install Mod" button.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_firststeps_main.js" line="109"/> - <source>Great, you just installed your first mod. Please note that the installation procedure may differ based on how a mod was packaged.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="tutorials/tutorial_firststeps_main.js" line="130"/> - <source>For some mods, enabling it on the left pane is all you have to do...</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>tutorial_firststeps_modinfo</name> diff --git a/src/statusbar.cpp b/src/statusbar.cpp index 3b26dd91..8fa9451d 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -146,7 +146,7 @@ void StatusBar::updateNormalMessage(OrganizerCore& core) QString game; if (core.managedGame()) { - game = core.managedGame()->gameName(); + game = core.managedGame()->displayGameName(); } else { game = tr("Unknown game"); } |