Corrected several instances of Lime3DS being referred to as "Lime"

This commit is contained in:
OpenSauce04 2024-04-01 20:19:40 +01:00
parent 6875f8d564
commit 5694b06bd5
18 changed files with 36 additions and 36 deletions

View File

@ -1,5 +1,5 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Lime Discord - name: Lime3DS Discord
url: https://discord.com/invite/4ZjMpAp3M6 url: https://discord.com/invite/4ZjMpAp3M6
about: If you are experiencing an issue with Lime, and you need tech support, or if you have a general question, try asking in the official Lime Discord linked here. Piracy is not allowed. about: If you are experiencing an issue with Lime, and you need tech support, or if you have a general question, try asking in the official Lime3DS Discord linked here. Piracy is not allowed.

View File

@ -4,7 +4,7 @@ labels: "request"
body: body:
- type: markdown - type: markdown
attributes: attributes:
value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make Lime better. value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make Lime3DS better.
- type: checkboxes - type: checkboxes
attributes: attributes:
label: Is there an existing issue for this? label: Is there an existing issue for this?
@ -23,6 +23,6 @@ body:
id: why-feature id: why-feature
attributes: attributes:
label: Why would this feature be useful? label: Why would this feature be useful?
description: A brief description of why this feature would make Lime better. description: A brief description of why this feature would make Lime3DS better.
validations: validations:
required: true required: true

4
dist/lime-qt.6 vendored
View File

@ -8,7 +8,7 @@
.Nm lime-qt .Nm lime-qt
.Op Ar file .Op Ar file
.Sh DESCRIPTION .Sh DESCRIPTION
Lime is an experimental open-source Nintendo 3DS emulator/debugger. Lime3DS is an experimental open-source Nintendo 3DS emulator/debugger.
.Pp .Pp
.Nm lime-qt .Nm lime-qt
is the Qt implementation. is the Qt implementation.
@ -22,7 +22,7 @@ Configuration files.
.Sh AUTHORS .Sh AUTHORS
This document is made available to you under the CC-BY license. This document is made available to you under the CC-BY license.
.Pp .Pp
Lime is made by a team of volunteers. These contributors are listed Lime3DS is made by a team of volunteers. These contributors are listed
at <\https://github.com/Lime3DS/Lime3DS/contributors\fR>. at <\https://github.com/Lime3DS/Lime3DS/contributors\fR>.
.Pp .Pp
.Sh SEE ALSO .Sh SEE ALSO

6
dist/lime.6 vendored
View File

@ -17,7 +17,7 @@ Shows syntax help and exits
.It Fl v , Fl Fl version .It Fl v , Fl Fl version
Describes the installed version and exits Describes the installed version and exits
.Sh DESCRIPTION .Sh DESCRIPTION
Lime is an experimental open-source Nintendo 3DS emulator/debugger. Lime3DS is an experimental open-source Nintendo 3DS emulator/debugger.
.Pp .Pp
.Nm lime .Nm lime
is the Simple DirectMedia Layer (SDL) implementation. is the Simple DirectMedia Layer (SDL) implementation.
@ -31,7 +31,7 @@ Configuration files.
.Sh AUTHORS .Sh AUTHORS
This document is made available to you under the CC-BY license. This document is made available to you under the CC-BY license.
.Pp .Pp
Lime is made by a team of volunteers. These contributors are listed Lime3DS is made by a team of volunteers. These contributors are listed
at <\fBhttps://github.com/lime-emu/lime/contributors\fR>. at <\fBhttps://github.com/lime-emu/lime/contributors\fR>.
.Pp .Pp
.Sh SEE ALSO .Sh SEE ALSO
@ -45,5 +45,5 @@ Resources are available for this project:
.It <\fBhttps://lime-emu.org\fR> .It <\fBhttps://lime-emu.org\fR>
The main homepage of the project. The main homepage of the project.
.It <\fBhttps://github.com/lime-emu/lime\fR> .It <\fBhttps://github.com/lime-emu/lime\fR>
The main source code repository for the Lime emulator. The main source code repository for the Lime3DS emulator.
.Pp .Pp

View File

@ -6,7 +6,7 @@
<string name="app_disclaimer">This software will run games for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Lime3DS\'s user data in.\n\nWhat\'s this:\n<a href='https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage'>Wiki - Lime3DS Android user data and storage</a></string> <string name="app_disclaimer">This software will run games for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Lime3DS\'s user data in.\n\nWhat\'s this:\n<a href='https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage'>Wiki - Lime3DS Android user data and storage</a></string>
<string name="app_notification_channel_name" translatable="false">Lime3DS</string> <string name="app_notification_channel_name" translatable="false">Lime3DS</string>
<string name="app_notification_channel_id" translatable="false">Lime3DS</string> <string name="app_notification_channel_id" translatable="false">Lime3DS</string>
<string name="app_notification_channel_description">Lime3DS 3DS emulator notifications</string> <string name="app_notification_channel_description">Lime3DS emulator notifications</string>
<string name="app_notification_running">Lime3DS is Running</string> <string name="app_notification_running">Lime3DS is Running</string>
<string name="app_game_install_description">Next, you will need to select a Game Folder. Lime3DS will display all of the 3DS ROMs inside of the selected folder in the app.\n\nCIA ROMs, updates and DLC will need to be installed separately by clicking on the folder icon and selecting Install CIA.</string> <string name="app_game_install_description">Next, you will need to select a Game Folder. Lime3DS will display all of the 3DS ROMs inside of the selected folder in the app.\n\nCIA ROMs, updates and DLC will need to be installed separately by clicking on the folder icon and selecting Install CIA.</string>

View File

@ -243,7 +243,7 @@ void EmuWindow_SDL2::UpdateFramerateCounter() {
if (current_time > last_time + 2000) { if (current_time > last_time + 2000) {
const auto results = system.GetAndResetPerfStats(); const auto results = system.GetAndResetPerfStats();
const auto title = const auto title =
fmt::format("Lime {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname, fmt::format("Lime3DS {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc, results.game_fps, Common::g_scm_branch, Common::g_scm_desc, results.game_fps,
results.emulation_speed * 100.0f); results.emulation_speed * 100.0f);
SDL_SetWindowTitle(render_window, title.c_str()); SDL_SetWindowTitle(render_window, title.c_str());

View File

@ -77,7 +77,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(Core::System& system_, bool fullscreen, boo
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
} }
std::string window_title = fmt::format("Lime {} | {}-{}", Common::g_build_fullname, std::string window_title = fmt::format("Lime3DS {} | {}-{}", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc); Common::g_scm_branch, Common::g_scm_desc);
// First, try to create a context with the requested type. // First, try to create a context with the requested type.

View File

@ -20,7 +20,7 @@ class DummyContext : public Frontend::GraphicsContext {};
EmuWindow_SDL2_SW::EmuWindow_SDL2_SW(Core::System& system_, bool fullscreen, bool is_secondary) EmuWindow_SDL2_SW::EmuWindow_SDL2_SW(Core::System& system_, bool fullscreen, bool is_secondary)
: EmuWindow_SDL2{system_, is_secondary}, system{system_} { : EmuWindow_SDL2{system_, is_secondary}, system{system_} {
std::string window_title = fmt::format("Lime {} | {}-{}", Common::g_build_fullname, std::string window_title = fmt::format("Lime3DS {} | {}-{}", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc); Common::g_scm_branch, Common::g_scm_desc);
render_window = render_window =
SDL_CreateWindow(window_title.c_str(), SDL_CreateWindow(window_title.c_str(),

View File

@ -17,7 +17,7 @@ class DummyContext : public Frontend::GraphicsContext {};
EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen, bool is_secondary) EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen, bool is_secondary)
: EmuWindow_SDL2{system, is_secondary} { : EmuWindow_SDL2{system, is_secondary} {
const std::string window_title = fmt::format("Lime {} | {}-{}", Common::g_build_fullname, const std::string window_title = fmt::format("Lime3DS {} | {}-{}", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc); Common::g_scm_branch, Common::g_scm_desc);
render_window = render_window =
SDL_CreateWindow(window_title.c_str(), SDL_CreateWindow(window_title.c_str(),

View File

@ -84,7 +84,7 @@ static void PrintHelp(const char* argv0) {
} }
static void PrintVersion() { static void PrintVersion() {
std::cout << "Lime " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl; std::cout << "Lime3DS " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
} }
static void OnStateChanged(const Network::RoomMember::State& state) { static void OnStateChanged(const Network::RoomMember::State& state) {
@ -400,8 +400,8 @@ int main(int argc, char** argv) {
const auto scope = emu_window->Acquire(); const auto scope = emu_window->Acquire();
LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, LOG_INFO(Frontend, "Lime3DS Version: {} | {}-{}", Common::g_build_fullname,
Common::g_scm_desc); Common::g_scm_branch, Common::g_scm_desc);
Settings::LogSettings(); Settings::LogSettings();
const Core::System::ResultStatus load_result{ const Core::System::ResultStatus load_result{

View File

@ -87,7 +87,7 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;Lime is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;Lime3DS is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;This software should not be used to play games you have not legally obtained.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;This software should not be used to play games you have not legally obtained.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; }
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;3DS&amp;quot; is a trademark of Nintendo. Lime is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;3DS&amp;quot; is a trademark of Nintendo. Lime3DS is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -33,7 +33,7 @@
<item> <item>
<widget class="QLabel" name="lbl_Spiel"> <widget class="QLabel" name="lbl_Spiel">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Should you choose to submit a test case to the &lt;/span&gt;&lt;a href=&quot;https://citra-emu.org/game/&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;Lime Compatibility List&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;, The following information will be collected and displayed on the site:&lt;/span&gt;&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Hardware Information (CPU / GPU / Operating System)&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Which version of Lime you are running&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The connected Citra account&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Should you choose to submit a test case to the &lt;/span&gt;&lt;a href=&quot;https://citra-emu.org/game/&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;Lime3DS Compatibility List&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;, The following information will be collected and displayed on the site:&lt;/span&gt;&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Hardware Information (CPU / GPU / Operating System)&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Which version of Lime3DS you are running&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The connected Citra account&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

View File

@ -3,7 +3,7 @@
<class>ConfigureDialog</class> <class>ConfigureDialog</class>
<widget class="QDialog" name="ConfigureDialog"> <widget class="QDialog" name="ConfigureDialog">
<property name="windowTitle"> <property name="windowTitle">
<string>Lime Configuration</string> <string>Lime3DS Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

View File

@ -269,7 +269,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction); ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction);
ui->label_nus_download->setOpenExternalLinks(true); ui->label_nus_download->setOpenExternalLinks(true);
ui->label_nus_download->setText( ui->label_nus_download->setText(
tr("Lime is missing keys to download system files. <br><a " tr("Lime3DS is missing keys to download system files. <br><a "
"href='https://citra-emu.org/wiki/aes-keys/'><span style=\"text-decoration: " "href='https://citra-emu.org/wiki/aes-keys/'><span style=\"text-decoration: "
"underline; color:#039be5;\">How to get keys?</span></a>")); "underline; color:#039be5;\">How to get keys?</span></a>"));
} }

View File

@ -19,7 +19,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBoxWebConfig"> <widget class="QGroupBox" name="groupBoxWebConfig">
<property name="title"> <property name="title">
<string>Lime Web Service</string> <string>Lime3DS Web Service</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayoutCitraWebService"> <layout class="QVBoxLayout" name="verticalLayoutCitraWebService">
<item> <item>
@ -128,7 +128,7 @@
<item> <item>
<widget class="QCheckBox" name="toggle_telemetry"> <widget class="QCheckBox" name="toggle_telemetry">
<property name="text"> <property name="text">
<string>Share anonymous usage data with the Lime team</string> <string>Share anonymous usage data with the Lime3DS team</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -233,8 +233,8 @@ GMainWindow::GMainWindow(Core::System& system_)
ConnectMenuEvents(); ConnectMenuEvents();
ConnectWidgetEvents(); ConnectWidgetEvents();
LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, LOG_INFO(Frontend, "Lime3DS Version: {} | {}-{}", Common::g_build_fullname,
Common::g_scm_desc); Common::g_scm_branch, Common::g_scm_desc);
#if CITRA_ARCH(x86_64) #if CITRA_ARCH(x86_64)
const auto& caps = Common::GetCPUCaps(); const auto& caps = Common::GetCPUCaps();
std::string cpu_string = caps.cpu_string; std::string cpu_string = caps.cpu_string;
@ -1264,7 +1264,7 @@ void GMainWindow::BootGame(const QString& filename) {
return; return;
} }
LOG_INFO(Frontend, "Lime starting..."); LOG_INFO(Frontend, "Lime3DS starting...");
StoreRecentFile(filename); // Put the filename on top of the list StoreRecentFile(filename); // Put the filename on top of the list
if (movie_record_on_start) { if (movie_record_on_start) {
@ -3059,13 +3059,13 @@ void GMainWindow::UpdateWindowTitle() {
const QString full_name = QString::fromUtf8(Common::g_build_fullname); const QString full_name = QString::fromUtf8(Common::g_build_fullname);
if (game_title_long.isEmpty()) { if (game_title_long.isEmpty()) {
setWindowTitle(QStringLiteral("Lime %1").arg(full_name)); setWindowTitle(QStringLiteral("Lime3DS %1").arg(full_name));
} else { } else {
setWindowTitle(QStringLiteral("Lime %1 | %2").arg(full_name, game_title_long)); setWindowTitle(QStringLiteral("Lime3DS %1 | %2").arg(full_name, game_title_long));
render_window->setWindowTitle(QStringLiteral("Lime %1 | %2 | %3") render_window->setWindowTitle(QStringLiteral("Lime3DS %1 | %2 | %3")
.arg(full_name, game_title_long, tr("Primary Window"))); .arg(full_name, game_title_long, tr("Primary Window")));
secondary_window->setWindowTitle( secondary_window->setWindowTitle(
QStringLiteral("Lime %1 | %2 | %3") QStringLiteral("Lime3DS %1 | %2 | %3")
.arg(full_name, game_title_long, tr("Secondary Window"))); .arg(full_name, game_title_long, tr("Secondary Window")));
} }
} }
@ -3195,7 +3195,7 @@ int main(int argc, char* argv[]) {
SCOPE_EXIT({ MicroProfileShutdown(); }); SCOPE_EXIT({ MicroProfileShutdown(); });
// Init settings params // Init settings params
QCoreApplication::setOrganizationName(QStringLiteral("Lime team")); QCoreApplication::setOrganizationName(QStringLiteral("Lime3DS team"));
QCoreApplication::setApplicationName(QStringLiteral("Lime")); QCoreApplication::setApplicationName(QStringLiteral("Lime"));
auto rounding_policy = GetHighDpiRoundingPolicy(); auto rounding_policy = GetHighDpiRoundingPolicy();

View File

@ -475,10 +475,10 @@
</action> </action>
<action name="action_Open_Maintenance_Tool"> <action name="action_Open_Maintenance_Tool">
<property name="text"> <property name="text">
<string>Modify Lime Install</string> <string>Modify Lime3DS Install</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Opens the maintenance tool to modify your Lime installation</string> <string>Opens the maintenance tool to modify your Lime3DS installation</string>
</property> </property>
</action> </action>
<action name="action_Screen_Layout_Default"> <action name="action_Screen_Layout_Default">
@ -587,7 +587,7 @@
</action> </action>
<action name="action_Open_Citra_Folder"> <action name="action_Open_Citra_Folder">
<property name="text"> <property name="text">
<string>Open Lime Folder</string> <string>Open Lime3DS Folder</string>
</property> </property>
</action> </action>
<action name="action_Configure_Current_Game"> <action name="action_Configure_Current_Game">