mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-10 20:25:06 +01:00
Corrected several instances of Lime3DS being referred to as "Lime"
This commit is contained in:
OpenSauce04
parent
6875f8d564
commit
5694b06bd5
4
.github/ISSUE_TEMPLATE/config.yml
vendored
4
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,5 +1,5 @@
|
||||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: Lime Discord
|
||||
- name: Lime3DS Discord
|
||||
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.
|
||||
|
||||
4
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
4
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
@ -4,7 +4,7 @@ labels: "request"
|
||||
body:
|
||||
- type: markdown
|
||||
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
|
||||
attributes:
|
||||
label: Is there an existing issue for this?
|
||||
@ -23,6 +23,6 @@ body:
|
||||
id: why-feature
|
||||
attributes:
|
||||
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:
|
||||
required: true
|
||||
|
||||
4
dist/lime-qt.6
vendored
4
dist/lime-qt.6
vendored
@ -8,7 +8,7 @@
|
||||
.Nm lime-qt
|
||||
.Op Ar file
|
||||
.Sh DESCRIPTION
|
||||
Lime is an experimental open-source Nintendo 3DS emulator/debugger.
|
||||
Lime3DS is an experimental open-source Nintendo 3DS emulator/debugger.
|
||||
.Pp
|
||||
.Nm lime-qt
|
||||
is the Qt implementation.
|
||||
@ -22,7 +22,7 @@ Configuration files.
|
||||
.Sh AUTHORS
|
||||
This document is made available to you under the CC-BY license.
|
||||
.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>.
|
||||
.Pp
|
||||
.Sh SEE ALSO
|
||||
|
||||
6
dist/lime.6
vendored
6
dist/lime.6
vendored
@ -17,7 +17,7 @@ Shows syntax help and exits
|
||||
.It Fl v , Fl Fl version
|
||||
Describes the installed version and exits
|
||||
.Sh DESCRIPTION
|
||||
Lime is an experimental open-source Nintendo 3DS emulator/debugger.
|
||||
Lime3DS is an experimental open-source Nintendo 3DS emulator/debugger.
|
||||
.Pp
|
||||
.Nm lime
|
||||
is the Simple DirectMedia Layer (SDL) implementation.
|
||||
@ -31,7 +31,7 @@ Configuration files.
|
||||
.Sh AUTHORS
|
||||
This document is made available to you under the CC-BY license.
|
||||
.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>.
|
||||
.Pp
|
||||
.Sh SEE ALSO
|
||||
@ -45,5 +45,5 @@ Resources are available for this project:
|
||||
.It <\fBhttps://lime-emu.org\fR>
|
||||
The main homepage of the project.
|
||||
.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
|
||||
|
||||
@ -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_notification_channel_name" 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_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>
|
||||
|
||||
|
||||
@ -243,7 +243,7 @@ void EmuWindow_SDL2::UpdateFramerateCounter() {
|
||||
if (current_time > last_time + 2000) {
|
||||
const auto results = system.GetAndResetPerfStats();
|
||||
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,
|
||||
results.emulation_speed * 100.0f);
|
||||
SDL_SetWindowTitle(render_window, title.c_str());
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
// First, try to create a context with the requested type.
|
||||
|
||||
@ -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{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);
|
||||
render_window =
|
||||
SDL_CreateWindow(window_title.c_str(),
|
||||
|
||||
@ -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{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);
|
||||
render_window =
|
||||
SDL_CreateWindow(window_title.c_str(),
|
||||
|
||||
@ -84,7 +84,7 @@ static void PrintHelp(const char* argv0) {
|
||||
}
|
||||
|
||||
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) {
|
||||
@ -400,8 +400,8 @@ int main(int argc, char** argv) {
|
||||
|
||||
const auto scope = emu_window->Acquire();
|
||||
|
||||
LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||
Common::g_scm_desc);
|
||||
LOG_INFO(Frontend, "Lime3DS Version: {} | {}-{}", Common::g_build_fullname,
|
||||
Common::g_scm_branch, Common::g_scm_desc);
|
||||
Settings::LogSettings();
|
||||
|
||||
const Core::System::ResultStatus load_result{
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; 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-family:'MS Shell Dlg 2'; font-size:12pt;">Lime is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</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-family:'MS Shell Dlg 2'; font-size:12pt;">Lime3DS is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</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-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></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-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html></string>
|
||||
</property>
|
||||
@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; }
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:7pt;">&quot;3DS&quot; is a trademark of Nintendo. Lime is not affiliated with Nintendo in any way.</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:7pt;">&quot;3DS&quot; is a trademark of Nintendo. Lime3DS is not affiliated with Nintendo in any way.</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
<item>
|
||||
<widget class="QLabel" name="lbl_Spiel">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citra-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Lime Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of Lime you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected Citra account</li></ul></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citra-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Lime3DS Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of Lime3DS you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected Citra account</li></ul></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<class>ConfigureDialog</class>
|
||||
<widget class="QDialog" name="ConfigureDialog">
|
||||
<property name="windowTitle">
|
||||
<string>Lime Configuration</string>
|
||||
<string>Lime3DS Configuration</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
|
||||
@ -269,7 +269,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
|
||||
ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction);
|
||||
ui->label_nus_download->setOpenExternalLinks(true);
|
||||
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: "
|
||||
"underline; color:#039be5;\">How to get keys?</span></a>"));
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBoxWebConfig">
|
||||
<property name="title">
|
||||
<string>Lime Web Service</string>
|
||||
<string>Lime3DS Web Service</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayoutCitraWebService">
|
||||
<item>
|
||||
@ -128,7 +128,7 @@
|
||||
<item>
|
||||
<widget class="QCheckBox" name="toggle_telemetry">
|
||||
<property name="text">
|
||||
<string>Share anonymous usage data with the Lime team</string>
|
||||
<string>Share anonymous usage data with the Lime3DS team</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -233,8 +233,8 @@ GMainWindow::GMainWindow(Core::System& system_)
|
||||
ConnectMenuEvents();
|
||||
ConnectWidgetEvents();
|
||||
|
||||
LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||
Common::g_scm_desc);
|
||||
LOG_INFO(Frontend, "Lime3DS Version: {} | {}-{}", Common::g_build_fullname,
|
||||
Common::g_scm_branch, Common::g_scm_desc);
|
||||
#if CITRA_ARCH(x86_64)
|
||||
const auto& caps = Common::GetCPUCaps();
|
||||
std::string cpu_string = caps.cpu_string;
|
||||
@ -1264,7 +1264,7 @@ void GMainWindow::BootGame(const QString& filename) {
|
||||
return;
|
||||
}
|
||||
|
||||
LOG_INFO(Frontend, "Lime starting...");
|
||||
LOG_INFO(Frontend, "Lime3DS starting...");
|
||||
StoreRecentFile(filename); // Put the filename on top of the list
|
||||
|
||||
if (movie_record_on_start) {
|
||||
@ -3059,13 +3059,13 @@ void GMainWindow::UpdateWindowTitle() {
|
||||
const QString full_name = QString::fromUtf8(Common::g_build_fullname);
|
||||
|
||||
if (game_title_long.isEmpty()) {
|
||||
setWindowTitle(QStringLiteral("Lime %1").arg(full_name));
|
||||
setWindowTitle(QStringLiteral("Lime3DS %1").arg(full_name));
|
||||
} else {
|
||||
setWindowTitle(QStringLiteral("Lime %1 | %2").arg(full_name, game_title_long));
|
||||
render_window->setWindowTitle(QStringLiteral("Lime %1 | %2 | %3")
|
||||
setWindowTitle(QStringLiteral("Lime3DS %1 | %2").arg(full_name, game_title_long));
|
||||
render_window->setWindowTitle(QStringLiteral("Lime3DS %1 | %2 | %3")
|
||||
.arg(full_name, game_title_long, tr("Primary Window")));
|
||||
secondary_window->setWindowTitle(
|
||||
QStringLiteral("Lime %1 | %2 | %3")
|
||||
QStringLiteral("Lime3DS %1 | %2 | %3")
|
||||
.arg(full_name, game_title_long, tr("Secondary Window")));
|
||||
}
|
||||
}
|
||||
@ -3195,7 +3195,7 @@ int main(int argc, char* argv[]) {
|
||||
SCOPE_EXIT({ MicroProfileShutdown(); });
|
||||
|
||||
// Init settings params
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("Lime team"));
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("Lime3DS team"));
|
||||
QCoreApplication::setApplicationName(QStringLiteral("Lime"));
|
||||
|
||||
auto rounding_policy = GetHighDpiRoundingPolicy();
|
||||
|
||||
@ -475,10 +475,10 @@
|
||||
</action>
|
||||
<action name="action_Open_Maintenance_Tool">
|
||||
<property name="text">
|
||||
<string>Modify Lime Install</string>
|
||||
<string>Modify Lime3DS Install</string>
|
||||
</property>
|
||||
<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>
|
||||
</action>
|
||||
<action name="action_Screen_Layout_Default">
|
||||
@ -587,7 +587,7 @@
|
||||
</action>
|
||||
<action name="action_Open_Citra_Folder">
|
||||
<property name="text">
|
||||
<string>Open Lime Folder</string>
|
||||
<string>Open Lime3DS Folder</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_Configure_Current_Game">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user