Attempt to fix macos canary workflows

Changed github workflows to have "canary" in the zip files

Added `App.FullAppName` in the about section, so that it's clear in there too

.github/workflows/canary.yml

@@ -111,12 +111,12 @@ jobs:
         run: |
           pushd publish_ava
           rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
 
           pushd publish_sdl2_headless
           rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          7z a ../release_output/sdl2-ryujinx-headless-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
           popd
         shell: bash
 
@@ -126,13 +126,13 @@ jobs:
           pushd publish_ava
           rm publish/libarmeilleure-jitsupport.dylib
           chmod +x publish/Ryujinx.sh publish/Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd
 
           pushd publish_sdl2_headless
           rm publish/libarmeilleure-jitsupport.dylib
           chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          tar -czvf ../release_output/sdl2-ryujinx-headless-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
           popd
         shell: bash
       
@@ -236,11 +236,11 @@ jobs:
 
       - name: Publish macOS Ryujinx
         run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_ava_canary.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
 
       - name: Publish macOS Ryujinx.Headless.SDL2
         run: |
-          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_headless_canary.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
 
       - name: Pushing new release
         uses: ncipollo/release-action@v1

distribution/macos/create_macos_build_ava_canary.sh

@@ -0,0 +1,114 @@
+#!/bin/bash
+
+set -e
+
+if [ "$#" -lt 7 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
+    exit 1
+fi
+
+mkdir -p "$1"
+mkdir -p "$2"
+mkdir -p "$3"
+
+BASE_DIR=$(readlink -f "$1")
+TEMP_DIRECTORY=$(readlink -f "$2")
+OUTPUT_DIRECTORY=$(readlink -f "$3")
+ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
+VERSION=$5
+SOURCE_REVISION_ID=$6
+CONFIGURATION=$7
+EXTRA_ARGS=$8
+
+if [ "$VERSION" == "1.1.0" ];
+then
+  RELEASE_TAR_FILE_NAME=ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
+else
+  RELEASE_TAR_FILE_NAME=ryujinx-canary-$VERSION-macos_universal.app.tar
+fi
+
+ARM64_APP_BUNDLE="$TEMP_DIRECTORY/output_arm64/Ryujinx.app"
+X64_APP_BUNDLE="$TEMP_DIRECTORY/output_x64/Ryujinx.app"
+UNIVERSAL_APP_BUNDLE="$OUTPUT_DIRECTORY/Ryujinx.app"
+EXECUTABLE_SUB_PATH=Contents/MacOS/Ryujinx
+
+rm -rf "$TEMP_DIRECTORY"
+mkdir -p "$TEMP_DIRECTORY"
+
+DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
+
+dotnet restore
+dotnet build -c "$CONFIGURATION" src/Ryujinx
+dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx
+dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx
+
+# Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
+rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
+
+# Get rid of libsoundio from arm64 builds as we don't have a arm64 variant
+# TODO: remove this once done
+rm -rf "$TEMP_DIRECTORY/publish_arm64/libsoundio.dylib"
+
+pushd "$BASE_DIR/distribution/macos"
+./create_app_bundle.sh "$TEMP_DIRECTORY/publish_x64" "$TEMP_DIRECTORY/output_x64" "$ENTITLEMENTS_FILE_PATH"
+./create_app_bundle.sh "$TEMP_DIRECTORY/publish_arm64" "$TEMP_DIRECTORY/output_arm64" "$ENTITLEMENTS_FILE_PATH"
+popd
+
+rm -rf "$UNIVERSAL_APP_BUNDLE"
+mkdir -p "$OUTPUT_DIRECTORY"
+
+# Let's copy one of the two different app bundle and remove the executable
+cp -R "$ARM64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE"
+rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"
+
+# Make it libraries universal
+python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"
+
+if ! [ -x "$(command -v lipo)" ];
+then
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    then
+        LIPO=llvm-lipo
+    else
+        LIPO=llvm-lipo-14
+    fi
+else
+    LIPO=lipo
+fi
+
+# Make the executable universal
+$LIPO "$ARM64_APP_BUNDLE/$EXECUTABLE_SUB_PATH" "$X64_APP_BUNDLE/$EXECUTABLE_SUB_PATH" -output "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH" -create
+
+# Patch up the Info.plist to have appropriate version
+sed -r -i.bck "s/\%\%RYUJINX_BUILD_VERSION\%\%/$VERSION/g;" "$UNIVERSAL_APP_BUNDLE/Contents/Info.plist"
+sed -r -i.bck "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$SOURCE_REVISION_ID/g;" "$UNIVERSAL_APP_BUNDLE/Contents/Info.plist"
+rm "$UNIVERSAL_APP_BUNDLE/Contents/Info.plist.bck"
+
+# Now sign it
+if ! [ -x "$(command -v codesign)" ];
+then
+    if ! [ -x "$(command -v rcodesign)" ];
+    then
+        echo "Cannot find rcodesign on your system, please install rcodesign."
+        exit 1
+    fi
+
+    # NOTE: Currently require https://github.com/indygreg/apple-platform-rs/pull/44 to work on other OSes.
+    # cargo install --git "https://github.com/marysaka/apple-platform-rs" --branch "fix/adhoc-app-bundle" apple-codesign --bin "rcodesign"
+    echo "Using rcodesign for ad-hoc signing"
+    rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$UNIVERSAL_APP_BUNDLE"
+else
+    echo "Using codesign for ad-hoc signing"
+    codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$UNIVERSAL_APP_BUNDLE"
+fi
+
+echo "Creating archive"
+pushd "$OUTPUT_DIRECTORY"
+tar --exclude "Ryujinx.app/Contents/MacOS/Ryujinx" -cvf "$RELEASE_TAR_FILE_NAME" Ryujinx.app 1> /dev/null
+python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "Ryujinx.app/Contents/MacOS/Ryujinx" "Ryujinx.app/Contents/MacOS/Ryujinx"
+gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
+rm "$RELEASE_TAR_FILE_NAME"
+
+popd
+
+echo "Done"

distribution/macos/create_macos_build_headless_canary.sh

@@ -0,0 +1,111 @@
+#!/bin/bash
+
+set -e
+
+if [ "$#" -lt 7 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
+    exit 1
+fi
+
+mkdir -p "$1"
+mkdir -p "$2"
+mkdir -p "$3"
+
+BASE_DIR=$(readlink -f "$1")
+TEMP_DIRECTORY=$(readlink -f "$2")
+OUTPUT_DIRECTORY=$(readlink -f "$3")
+ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
+VERSION=$5
+SOURCE_REVISION_ID=$6
+CONFIGURATION=$7
+EXTRA_ARGS=$8
+
+if [ "$VERSION" == "1.1.0" ];
+then
+  RELEASE_TAR_FILE_NAME=sdl2-ryujinx-headless-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
+else
+  RELEASE_TAR_FILE_NAME=sdl2-ryujinx-headless-canary-$VERSION-macos_universal.tar
+fi
+
+ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
+X64_OUTPUT="$TEMP_DIRECTORY/publish_x64"
+UNIVERSAL_OUTPUT="$OUTPUT_DIRECTORY/publish"
+EXECUTABLE_SUB_PATH=Ryujinx.Headless.SDL2
+
+rm -rf "$TEMP_DIRECTORY"
+mkdir -p "$TEMP_DIRECTORY"
+
+DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
+
+dotnet restore
+dotnet build -c "$CONFIGURATION" src/Ryujinx.Headless.SDL2
+dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL2
+dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL2
+
+# Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
+rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
+
+# Get rid of libsoundio from arm64 builds as we don't have a arm64 variant
+# TODO: remove this once done
+rm -rf "$TEMP_DIRECTORY/publish_arm64/libsoundio.dylib"
+
+rm -rf "$OUTPUT_DIRECTORY"
+mkdir -p "$OUTPUT_DIRECTORY"
+
+# Let's copy one of the two different outputs and remove the executable
+cp -R "$ARM64_OUTPUT/" "$UNIVERSAL_OUTPUT"
+rm "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH"
+
+# Make it libraries universal
+python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTPUT" "$X64_OUTPUT" "$UNIVERSAL_OUTPUT" "**/*.dylib"
+
+if ! [ -x "$(command -v lipo)" ];
+then
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    then
+        LIPO=llvm-lipo
+    else
+        LIPO=llvm-lipo-14
+    fi
+else
+    LIPO=lipo
+fi
+
+# Make the executable universal
+$LIPO "$ARM64_OUTPUT/$EXECUTABLE_SUB_PATH" "$X64_OUTPUT/$EXECUTABLE_SUB_PATH" -output "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH" -create
+
+# Now sign it
+if ! [ -x "$(command -v codesign)" ];
+then
+    if ! [ -x "$(command -v rcodesign)" ];
+    then
+        echo "Cannot find rcodesign on your system, please install rcodesign."
+        exit 1
+    fi
+
+    # NOTE: Currently require https://github.com/indygreg/apple-platform-rs/pull/44 to work on other OSes.
+    # cargo install --git "https://github.com/marysaka/apple-platform-rs" --branch "fix/adhoc-app-bundle" apple-codesign --bin "rcodesign"
+    echo "Using rcodesign for ad-hoc signing"
+    for FILE in "$UNIVERSAL_OUTPUT"/*; do
+        if [[ $(file "$FILE") == *"Mach-O"* ]]; then
+            rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$FILE"
+        fi
+    done  
+else
+    echo "Using codesign for ad-hoc signing"
+    for FILE in "$UNIVERSAL_OUTPUT"/*; do
+        if [[ $(file "$FILE") == *"Mach-O"* ]]; then
+            codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$FILE"
+        fi
+    done    
+fi
+
+echo "Creating archive"
+pushd "$OUTPUT_DIRECTORY"
+tar --exclude "publish/Ryujinx.Headless.SDL2" -cvf "$RELEASE_TAR_FILE_NAME" publish 1> /dev/null
+python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "publish/Ryujinx.Headless.SDL2" "publish/Ryujinx.Headless.SDL2"
+gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
+rm "$RELEASE_TAR_FILE_NAME"
+popd
+
+echo "Done"

src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs

@@ -2,6 +2,7 @@ using Ryujinx.Common.Logging.Formatters;
 using System;
 using System.IO;
 using System.Linq;
+using System.Net.Mime;
 
 namespace Ryujinx.Common.Logging.Targets
 {
@@ -69,9 +70,10 @@ namespace Ryujinx.Common.Logging.Targets
             }
 
             string version = ReleaseInformation.Version;
+            string appName = ReleaseInformation.IsCanaryBuild ? "Ryujinx Canary" : "Ryujinx";
 
             // Get path for the current time
-            path = Path.Combine(logDir.FullName, $"Ryujinx_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");
+            path = Path.Combine(logDir.FullName, $"{appName}_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");
 
             try
             {

src/Ryujinx/Assets/Locales/it_IT.json

@@ -33,9 +33,8 @@
   "MenuBarFileLoadDlcFromFolder": "Carica DLC Da una Cartella",
   "MenuBarFileLoadTitleUpdatesFromFolder": "Carica Aggiornamenti Da una Cartella",
   "MenuBarFileOpenFromFileError": "Nessuna applicazione trovata nel file selezionato",
-  "MenuBarToolsXCITrimmer": "Trim XCI Files",
-  "MenuBarView": "_Vista",
-  "MenuBarViewWindow": "Dimensione Finestra",
+  "MenuBarView": "_View",
+  "MenuBarViewWindow": "Window Size",
   "MenuBarViewWindow720": "720p",
   "MenuBarViewWindow1080": "1080p",
   "MenuBarHelp": "_Aiuto",
@@ -85,11 +84,8 @@
   "GameListContextMenuOpenModsDirectoryToolTip": "Apre la cartella che contiene le mod dell'applicazione",
   "GameListContextMenuOpenSdModsDirectory": "Apri la cartella delle mod Atmosphere",
   "GameListContextMenuOpenSdModsDirectoryToolTip": "Apre la cartella alternativa di Atmosphere sulla scheda SD che contiene le mod dell'applicazione. Utile per le mod create per funzionare sull'hardware reale.",
-  "GameListContextMenuTrimXCI": "Controlla e Trimma i file XCI",
-  "GameListContextMenuTrimXCIToolTip": "Controlla e Trimma i file XCI da Salvare Sullo Spazio del Disco",
-  "StatusBarGamesLoaded": "{0}/{1} Giochi Caricati",
+  "StatusBarGamesLoaded": "{0}/{1} giochi caricati",
   "StatusBarSystemVersion": "Versione di sistema: {0}",
-  "StatusBarXCIFileTrimming": "Trimmando i file XCI '{0}'",
   "LinuxVmMaxMapCountDialogTitle": "Rilevato limite basso per le mappature di memoria",
   "LinuxVmMaxMapCountDialogTextPrimary": "Vuoi aumentare il valore di vm.max_map_count a {0}?",
   "LinuxVmMaxMapCountDialogTextSecondary": "Alcuni giochi potrebbero provare a creare più mappature di memoria di quanto sia attualmente consentito. Ryujinx si bloccherà non appena questo limite viene superato.",
@@ -103,8 +99,8 @@
   "SettingsTabGeneralEnableDiscordRichPresence": "Attiva Discord Rich Presence",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Controlla aggiornamenti all'avvio",
   "SettingsTabGeneralShowConfirmExitDialog": "Mostra dialogo \"Conferma Uscita\"",
-  "SettingsTabGeneralRememberWindowState": "Ricorda Dimensione/Posizione Finestra",
-  "SettingsTabGeneralShowTitleBar": "Mostra barra del titolo (Richiede il riavvio)",
+  "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position",
+  "SettingsTabGeneralShowTitleBar": "Show Title Bar (Requires restart)",
   "SettingsTabGeneralHideCursor": "Nascondi il cursore:",
   "SettingsTabGeneralHideCursorNever": "Mai",
   "SettingsTabGeneralHideCursorOnIdle": "Quando è inattivo",
@@ -404,8 +400,6 @@
   "InputDialogTitle": "Finestra di input",
   "InputDialogOk": "OK",
   "InputDialogCancel": "Annulla",
-  "InputDialogCancelling": "Cancellando",
-  "InputDialogClose": "Chiudi",
   "InputDialogAddNewProfileTitle": "Scegli il nome del profilo",
   "InputDialogAddNewProfileHeader": "Digita un nome profilo",
   "InputDialogAddNewProfileSubtext": "(Lunghezza massima: {0})",
@@ -413,7 +407,7 @@
   "AvatarSetBackgroundColor": "Imposta colore di sfondo",
   "AvatarClose": "Chiudi",
   "ControllerSettingsLoadProfileToolTip": "Carica profilo",
-  "ControllerSettingsViewProfileToolTip": "Visualizza profilo",
+  "ControllerSettingsViewProfileToolTip": "View Profile",
   "ControllerSettingsAddProfileToolTip": "Aggiungi profilo",
   "ControllerSettingsRemoveProfileToolTip": "Rimuovi profilo",
   "ControllerSettingsSaveProfileToolTip": "Salva profilo",
@@ -423,7 +417,7 @@
   "GameListContextMenuToggleFavorite": "Preferito",
   "GameListContextMenuToggleFavoriteToolTip": "Segna il gioco come preferito",
   "SettingsTabGeneralTheme": "Tema:",
-  "SettingsTabGeneralThemeAuto": "Automatico",
+  "SettingsTabGeneralThemeAuto": "Auto",
   "SettingsTabGeneralThemeDark": "Scuro",
   "SettingsTabGeneralThemeLight": "Chiaro",
   "ControllerSettingsConfigureGeneral": "Configura",
@@ -475,7 +469,6 @@
   "DialogUninstallFileTypesSuccessMessage": "Tipi di file disinstallati con successo!",
   "DialogUninstallFileTypesErrorMessage": "Disinstallazione dei tipi di file non riuscita.",
   "DialogOpenSettingsWindowLabel": "Apri finestra delle impostazioni",
-  "DialogOpenXCITrimmerWindowLabel": "Finestra XCI Trimmer",
   "DialogControllerAppletTitle": "Applet del controller",
   "DialogMessageDialogErrorExceptionMessage": "Errore nella visualizzazione del Message Dialog: {0}",
   "DialogSoftwareKeyboardErrorExceptionMessage": "Errore nella visualizzazione della tastiera software: {0}",
@@ -529,7 +522,7 @@
   "DialogModManagerDeletionAllWarningMessage": "Stai per eliminare tutte le mod per questo titolo.\n\nVuoi davvero procedere?",
   "SettingsTabGraphicsFeaturesOptions": "Funzionalità",
   "SettingsTabGraphicsBackendMultithreading": "Multithreading del backend grafico:",
-  "CommonAuto": "Automatico",
+  "CommonAuto": "Auto",
   "CommonOff": "Disattivato",
   "CommonOn": "Attivo",
   "InputDialogYes": "Sì",
@@ -676,15 +669,9 @@
   "OpenSetupGuideMessage": "Apri la guida all'installazione",
   "NoUpdate": "Nessun aggiornamento",
   "TitleUpdateVersionLabel": "Versione {0}",
-  "TitleBundledUpdateVersionLabel": "In bundle: Versione {0}",
-  "TitleBundledDlcLabel": "In bundle:",
-  "TitleXCIStatusPartialLabel": "Parziale",
-  "TitleXCIStatusTrimmableLabel": "Non Trimmato",
-  "TitleXCIStatusUntrimmableLabel": "Trimmato",
-  "TitleXCIStatusFailedLabel": "(Fallito)",
-  "TitleXCICanSaveLabel": "Salva {0:n0} Mb",
-  "TitleXCISavingLabel": "Salva {0:n0} Mb",
-  "RyujinxInfo": "Ryujinx - Informazioni",
+  "TitleBundledUpdateVersionLabel": "Incluso: Version {0}",
+  "TitleBundledDlcLabel": "Incluso:",
+  "RyujinxInfo": "Ryujinx - Info",
   "RyujinxConfirm": "Ryujinx - Conferma",
   "FileDialogAllTypes": "Tutti i tipi",
   "Never": "Mai",
@@ -736,54 +723,27 @@
   "SelectDlcDialogTitle": "Seleziona file dei DLC",
   "SelectUpdateDialogTitle": "Seleziona file di aggiornamento",
   "SelectModDialogTitle": "Seleziona cartella delle mod",
-  "TrimXCIFileDialogTitle": "Controlla e Trimma i file XCI ",
-  "TrimXCIFileDialogPrimaryText": "Questa funzionalita controllerà prima lo spazio libero e poi trimmerà il file XCI per liberare dello spazio.",
-  "TrimXCIFileDialogSecondaryText": "Dimensioni Attuali File: {0:n} MB\nDimensioni Dati Gioco: {1:n} MB\nRisparimio Spazio Disco: {2:n} MB",
-  "TrimXCIFileNoTrimNecessary": "Il file XCI non deve essere trimmato. Controlla i log per ulteriori dettagli",
-  "TrimXCIFileNoUntrimPossible": "Il file XCI non può essere untrimmato. Controlla i log per ulteriori dettagli",
-  "TrimXCIFileReadOnlyFileCannotFix": "Il file XCI è in sola lettura e non può essere reso Scrivibile. Controlla i log per ulteriori dettagli",
-  "TrimXCIFileFileSizeChanged": "Il file XCI ha cambiato dimensioni da quando è stato scansionato. Controlla che il file non stia venendo scritto da qualche altro programma e poi riprova.",
-  "TrimXCIFileFreeSpaceCheckFailed": "Il file XCI ha dati nello spazio libero, non è sicuro effettuare il trimming",
-  "TrimXCIFileInvalidXCIFile": "Il file XCI contiene dati invlidi. Controlla i log per ulteriori dettagli",
-  "TrimXCIFileFileIOWriteError": "Il file XCI non può essere aperto per essere scritto. Controlla i log per ulteriori dettagli",
-  "TrimXCIFileFailedPrimaryText": "Trimming del file XCI fallito",
-  "TrimXCIFileCancelled": "Operazione Cancellata",
-  "TrimXCIFileFileUndertermined": "Nessuna operazione è stata effettuata",
   "UserProfileWindowTitle": "Gestione profili utente",
   "CheatWindowTitle": "Gestione trucchi",
   "DlcWindowTitle": "Gestisci DLC per {0} ({1})",
   "ModWindowTitle": "Gestisci mod per {0} ({1})",
   "UpdateWindowTitle": "Gestione aggiornamenti",
-  "XCITrimmerWindowTitle": "XCI File Trimmer",
-  "XCITrimmerTitleStatusCount": "{0} di {1} Titolo(i) Selezionati",
-  "XCITrimmerTitleStatusCountWithFilter": "{0} of {1} Titolo(i) Selezionati ({2} visualizzato)",
-  "XCITrimmerTitleStatusTrimming": "Trimming {0} Titolo(i)...",
-  "XCITrimmerTitleStatusUntrimming": "Untrimming {0} Titolo(i)...",
-  "XCITrimmerTitleStatusFailed": "Fallito",
-  "XCITrimmerPotentialSavings": "Potenziali Salvataggi",
-  "XCITrimmerActualSavings": "Effettivi Salvataggi",
-  "XCITrimmerSavingsMb": "{0:n0} Mb",
-  "XCITrimmerSelectDisplayed": "Seleziona Visualizzati",
-  "XCITrimmerDeselectDisplayed": "Deselziona Visualizzati",
-  "XCITrimmerSortName": "Titolo",
-  "XCITrimmerSortSaved": "Salvataggio Spazio",
-  "UpdateWindowUpdateAddedMessage": "{0} aggiornamento/i aggiunto/i",
-  "UpdateWindowBundledContentNotice": "Gli aggiornamenti inclusi non possono essere eliminati, ma solo disattivati",
   "CheatWindowHeading": "Trucchi disponibili per {0} [{1}]",
   "BuildId": "ID Build",
-  "DlcWindowBundledContentNotice": "i DLC \"impacchettati\" non possono essere rimossi, ma solo disabilitati.",
   "DlcWindowHeading": "DLC disponibili per {0} [{1}]",
-  "DlcWindowDlcAddedMessage": "{0} nuovo/i contenuto/i scaricabile/i aggiunto/i",
+  "ModWindowHeading": "{0} mod",
+  "UserProfilesEditProfile": "Modifica selezionati",
+  "Cancel": "Annulla",
+  "Save": "Salva",
+  "Discard": "Scarta",
+  "UpdateWindowBundledContentNotice": "Gli aggiornamenti inclusi non possono essere eliminati, ma solo disattivati",
   "AutoloadDlcAddedMessage": "{0} contenuto/i scaricabile/i aggiunto/i",
   "AutoloadDlcRemovedMessage": "{0} contenuto/i scaricabile/i mancante/i rimosso/i",
   "AutoloadUpdateAddedMessage": "{0} aggiornamento/i aggiunto/i",
   "AutoloadUpdateRemovedMessage": "{0} aggiornamento/i mancante/i rimosso/i",
-  "ModWindowHeading": "{0} mod",
-  "UserProfilesEditProfile": "Modifica selezionati",
-  "Continue": "Continua",
-  "Cancel": "Annulla",
-  "Save": "Salva",
-  "Discard": "Scarta",
+  "DlcWindowBundledContentNotice": "i DLC \"impacchettati\" non possono essere rimossi, ma solo disabilitati.",
+  "DlcWindowDlcAddedMessage": "{0} nuovo/i contenuto/i scaricabile/i aggiunto/i",
+  "UpdateWindowUpdateAddedMessage": "{0} aggiornamento/i aggiunto/i",
   "Paused": "In pausa",
   "UserProfilesSetProfileImage": "Imposta immagine profilo",
   "UserProfileEmptyNameError": "Il nome è obbligatorio",

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public AboutWindowViewModel()
         {
-            Version = Program.Version;
+            Version = App.FullAppName + "\n" + Program.Version;
             UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
 
             ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;