moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 15:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Purge NVIDIA-specific strings

Browse Source
This commit is contained in:
Cameron Gutman 2023-03-18 14:20:51 -05:00
parent a0365c8e1c
commit bccffe09e2
8 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Info.plist
View File

@ -5,7 +5,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Moonlight</string> <string>Moonlight</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>Stream games from your NVIDIA GameStream-enabled PC</string> <string>Stream games and other applications from another PC</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>moonlight</string> <string>moonlight</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>

2
app/backend/nvhttp.cpp
View File

@ -362,7 +362,7 @@ NvHTTP::verifyResponseStatus(QString xml)
} }
} }
throw GfeHttpResponseException(-1, "Malformed GFE XML (missing root element)"); throw GfeHttpResponseException(-1, "Malformed XML (missing root element)");
} }
QImage QImage

4
app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml
View File

@ -4,10 +4,10 @@
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license> <project_license>GPL-3.0+</project_license>
<name>Moonlight</name> <name>Moonlight</name>
<summary>Play games remotely from your NVIDIA GameStream-enabled PC</summary> <summary>Stream games and other applications from another PC running Sunshine or GeForce Experience</summary>
<description> <description>
<p>Moonlight can stream games and other applications from a PC with an NVIDIA GeForce GTX/RTX or NVIDIA Quadro GPU and GeForce/Quadro Experience installed.</p> <p>Moonlight can stream games and other applications from another PC with Sunshine or GeForce Experience software installed.</p>
<p>Features include:</p> <p>Features include:</p>
<ul> <ul>
<li>Streaming at up to 4K resolution</li> <li>Streaming at up to 4K resolution</li>

4
app/deploy/linux/com.moonlight_stream.Moonlight.desktop
View File

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=Moonlight Name=Moonlight
Comment=Stream games from your NVIDIA GameStream-enabled PC Comment=Stream games and other applications from another PC running Sunshine or GeForce Experience
Exec=moonlight Exec=moonlight
Icon=moonlight Icon=moonlight
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Qt;Game; Categories=Qt;Game;
Keywords=nvidia;gamestream;stream; Keywords=nvidia;gamestream;stream;sunshine;remote play;

7
app/gui/PcView.qml
View File

@ -99,7 +99,7 @@ CenteredGridView {
Label { Label {
height: searchSpinner.height height: searchSpinner.height
elide: Label.ElideRight elide: Label.ElideRight
text: StreamingPreferences.enableMdns ? qsTr("Searching for PCs on your local network with NVIDIA GameStream enabled...") text: StreamingPreferences.enableMdns ? qsTr("Searching for compatible hosts on your local network...")
: qsTr("Automatic PC discovery is disabled. Add your PC manually.") : qsTr("Automatic PC discovery is disabled. Add your PC manually.")
font.pointSize: 20 font.pointSize: 20
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -291,7 +291,8 @@ CenteredGridView {
// don't allow edits to the rest of the window while open // don't allow edits to the rest of the window while open
property string pin : "0000" property string pin : "0000"
text:qsTr("Please enter %1 on your GameStream PC. This dialog will close when pairing is completed.").arg(pin) text:qsTr("Please enter %1 on your host PC. This dialog will close when pairing is completed.").arg(pin)+"\n\n"+
qsTr("If your host PC is running Sunshine, navigate to the Sunshine web UI to enter the PIN.")
standardButtons: Dialog.Cancel standardButtons: Dialog.Cancel
onRejected: { onRejected: {
// FIXME: We should interrupt pairing here // FIXME: We should interrupt pairing here
@ -319,7 +320,7 @@ CenteredGridView {
standardButtons: Dialog.Ok standardButtons: Dialog.Ok
onAboutToShow: { onAboutToShow: {
testConnectionDialog.text = qsTr("Moonlight is testing your network connection to determine if NVIDIA GameStream is blocked.") + "\n\n" + qsTr("This may take a few seconds…") testConnectionDialog.text = qsTr("Moonlight is testing your network connection to determine if any required ports are blocked.") + "\n\n" + qsTr("This may take a few seconds…")
showSpinner = true showSpinner = true
} }

2
app/gui/main.qml
View File

@ -488,7 +488,7 @@ ApplicationWindow {
NavigableDialog { NavigableDialog {
id: addPcDialog id: addPcDialog
property string label: qsTr("Enter the IP address of your GameStream PC:") property string label: qsTr("Enter the IP address of your host PC:")
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel

11
app/streaming/session.cpp
View File

@ -115,8 +115,7 @@ void Session::clConnectionTerminated(int errorCode)
case ML_ERROR_UNEXPECTED_EARLY_TERMINATION: case ML_ERROR_UNEXPECTED_EARLY_TERMINATION:
s_ActiveSession->m_UnexpectedTermination = true; s_ActiveSession->m_UnexpectedTermination = true;
emit s_ActiveSession->displayLaunchError(tr("Something went wrong on your host PC when starting the stream.") + "\n\n" + emit s_ActiveSession->displayLaunchError(tr("Something went wrong on your host PC when starting the stream.") + "\n\n" +
tr("Make sure you don't have any DRM-protected content open on your host PC. You can also try restarting your host PC.") + "\n\n" + tr("Make sure you don't have any DRM-protected content open on your host PC. You can also try restarting your host PC."));
tr("If the issue persists, try reinstalling your GPU drivers and GeForce Experience."));
break; break;
case ML_ERROR_FRAME_CONVERSION: case ML_ERROR_FRAME_CONVERSION:
@ -700,8 +699,7 @@ bool Session::validateLaunch(SDL_Window* testWindow)
if (m_Computer->maxLumaPixelsHEVC == 0) { if (m_Computer->maxLumaPixelsHEVC == 0) {
if (hevcForced) { if (hevcForced) {
emitLaunchWarning(tr("Your host PC GPU doesn't support HEVC. " emitLaunchWarning(tr("Your host PC doesn't support encoding HEVC."));
"A GeForce GTX 900-series (Maxwell) or later GPU is required for HEVC streaming."));
} }
// Moonlight-common-c will handle this case already, but we want // Moonlight-common-c will handle this case already, but we want
@ -755,8 +753,7 @@ bool Session::validateLaunch(SDL_Window* testWindow)
// Check that the server GPU supports HDR // Check that the server GPU supports HDR
if (!(m_Computer->serverCodecModeSupport & 0x200)) { if (!(m_Computer->serverCodecModeSupport & 0x200)) {
emitLaunchWarning(tr("Your host PC GPU doesn't support HDR streaming. " emitLaunchWarning(tr("Your host PC doesn't support HDR streaming."));
"A GeForce GTX 1000-series (Pascal) or later GPU is required for HDR streaming."));
} }
else if (!isHardwareDecodeAvailable(testWindow, else if (!isHardwareDecodeAvailable(testWindow,
m_Preferences->videoDecoderSelection, m_Preferences->videoDecoderSelection,
@ -1181,7 +1178,7 @@ bool Session::startConnectionAsync()
!m_Preferences->multiController, !m_Preferences->multiController,
rtspSessionUrl); rtspSessionUrl);
} catch (const GfeHttpResponseException& e) { } catch (const GfeHttpResponseException& e) {
emit displayLaunchError(tr("GeForce Experience returned error: %1").arg(e.toQString())); emit displayLaunchError(tr("Host returned error: %1").arg(e.toQString()));
return false; return false;
} catch (const QtNetworkReplyException& e) { } catch (const QtNetworkReplyException& e) {
emit displayLaunchError(e.toQString()); emit displayLaunchError(e.toQString());

2
wix/Moonlight/Product.wxs
View File

@ -4,7 +4,7 @@
<?define FullName = "Moonlight Game Streaming Client" ?> <?define FullName = "Moonlight Game Streaming Client" ?>
<?define ShortcutName = "$(var.ShortName)" ?> <?define ShortcutName = "$(var.ShortName)" ?>
<?define ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?> <?define ShortcutDesc = "Stream games and other applications from another PC" ?>
<?define InstallFolder = "Moonlight Game Streaming" ?> <?define InstallFolder = "Moonlight Game Streaming" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"