diff --git a/.changes/nsis-checkapprunning-macro.md b/.changes/nsis-checkapprunning-macro.md new file mode 100644 index 000000000000..3d277ac8a06c --- /dev/null +++ b/.changes/nsis-checkapprunning-macro.md @@ -0,0 +1,8 @@ +--- +"tauri-bundler": "minor:feat" +"tauri-cli": "minor:feat" +"@tauri-apps/cli": "minor:feat" +--- + +Allow using `CheckIfAppIsRunning` macro inside NSIS hooks, for example `!insertmacro CheckIfAppIsRunning "another-executable.exe" "Another Executable"`. + diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi b/crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi index 4bccb0d9eb3c..fb8e9bb406dc 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi +++ b/crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi @@ -618,7 +618,7 @@ Section Install !insertmacro NSIS_HOOK_PREINSTALL !endif - !insertmacro CheckIfAppIsRunning + !insertmacro CheckIfAppIsRunning "${MAINBINARYNAME}.exe" "${PRODUCTNAME}" ; Copy main executable File "${MAINBINARYSRCPATH}" @@ -755,7 +755,7 @@ Section Uninstall !insertmacro NSIS_HOOK_PREUNINSTALL !endif - !insertmacro CheckIfAppIsRunning + !insertmacro CheckIfAppIsRunning "${MAINBINARYNAME}.exe" "${PRODUCTNAME}" ; Delete the app directory and its content from disk ; Copy main executable diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Arabic.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Arabic.nsh index 8b138119a0ab..fc9a7f98d718 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Arabic.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Arabic.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_ARABIC} "إضافة أو إزالة المكونات" LangString alreadyInstalled ${LANG_ARABIC} "التطبيق مثبت بالفعل" LangString alreadyInstalledLong ${LANG_ARABIC} "${PRODUCTNAME} ${VERSION} مثبت بالفعل. قم باختيار العملية التى تريدها ثم اضغط على التالى." -LangString appRunning ${LANG_ARABIC} "${PRODUCTNAME} مازال يعمل! من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى." -LangString appRunningOkKill ${LANG_ARABIC} "${PRODUCTNAME} مازال يعمل!$\nاضغط OK لإغلاقه" +LangString appRunning ${LANG_ARABIC} "{{product_name}} مازال يعمل! من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى." +LangString appRunningOkKill ${LANG_ARABIC} "{{product_name}} مازال يعمل!$\nاضغط OK لإغلاقه" LangString chooseMaintenanceOption ${LANG_ARABIC} "قم باختيار نوع الصيانة التى تريدها." LangString choowHowToInstall ${LANG_ARABIC} "قم باختيار طريقة تنصيب ${PRODUCTNAME}." LangString createDesktop ${LANG_ARABIC} "اضف اختصار على سطح المكتب" LangString dontUninstall ${LANG_ARABIC} "عدم إزالة" LangString dontUninstallDowngrade ${LANG_ARABIC} "عدم إزالة (التخفيض بدون إزالة غير مسموح لهذا المثبت)" -LangString failedToKillApp ${LANG_ARABIC} "فشل فى غلف ${PRODUCTNAME}. من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى." +LangString failedToKillApp ${LANG_ARABIC} "فشل فى غلف {{product_name}}. من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى." LangString installingWebview2 ${LANG_ARABIC} "تنصيب WebView2..." LangString newerVersionInstalled ${LANG_ARABIC} "يوجد نسخة جديدة من ${PRODUCTNAME} مثبتة بالغعل! لا ينصح بتنصيب نسخة اقدم من النسخة الحالية. اذا مازلت ترغب فى تنصيب النسخة الأقدم، فينصح بإزالة النسخة الحالية أولاً. قم باختيار العملية التى تريدها ثم اضغط على التالى للاستمرار." LangString older ${LANG_ARABIC} "أقدم" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Bulgarian.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Bulgarian.nsh index ea3f20665929..341064b63f41 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Bulgarian.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Bulgarian.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_BULGARIAN} "Добавяне/Преинсталиране на компоненти" LangString alreadyInstalled ${LANG_BULGARIAN} "Вече инсталиран" LangString alreadyInstalledLong ${LANG_BULGARIAN} "${PRODUCTNAME} ${VERSION} е вече е инсталиран. Изберете операцията, която искате да извършите и натиснете Напред, за да продължите." -LangString appRunning ${LANG_BULGARIAN} "${PRODUCTNAME} е отворен! Моля, затворете го първо и опитайте отново." -LangString appRunningOkKill ${LANG_BULGARIAN} "${PRODUCTNAME} е отворен!$\nНатиснете ОК, за да го затворите." +LangString appRunning ${LANG_BULGARIAN} "{{product_name}} е отворен! Моля, затворете го първо и опитайте отново." +LangString appRunningOkKill ${LANG_BULGARIAN} "{{product_name}} е отворен!$\nНатиснете ОК, за да го затворите." LangString chooseMaintenanceOption ${LANG_BULGARIAN} "Изберете опция за поддръжка." LangString choowHowToInstall ${LANG_BULGARIAN} "Изберете как искате да инсталирате ${PRODUCTNAME}." LangString createDesktop ${LANG_BULGARIAN} "Създайте пряк път на работния плот" LangString dontUninstall ${LANG_BULGARIAN} "Не деинсталирайте" LangString dontUninstallDowngrade ${LANG_BULGARIAN} "Не деинсталирайте (Понижаването без деинсталация е забранено за този инсталатор)" -LangString failedToKillApp ${LANG_BULGARIAN} "Неуспешно прекратяване на ${PRODUCTNAME}. Моля, затворете го първо и опитайте отново." +LangString failedToKillApp ${LANG_BULGARIAN} "Неуспешно прекратяване на {{product_name}}. Моля, затворете го първо и опитайте отново." LangString installingWebview2 ${LANG_BULGARIAN} "Инсталиране на WebView2..." LangString newerVersionInstalled ${LANG_BULGARIAN} "Вече е инсталирана по-нова версия на ${PRODUCTNAME}! Не се препоръчва да инсталирате по-стара версия. Ако наистина желаете да инсталирате тази по-стара версия, по-добре е да деинсталирате текущата версия първо. Изберете операцията, която искате да извършите и натиснете Напред, за да продължите." LangString older ${LANG_BULGARIAN} "по-стара" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Dutch.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Dutch.nsh index 927bbd934917..b68887882fa3 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Dutch.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Dutch.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_DUTCH} "(Her)installeer componenten" LangString alreadyInstalled ${LANG_DUTCH} "Al geïnstalleerd" LangString alreadyInstalledLong ${LANG_DUTCH} "${PRODUCTNAME} ${VERSION} is al geïnstalleerd. Kies een van de volgende opties en klik op Volgende om door te gaan." -LangString appRunning ${LANG_DUTCH} "${PRODUCTNAME} is geopend! Sluit het programma eerst en probeer het dan opnieuw." -LangString appRunningOkKill ${LANG_DUTCH} "${PRODUCTNAME} is geopend!$\nKlik op OK om het te stoppen." +LangString appRunning ${LANG_DUTCH} "{{product_name}} is geopend! Sluit het programma eerst en probeer het dan opnieuw." +LangString appRunningOkKill ${LANG_DUTCH} "{{product_name}} is geopend!$\nKlik op OK om het te stoppen." LangString chooseMaintenanceOption ${LANG_DUTCH} "Kies de onderhoudsoptie die u wilt uitvoeren." LangString choowHowToInstall ${LANG_DUTCH} "Kies hoe u ${PRODUCTNAME} wilt installeren." LangString createDesktop ${LANG_DUTCH} "Maak een snelkoppeling aan op het bureaublad" LangString dontUninstall ${LANG_DUTCH} "Deïnstalleer niet" LangString dontUninstallDowngrade ${LANG_DUTCH} "Deïnstalleer niet (Downgraden zonder deïnstalleren is uitgeschakeld voor deze installer)" -LangString failedToKillApp ${LANG_DUTCH} "Het is niet gelukt ${PRODUCTNAME} te stoppen. Sluit het eerst zelf en probeer het dan nog een keer" +LangString failedToKillApp ${LANG_DUTCH} "Het is niet gelukt {{product_name}} te stoppen. Sluit het eerst zelf en probeer het dan nog een keer" LangString installingWebview2 ${LANG_DUTCH} "WebView2 wordt geïnstalleerd..." LangString newerVersionInstalled ${LANG_DUTCH} "Een nieuwere versie van ${PRODUCTNAME} is al geïnstalleerd! Het word niet aangeraden om een oudere versie te installeren. Als u echt deze oudere versie wilt installeren, kunt u beter de huidige versie eerst deïnstalleren. Kies een van de volgende opties en klik op Volgende om door te gaan." LangString older ${LANG_DUTCH} "oudere" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/English.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/English.nsh index b9abb9883e3b..ad39fe802415 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/English.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/English.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_ENGLISH} "Add/Reinstall components" LangString alreadyInstalled ${LANG_ENGLISH} "Already Installed" LangString alreadyInstalledLong ${LANG_ENGLISH} "${PRODUCTNAME} ${VERSION} is already installed. Select the operation you want to perform and click Next to continue." -LangString appRunning ${LANG_ENGLISH} "${PRODUCTNAME} is running! Please close it first then try again." -LangString appRunningOkKill ${LANG_ENGLISH} "${PRODUCTNAME} is running!$\nClick OK to kill it" +LangString appRunning ${LANG_ENGLISH} "{{product_name}} is running! Please close it first then try again." +LangString appRunningOkKill ${LANG_ENGLISH} "{{product_name}} is running!$\nClick OK to kill it" LangString chooseMaintenanceOption ${LANG_ENGLISH} "Choose the maintenance option to perform." LangString choowHowToInstall ${LANG_ENGLISH} "Choose how you want to install ${PRODUCTNAME}." LangString createDesktop ${LANG_ENGLISH} "Create desktop shortcut" LangString dontUninstall ${LANG_ENGLISH} "Do not uninstall" LangString dontUninstallDowngrade ${LANG_ENGLISH} "Do not uninstall (Downgrading without uninstall is disabled for this installer)" -LangString failedToKillApp ${LANG_ENGLISH} "Failed to kill ${PRODUCTNAME}. Please close it first then try again" +LangString failedToKillApp ${LANG_ENGLISH} "Failed to kill {{product_name}}. Please close it first then try again" LangString installingWebview2 ${LANG_ENGLISH} "Installing WebView2..." LangString newerVersionInstalled ${LANG_ENGLISH} "A newer version of ${PRODUCTNAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it's better to uninstall the current version first. Select the operation you want to perform and click Next to continue." LangString older ${LANG_ENGLISH} "older" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/French.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/French.nsh index 4795a0b8e890..87cacdfeeca8 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/French.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/French.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_FRENCH} "Ajouter/Réinstaller un composant." LangString alreadyInstalled ${LANG_FRENCH} "Déja installé." LangString alreadyInstalledLong ${LANG_FRENCH} "${PRODUCTNAME} ${VERSION} est déja installé. Sélectionnez l'opération que vous souhaitez effectuer, puis cliquez sur Suivant pour continuer." -LangString appRunning ${LANG_FRENCH} "${PRODUCTNAME} est en cours d'exécution. Veuillez fermer l'application avant de réessayer." -LangString appRunningOkKill ${LANG_FRENCH} "${PRODUCTNAME} est en cours d'exécution.$\nCliquez sur OK pour fermer l'application." +LangString appRunning ${LANG_FRENCH} "{{product_name}} est en cours d'exécution. Veuillez fermer l'application avant de réessayer." +LangString appRunningOkKill ${LANG_FRENCH} "{{product_name}} est en cours d'exécution.$\nCliquez sur OK pour fermer l'application." LangString chooseMaintenanceOption ${LANG_FRENCH} "Veuillez choisir l'option de maintenance à effectuer." LangString choowHowToInstall ${LANG_FRENCH} "Veuillez choisir l'emplacement d'installation de ${PRODUCTNAME}." LangString createDesktop ${LANG_FRENCH} "Créer un raccourci sur le bureau." LangString dontUninstall ${LANG_FRENCH} "Ne pas désinstaller" LangString dontUninstallDowngrade ${LANG_FRENCH} "Ne pas désinstaller (revenir à une ancienne version sans désinstallation est désactivé pour cet installateur)" -LangString failedToKillApp ${LANG_FRENCH} "La fermeture de ${PRODUCTNAME} a échoué. Veuillez fermer l'application et réessayer." +LangString failedToKillApp ${LANG_FRENCH} "La fermeture de {{product_name}} a échoué. Veuillez fermer l'application et réessayer." LangString installingWebview2 ${LANG_FRENCH} "Installation de WebView2..." LangString newerVersionInstalled ${LANG_FRENCH} "Une version plus récente de ${PRODUCTNAME} est déja installée. Il n'est pas recommandé d'installer une ancienne version. Si vous souhaitez installer cette ancienne version, il est conseillé de désinstaller la version courante en premier. Veuillez sélectionner l'opération que vous souhaitez effectuer, puis cliquez sur Suivant pour continer." LangString older ${LANG_FRENCH} "ancien" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/German.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/German.nsh index 6247b453c3cd..cc32b734e285 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/German.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/German.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_GERMAN} "Komponenten hinzufügen/neu installieren" LangString alreadyInstalled ${LANG_GERMAN} "Bereits installiert" LangString alreadyInstalledLong ${LANG_GERMAN} "${PRODUCTNAME} ${VERSION} ist bereits installiert. Wählen Sie den gewünschten Vorgang aus und klicken Sie auf Weiter, um fortzufahren." -LangString appRunning ${LANG_GERMAN} "${PRODUCTNAME} wird ausgeführt! Bitte schließen Sie es zuerst und versuchen Sie es dann erneut." -LangString appRunningOkKill ${LANG_GERMAN} "${PRODUCTNAME} läuft! $\nKlicken Sie auf OK, um es zu beenden" +LangString appRunning ${LANG_GERMAN} "{{product_name}} wird ausgeführt! Bitte schließen Sie es zuerst und versuchen Sie es dann erneut." +LangString appRunningOkKill ${LANG_GERMAN} "{{product_name}} läuft! $\nKlicken Sie auf OK, um es zu beenden" LangString chooseMaintenanceOption ${LANG_GERMAN} "Wählen Sie die auszuführende Wartungsoption." LangString choowHowToInstall ${LANG_GERMAN} "Wählen Sie, wie Sie ${PRODUCTNAME} installieren möchten." LangString createDesktop ${LANG_GERMAN} "Desktop-Verknüpfung erstellen" LangString dontUninstall ${LANG_GERMAN} "Nicht deinstallieren" LangString dontUninstallDowngrade ${LANG_GERMAN} "Nicht deinstallieren (Downgrading ohne Deinstallation ist für dieses Installationsprogramm deaktiviert)" -LangString failedToKillApp ${LANG_GERMAN} "Failed to kill ${PRODUCTNAME}. Bitte schließen Sie es zuerst und versuchen Sie es dann erneut" +LangString failedToKillApp ${LANG_GERMAN} "Failed to kill {{product_name}}. Bitte schließen Sie es zuerst und versuchen Sie es dann erneut" LangString installingWebview2 ${LANG_GERMAN} "Installiere WebView2..." LangString newerVersionInstalled ${LANG_GERMAN} "Eine neuere Version von ${PRODUCTNAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wenn Sie diese ältere Version wirklich installieren wollen, ist es besser, die aktuelle Version zuerst zu deinstallieren. Wählen Sie den gewünschten Vorgang aus und klicken Sie auf Weiter, um fortzufahren." LangString älter ${LANG_GERMAN} "älter" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh index 3da36d733bc7..ed5d783e9f52 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_HEBREW} "הוסף או התקן מחדש" LangString alreadyInstalled ${LANG_HEBREW} "כבר מותקן" LangString alreadyInstalledLong ${LANG_HEBREW} "${PRODUCTNAME} ${VERSION} כבר מותקן. בחר את הפעולה שברצונך לבצע ולחץ על הבא כדי להמשיך." -LangString appRunning ${LANG_HEBREW} "${PRODUCTNAME} פועל! נא לסגור אותו ולנסות שוב." -LangString appRunningOkKill ${LANG_HEBREW} "${PRODUCTNAME} פועל!$\nלחץ אישור כדי לסגור אותו." +LangString appRunning ${LANG_HEBREW} "{{product_name}} פועל! נא לסגור אותו ולנסות שוב." +LangString appRunningOkKill ${LANG_HEBREW} "{{product_name}} פועל!$\nלחץ אישור כדי לסגור אותו." LangString chooseMaintenanceOption ${LANG_HEBREW} "בחר את פעולת התחזוקה לביצוע" LangString choowHowToInstall ${LANG_HEBREW} "בחר איך תרצה להתקין את ${PRODUCTNAME}." LangString createDesktop ${LANG_HEBREW} "צור קיצור דרך בשולחן העבודה" LangString dontUninstall ${LANG_HEBREW} "אל תסיר" LangString dontUninstallDowngrade ${LANG_HEBREW} "אל תסיר (התקנת גרסה ישנה ללא הסרת הגרסה הנוכחית מושעית עבור התקנה זו)" -LangString failedToKillApp ${LANG_HEBREW} "עצירת ${PRODUCTNAME} נכשלה. נא לסגור את היישום ולנסות שוב." +LangString failedToKillApp ${LANG_HEBREW} "עצירת {{product_name}} נכשלה. נא לסגור את היישום ולנסות שוב." LangString installingWebview2 ${LANG_HEBREW} "מתקין את WebView2..." LangString newerVersionInstalled ${LANG_HEBREW} "גרסה חדשה יותר של ${PRODUCTNAME} כבר מותקנת! לא מומלץ להתקין גרסה ישנה. אם בכל זאת תרצה להתקין את הגרסה הזו, מומלץ קודם להסיר את הגרסה הנוכחית. בחר את הפעולה שברצונך לבצע ולחץ הבא להמשך." LangString older ${LANG_HEBREW} "ישנה" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Italian.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Italian.nsh index 121fcc2ee813..bca96544da58 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Italian.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Italian.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_ITALIAN} "Aggiungi/Reinstalla componenti" LangString alreadyInstalled ${LANG_ITALIAN} "Già installato" LangString alreadyInstalledLong ${LANG_ITALIAN} "${PRODUCTNAME} ${VERSION} è già installato. Seleziona l'operazione che vuoi eseguire e clicca Avanti per continuare." -LangString appRunning ${LANG_ITALIAN} "${PRODUCTNAME} è in esecuzione! Chiudi e poi riprova." -LangString appRunningOkKill ${LANG_ITALIAN} "${PRODUCTNAME} è in esecuzione!$\nSeleziona OK per chiuderlo" +LangString appRunning ${LANG_ITALIAN} "{{product_name}} è in esecuzione! Chiudi e poi riprova." +LangString appRunningOkKill ${LANG_ITALIAN} "{{product_name}} è in esecuzione!$\nSeleziona OK per chiuderlo" LangString chooseMaintenanceOption ${LANG_ITALIAN} "Seleziona l'operazione di manutenzione da eseguire." LangString choowHowToInstall ${LANG_ITALIAN} "Seleziona come vuoi installare ${PRODUCTNAME}." LangString createDesktop ${LANG_ITALIAN} "Crea scorciatoia sul Desktop" LangString dontUninstall ${LANG_ITALIAN} "Non disinstallare" LangString dontUninstallDowngrade ${LANG_ITALIAN} "Non disinstallare (Il downgrade senza la disinstallazione è disabilitato per questo installer)" -LangString failedToKillApp ${LANG_ITALIAN} "Impossibile chiudere ${PRODUCTNAME}. Chiudi e poi riprova" +LangString failedToKillApp ${LANG_ITALIAN} "Impossibile chiudere {{product_name}}. Chiudi e poi riprova" LangString installingWebview2 ${LANG_ITALIAN} "Installando WebView2..." LangString newerVersionInstalled ${LANG_ITALIAN} "Una versione più recente di ${PRODUCTNAME} è già installata! Non è consigliato installare una versione più vecchia. Se vuoi comunque procedere, è meglio prima disinstallare la versione corrente. Seleziona l'operazione che vuoi eseguire e clicca Avanti per continuare." LangString older ${LANG_ITALIAN} "più vecchia" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Japanese.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Japanese.nsh index e404fb591c48..70a4a25cf2a9 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Japanese.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Japanese.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_JAPANESE} "コンポーネントの追加・再インストール" LangString alreadyInstalled ${LANG_JAPANESE} "既にインストールされています" LangString alreadyInstalledLong ${LANG_JAPANESE} "${PRODUCTNAME} ${VERSION} は既にインストールされています。実行したい操作を選択し、「次へ」をクリックして続行します。" -LangString appRunning ${LANG_JAPANESE} "${PRODUCTNAME} は動作中です。動作中のプログラムを終了し、もう一度やり直してください。" -LangString appRunningOkKill ${LANG_JAPANESE} "${PRODUCTNAME} は動作中です。$\n「OK」を押すと動作中のプログラムを終了します。" +LangString appRunning ${LANG_JAPANESE} "{{product_name}} は動作中です。動作中のプログラムを終了し、もう一度やり直してください。" +LangString appRunningOkKill ${LANG_JAPANESE} "{{product_name}} は動作中です。$\n「OK」を押すと動作中のプログラムを終了します。" LangString chooseMaintenanceOption ${LANG_JAPANESE} "メンテナンスオプションを選択して実行します。" LangString choowHowToInstall ${LANG_JAPANESE} "${PRODUCTNAME} のインストール方法を選択してください。" LangString createDesktop ${LANG_JAPANESE} "デスクトップショートカットを作成する" LangString dontUninstall ${LANG_JAPANESE} "アンインストールしない" LangString dontUninstallDowngrade ${LANG_JAPANESE} "アンインストールしない (このインストーラーでは、アンインストールをせずにダウングレードすることはできません)" -LangString failedToKillApp ${LANG_JAPANESE} "${PRODUCTNAME} の終了に失敗しました。動作中のプログラムを終了し、もう一度やり直してください。" +LangString failedToKillApp ${LANG_JAPANESE} "{{product_name}} の終了に失敗しました。動作中のプログラムを終了し、もう一度やり直してください。" LangString installingWebview2 ${LANG_JAPANESE} "WebView2 をインストール中です..." LangString newerVersionInstalled ${LANG_JAPANESE} "既に新しいバージョンの ${PRODUCTNAME} がインストールされています。古いバージョンをインストールすることは推奨されません。どうしてもこの旧バージョンをインストールしたい場合は、先に現行バージョンをアンインストールしておく方がよいでしょう。実行したい操作を選択し、「次へ」をクリックして続行します。" LangString older ${LANG_JAPANESE} "旧" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Korean.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Korean.nsh index 401e0891b06b..fb6dff503c89 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Korean.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Korean.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_KOREAN} "컴포넌트 추가 및 재설치" LangString alreadyInstalled ${LANG_KOREAN} "이미 설치되어 있습니다" LangString alreadyInstalledLong ${LANG_KOREAN} "${PRODUCTNAME} ${VERSION}이(가) 이미 설치되어 있습니다. 수행하고자 하는 작업을 선택하고 '다음'을 클릭하여 계속합니다." -LangString appRunning ${LANG_KOREAN} "${PRODUCTNAME}이(가) 실행 중입니다! 먼저 닫은 후 다시 시도하세요." -LangString appRunningOkKill ${LANG_KOREAN} "${PRODUCTNAME}이(가) 실행 중입니다!$\n'OK'를 누르면 실행 중인 프로그램을 종료합니다." +LangString appRunning ${LANG_KOREAN} "{{product_name}}이(가) 실행 중입니다! 먼저 닫은 후 다시 시도하세요." +LangString appRunningOkKill ${LANG_KOREAN} "{{product_name}}이(가) 실행 중입니다!$\n'OK'를 누르면 실행 중인 프로그램을 종료합니다." LangString chooseMaintenanceOption ${LANG_KOREAN} "수행하려는 관리 옵션을 선택합니다." LangString choowHowToInstall ${LANG_KOREAN} "${PRODUCTNAME}의 설치 방법을 선택하세요.." LangString createDesktop ${LANG_KOREAN} "바탕화면 바로가기 만들기" LangString dontUninstall ${LANG_KOREAN} "제거하지 않기" LangString dontUninstallDowngrade ${LANG_KOREAN} "제거하지 않기 (이 설치 프로그램에서는 제거하지 않고 다운그레이드할 수 없습니다.)" -LangString failedToKillApp ${LANG_KOREAN} "${PRODUCTNAME}을(를) 종료하지 못했습니다. 먼저 닫은 후 다시 시도하세요." +LangString failedToKillApp ${LANG_KOREAN} "{{product_name}}을(를) 종료하지 못했습니다. 먼저 닫은 후 다시 시도하세요." LangString installingWebview2 ${LANG_KOREAN} "WebView2를 설치하는 중입니다..." LangString newerVersionInstalled ${LANG_KOREAN} "${PRODUCTNAME}의 최신 버전이 이미 설치되어 있습니다! 이전 버전을 설치하지 않는 것이 좋습니다. 이 이전 버전을 꼭 설치하려면 먼저 현재 버전을 제거하는 것이 좋습니다. 수행하려는 작업을 선택하고 '다음'을 클릭하여 계속합니다." LangString older ${LANG_KOREAN} "구" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Persian.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Persian.nsh index 5e509f9016f9..56f8d435c5d5 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Persian.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Persian.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_PERSIAN} "اضافه کردن/نصب مجدد کامپونتت" LangString alreadyInstalled ${LANG_PERSIAN} "قبلا نصب شده است" LangString alreadyInstalledLong ${LANG_PERSIAN} "${PRODUCTNAME} ${VERSION} قبلا نصب شده است. عملیات مدنظر را انتخاب کنید و بروی بعدی کلیک کنید." -LangString appRunning ${LANG_PERSIAN} "${PRODUCTNAME} در حال اجر می باشد ! لطفا اول الان را ببندید و دوباره تلاش کنید" -LangString appRunningOkKill ${LANG_PERSIAN} "${PRODUCTNAME} در حال اجرا می باشد!$\nبرای از بین بردن اوکی را انتخاب کنید" +LangString appRunning ${LANG_PERSIAN} "{{product_name}} در حال اجر می باشد ! لطفا اول الان را ببندید و دوباره تلاش کنید" +LangString appRunningOkKill ${LANG_PERSIAN} "{{product_name}} در حال اجرا می باشد!$\nبرای از بین بردن اوکی را انتخاب کنید" LangString chooseMaintenanceOption ${LANG_PERSIAN} "عملیات نگهداری مدنظر را برای اجرا انتخاب کنید" LangString choowHowToInstall ${LANG_PERSIAN} "نحوه نصب ${PRODUCTNAME} را انتخاب کنید" LangString createDesktop ${LANG_PERSIAN} "ایجاد میانبر دسکتاپ" LangString dontUninstall ${LANG_PERSIAN} "حذف نکنید" LangString dontUninstallDowngrade ${LANG_PERSIAN} "حذف نکنید (تنزل ورژن بدون حذف برای نصب کننده غیرفعال است)" -LangString failedToKillApp ${LANG_PERSIAN} "${PRODUCTNAME} قابل کشته شدن نیست. اول آن را ببندید و دوباره تلاش کنید" +LangString failedToKillApp ${LANG_PERSIAN} "{{product_name}} قابل کشته شدن نیست. اول آن را ببندید و دوباره تلاش کنید" LangString installingWebview2 ${LANG_PERSIAN} "در حال نصب WebView2 ..." LangString newerVersionInstalled ${LANG_PERSIAN} "ورژن جدید ${PRODUCTNAME} قبلا نصب شده است! نصب ورژن قدیمی تر به هیچ عنوان پیشنهاد نمی شود. اگر از این بابت اطمینان دارید , بهتر است ورژن فعلی را حذف کنید. عملیات مدنظر را انتخاب کنید و بروی بعدی کلیک کنید." LangString older ${LANG_PERSIAN} "قدیمی تر" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Portuguese.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Portuguese.nsh index 59ff992dec8c..2096bbafc892 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Portuguese.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Portuguese.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_PORTUGUESE} "Adicionar/Reinstalar componentes" LangString alreadyInstalled ${LANG_PORTUGUESE} "Já instalado" LangString alreadyInstalledLong ${LANG_PORTUGUESE} "${PRODUCTNAME} ${VERSION} já está instalado. Selecione a operação que deseja realizar e clique em Seguinte para continuar." -LangString appRunning ${LANG_PORTUGUESE} "${PRODUCTNAME} está em execução! Por favor, feche-o primeiro e tente novamente." -LangString appRunningOkKill ${LANG_PORTUGUESE} "${PRODUCTNAME} está em execução!$\nClique em OK para encerrá-lo." +LangString appRunning ${LANG_PORTUGUESE} "{{product_name}} está em execução! Por favor, feche-o primeiro e tente novamente." +LangString appRunningOkKill ${LANG_PORTUGUESE} "{{product_name}} está em execução!$\nClique em OK para encerrá-lo." LangString chooseMaintenanceOption ${LANG_PORTUGUESE} "Escolha a opção de manutenção a realizar." LangString choowHowToInstall ${LANG_PORTUGUESE} "Escolha como deseja instalar o ${PRODUCTNAME}." LangString createDesktop ${LANG_PORTUGUESE} "Criar atalho no ambiente de trabalho" LangString dontUninstall ${LANG_PORTUGUESE} "Não desinstalar" LangString dontUninstallDowngrade ${LANG_PORTUGUESE} "Não desinstalar (Instalar uma versão anterior sem desinstalar está desativado neste instalador)" -LangString failedToKillApp ${LANG_PORTUGUESE} "Falha ao encerrar ${PRODUCTNAME}. Por favor, feche-o primeiro e tente novamente." +LangString failedToKillApp ${LANG_PORTUGUESE} "Falha ao encerrar {{product_name}}. Por favor, feche-o primeiro e tente novamente." LangString installingWebview2 ${LANG_PORTUGUESE} "A instalar WebView2..." LangString newerVersionInstalled ${LANG_PORTUGUESE} "Uma versão mais recente do ${PRODUCTNAME} já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão mais antiga, é melhor desinstalar a versão atual primeiro. Selecione a operação que deseja realizar e clique em Seguinte para continuar." LangString older ${LANG_PORTUGUESE} "mais antiga" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/PortugueseBR.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/PortugueseBR.nsh index 3a9f87420196..523ed172d49f 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/PortugueseBR.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/PortugueseBR.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_PORTUGUESEBR} "Adicionar/Reinstalar componentes" LangString alreadyInstalled ${LANG_PORTUGUESEBR} "Já instalado" LangString alreadyInstalledLong ${LANG_PORTUGUESEBR} "${PRODUCTNAME} ${VERSION} já está instalado. Selecione a operação que deseja realizar e clique Próximo para continuar." -LangString appRunning ${LANG_PORTUGUESEBR} "${PRODUCTNAME} está aberto! Por favor feche a janela dele e tente novamente." -LangString appRunningOkKill ${LANG_PORTUGUESEBR} "${PRODUCTNAME} está aberto!$\nClique OK para fechar ele." +LangString appRunning ${LANG_PORTUGUESEBR} "{{product_name}} está aberto! Por favor feche a janela dele e tente novamente." +LangString appRunningOkKill ${LANG_PORTUGUESEBR} "{{product_name}} está aberto!$\nClique OK para fechar ele." LangString chooseMaintenanceOption ${LANG_PORTUGUESEBR} "Escolha a opção de manutenção a realizar." LangString choowHowToInstall ${LANG_PORTUGUESEBR} "Escolha como deseja instalar ${PRODUCTNAME}." LangString createDesktop ${LANG_PORTUGUESEBR} "Criar atalho na área de trabalho" LangString dontUninstall ${LANG_PORTUGUESEBR} "Não desinstalar" LangString dontUninstallDowngrade ${LANG_PORTUGUESEBR} "Não desinstalar (Instalar versão anterior sem desinstalar está desabilitado nesse instalador)" -LangString failedToKillApp ${LANG_PORTUGUESEBR} "Falha ao fechar ${PRODUCTNAME}. Por favor feche a janela dele primeiro e tente novamente" +LangString failedToKillApp ${LANG_PORTUGUESEBR} "Falha ao fechar {{product_name}}. Por favor feche a janela dele primeiro e tente novamente" LangString installingWebview2 ${LANG_PORTUGUESEBR} "Instalando WebView2..." LangString newerVersionInstalled ${LANG_PORTUGUESEBR} "Uma nova versão do ${PRODUCTNAME} já está instalado! Não é recomendado instalar uma versão anterior. Se realmente deseja instalar essa versão antiga, é recomendado desinstalar a versão atual primeirl. Selecione a operação que deseja executare clique Próximo para continuar." LangString older ${LANG_PORTUGUESEBR} "mais antiga" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Russian.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Russian.nsh index d35716804e42..4bf0455d71a5 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Russian.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Russian.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_RUSSIAN} "Добавить/Переустановить компоненты" LangString alreadyInstalled ${LANG_RUSSIAN} "Уже установлено" LangString alreadyInstalledLong ${LANG_RUSSIAN} "${PRODUCTNAME} ${VERSION} уже установлен. Выберите действие, которое вы хотите выполнить и нажмите Далее для продолжения." -LangString appRunning ${LANG_RUSSIAN} "${PRODUCTNAME} запущен! Пожалуйста, закройте приложение и попробуйте еще раз." -LangString appRunningOkKill ${LANG_RUSSIAN} "${PRODUCTNAME} запущен!$\nНажмите OK чтобы закрыть приложение" +LangString appRunning ${LANG_RUSSIAN} "{{product_name}} запущен! Пожалуйста, закройте приложение и попробуйте еще раз." +LangString appRunningOkKill ${LANG_RUSSIAN} "{{product_name}} запущен!$\nНажмите OK чтобы закрыть приложение" LangString chooseMaintenanceOption ${LANG_RUSSIAN} "Выберите действие, которое вы хотите выполнить." LangString choowHowToInstall ${LANG_RUSSIAN} "Выберите, как вы хотите установить ${PRODUCTNAME}." LangString createDesktop ${LANG_RUSSIAN} "Добавить ярлык на рабочий стол" LangString dontUninstall ${LANG_RUSSIAN} "Не удалять" LangString dontUninstallDowngrade ${LANG_RUSSIAN} "Не удалять (Установка более ранних версий без удаления невозможна)" -LangString failedToKillApp ${LANG_RUSSIAN} "Не удалось закрыть ${PRODUCTNAME}. Пожалуйста, закройте приложение и попробуйте еще раз" +LangString failedToKillApp ${LANG_RUSSIAN} "Не удалось закрыть {{product_name}}. Пожалуйста, закройте приложение и попробуйте еще раз" LangString installingWebview2 ${LANG_RUSSIAN} "Установка WebView2..." LangString newerVersionInstalled ${LANG_RUSSIAN} "Более новая версия ${PRODUCTNAME} уже установлена! Не рекомендуется устанавливать более раннюю версию. Если вы действительно хотите установить эту версию, рекомендуется сначала удалить текущую. Выберите действие, которое вы хотите выполнить и нажмите Далее для продолжения." LangString older ${LANG_RUSSIAN} "Более ранняя" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/SimpChinese.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/SimpChinese.nsh index 47c1f213269d..c71909a352ae 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/SimpChinese.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/SimpChinese.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_SIMPCHINESE} "添加/重新安装组件" LangString alreadyInstalled ${LANG_SIMPCHINESE} "已安装" LangString alreadyInstalledLong ${LANG_SIMPCHINESE} "${PRODUCTNAME} ${VERSION} 已经安装了。选择你想要执行的操作后点击下一步以继续。" -LangString appRunning ${LANG_SIMPCHINESE} "${PRODUCTNAME} 正在运行！请关闭后再试。" -LangString appRunningOkKill ${LANG_SIMPCHINESE} "${PRODUCTNAME} 正在运行！$\n点击确定以终止运行。" +LangString appRunning ${LANG_SIMPCHINESE} "{{product_name}} 正在运行！请关闭后再试。" +LangString appRunningOkKill ${LANG_SIMPCHINESE} "{{product_name}} 正在运行！$\n点击确定以终止运行。" LangString chooseMaintenanceOption ${LANG_SIMPCHINESE} "选择要执行的维护操作。" LangString choowHowToInstall ${LANG_SIMPCHINESE} "选择你想要安装 ${PRODUCTNAME} 的方式。" LangString createDesktop ${LANG_SIMPCHINESE} "创建桌面快捷方式" LangString dontUninstall ${LANG_SIMPCHINESE} "请勿卸载" LangString dontUninstallDowngrade ${LANG_SIMPCHINESE} "请勿卸载（此安装程序禁止未卸载就进行版本降级的操作）" -LangString failedToKillApp ${LANG_SIMPCHINESE} "无法终止 ${PRODUCTNAME}。请关闭后再试。" +LangString failedToKillApp ${LANG_SIMPCHINESE} "无法终止 {{product_name}}。请关闭后再试。" LangString installingWebview2 ${LANG_SIMPCHINESE} "正在安装 WebView2..." LangString newerVersionInstalled ${LANG_SIMPCHINESE} "有一个更新版本的 ${PRODUCTNAME} 已经安装了！不推荐你安装旧的版本。如果你真的想要安装这个旧的版本，推荐先卸载当前版本。选择你想要执行的操作后点击下一步以继续。" LangString older ${LANG_SIMPCHINESE} "旧的" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Spanish.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Spanish.nsh index a676fbc705b3..efec9cfb4829 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Spanish.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Spanish.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_SPANISH} "Añadir o reinstalar componentes" LangString alreadyInstalled ${LANG_SPANISH} "Ya está instalado" LangString alreadyInstalledLong ${LANG_SPANISH} "${PRODUCTNAME} ${VERSION} ya está instalado. Seleccione la operación que desee realizar y pulse Siguiente para continuar." -LangString appRunning ${LANG_SPANISH} "¡${PRODUCTNAME} está abierto! Por favor ciérrelo e intente de nuevo." -LangString appRunningOkKill ${LANG_SPANISH} "¡${PRODUCTNAME} está abierto!$\nPulse Aceptar para cerrarlo." +LangString appRunning ${LANG_SPANISH} "¡{{product_name}} está abierto! Por favor ciérrelo e intente de nuevo." +LangString appRunningOkKill ${LANG_SPANISH} "¡{{product_name}} está abierto!$\nPulse Aceptar para cerrarlo." LangString chooseMaintenanceOption ${LANG_SPANISH} "Elija la operación de mantenimiento que desee realizar." LangString choowHowToInstall ${LANG_SPANISH} "Elija cómo desea instalar ${PRODUCTNAME}." LangString createDesktop ${LANG_SPANISH} "Crear acceso directo en el escritorio" LangString dontUninstall ${LANG_SPANISH} "No desinstalar" LangString dontUninstallDowngrade ${LANG_SPANISH} "No desinstalar (Disminuir la versión sin desinstalar está deshabilitado para este instalador)" -LangString failedToKillApp ${LANG_SPANISH} "No se ha podido cerrar ${PRODUCTNAME}. Por favor ciérrelo e intente de nuevo." +LangString failedToKillApp ${LANG_SPANISH} "No se ha podido cerrar {{product_name}}. Por favor ciérrelo e intente de nuevo." LangString installingWebview2 ${LANG_SPANISH} "Instalando WebView2..." LangString newerVersionInstalled ${LANG_SPANISH} "Ya está instalada una versión más reciente de ${PRODUCTNAME}. No se recomienda que instale una versión anterior. Si realmente desea instalar esta versión anterior, es recomendable desinstalar la versión actual antes de continuar. Seleccione la operación que desee realizar y pulse Siguiente para continuar." LangString older ${LANG_SPANISH} "anterior" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/SpanishInternational.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/SpanishInternational.nsh index 0fe9d606c159..8771ddeb1892 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/SpanishInternational.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/SpanishInternational.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_SPANISHINTERNATIONAL} "Añadir o reinstalar componentes" LangString alreadyInstalled ${LANG_SPANISHINTERNATIONAL} "Ya está instalado" LangString alreadyInstalledLong ${LANG_SPANISHINTERNATIONAL} "${PRODUCTNAME} ${VERSION} ya está instalado. Seleccione la operación que desee realizar y pulse Siguiente para continuar." -LangString appRunning ${LANG_SPANISHINTERNATIONAL} "¡${PRODUCTNAME} está abierto! Por favor ciérrelo e intente de nuevo." -LangString appRunningOkKill ${LANG_SPANISHINTERNATIONAL} "¡${PRODUCTNAME} está abierto!$\nPulse Aceptar para cerrarlo." +LangString appRunning ${LANG_SPANISHINTERNATIONAL} "¡{{product_name}} está abierto! Por favor ciérrelo e intente de nuevo." +LangString appRunningOkKill ${LANG_SPANISHINTERNATIONAL} "¡{{product_name}} está abierto!$\nPulse Aceptar para cerrarlo." LangString chooseMaintenanceOption ${LANG_SPANISHINTERNATIONAL} "Elija la operación de mantenimiento que desee realizar." LangString choowHowToInstall ${LANG_SPANISHINTERNATIONAL} "Elija cómo desea instalar ${PRODUCTNAME}." LangString createDesktop ${LANG_SPANISHINTERNATIONAL} "Crear acceso directo en el escritorio" LangString dontUninstall ${LANG_SPANISHINTERNATIONAL} "No desinstalar" LangString dontUninstallDowngrade ${LANG_SPANISHINTERNATIONAL} "No desinstalar (Disminuir la versión sin desinstalar está deshabilitado para este instalador)" -LangString failedToKillApp ${LANG_SPANISHINTERNATIONAL} "No se ha podido cerrar ${PRODUCTNAME}. Por favor ciérrelo e intente de nuevo." +LangString failedToKillApp ${LANG_SPANISHINTERNATIONAL} "No se ha podido cerrar {{product_name}}. Por favor ciérrelo e intente de nuevo." LangString installingWebview2 ${LANG_SPANISHINTERNATIONAL} "Instalando WebView2..." LangString newerVersionInstalled ${LANG_SPANISHINTERNATIONAL} "Ya está instalada una versión más reciente de ${PRODUCTNAME}. No se recomienda que instale una versión anterior. Si realmente desea instalar esta versión anterior, es recomendable desinstalar la versión actual antes de continuar. Seleccione la operación que desee realizar y pulse Siguiente para continuar." LangString older ${LANG_SPANISHINTERNATIONAL} "anterior" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Swedish.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Swedish.nsh index f1c4ecec7c47..0d1a44a2e9d9 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Swedish.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Swedish.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_SWEDISH} "Lägg till/Installera om komponenter" LangString alreadyInstalled ${LANG_SWEDISH}} "Redan installerad" LangString alreadyInstalledLong ${LANG_SWEDISH}} "${PRODUCTNAME} ${VERSION} är redan installerad. Välj åtgärd och klicka på Nästa för att fortsätta." -LangString appRunning ${LANG_SWEDISH} "${PRODUCTNAME} körs! Stäng det först och försök igen." -LangString appRunningOkKill ${LANG_SWEDISH} "${PRODUCTNAME} körs!$\nKlicka på OK för att avsluta det." +LangString appRunning ${LANG_SWEDISH} "{{product_name}} körs! Stäng det först och försök igen." +LangString appRunningOkKill ${LANG_SWEDISH} "{{product_name}} körs!$\nKlicka på OK för att avsluta det." LangString chooseMaintenanceOption ${LANG_SWEDISH} "Välj underhållsåtgärd." LangString choowHowToInstall ${LANG_SWEDISH} "Välj hur du vill installera ${PRODUCTNAME}." LangString createDesktop ${LANG_SWEDISH} "Skapa genväg på skrivbordet" LangString dontUninstall ${LANG_SWEDISH} "Avinstallera inte" LangString dontUninstallDowngrade ${LANG_SWEDISH} "Avinstallera inte (nedgradering utan avinstallation är inaktiverad för den här installationsprogrammet)" -LangString failedToKillApp ${LANG_SWEDISH} "Kunde inte avsluta ${PRODUCTNAME}. Stäng det först och försök igen." +LangString failedToKillApp ${LANG_SWEDISH} "Kunde inte avsluta {{product_name}}. Stäng det först och försök igen." LangString installingWebview2 ${LANG_SWEDISH} "Installerar WebView2..." LangString newerVersionInstalled ${LANG_SWEDISH} "En nyare version av ${PRODUCTNAME} är redan installerad! Det rekommenderas inte att installera en äldre version. Om du verkligen vill installera denna äldre version är det bättre att avinstallera den nuvarande versionen först. Välj åtgärd och klicka på Nästa för att fortsätta." LangString older ${LANG_SWEDISH} "äldre" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/TradChinese.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/TradChinese.nsh index c80c3cd30629..63f1dcd4bb7c 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/TradChinese.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/TradChinese.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_TRADCHINESE} "增加或重新安裝元件" LangString alreadyInstalled ${LANG_TRADCHINESE} "已安裝" LangString alreadyInstalledLong ${LANG_TRADCHINESE} "${PRODUCTNAME} ${VERSION} 已經安裝了。選擇你想要進行的操作並且點選下一步。" -LangString appRunning ${LANG_TRADCHINESE} "${PRODUCTNAME} 正在執行中！請先關閉再進行嘗試。" -LangString appRunningOkKill ${LANG_TRADCHINESE} "${PRODUCTNAME} 正在執行中！點選確定後終止。" +LangString appRunning ${LANG_TRADCHINESE} "{{product_name}} 正在執行中！請先關閉再進行嘗試。" +LangString appRunningOkKill ${LANG_TRADCHINESE} "{{product_name}} 正在執行中！點選確定後終止。" LangString chooseMaintenanceOption ${LANG_TRADCHINESE} "請選擇你要進行的維護選項。" LangString choowHowToInstall ${LANG_TRADCHINESE} "選擇你要如何安裝 ${PRODUCTNAME}。" LangString createDesktop ${LANG_TRADCHINESE} "建立桌面捷徑" LangString dontUninstall ${LANG_TRADCHINESE} "請勿解除安裝" LangString dontUninstallDowngrade ${LANG_TRADCHINESE} "請勿解除安裝（本安裝程式不允許未解除安裝就進行版本降低的操作）" -LangString failedToKillApp ${LANG_TRADCHINESE} "無法終止 ${PRODUCTNAME}。請先關閉再進行嘗試。" +LangString failedToKillApp ${LANG_TRADCHINESE} "無法終止 {{product_name}}。請先關閉再進行嘗試。" LangString installingWebview2 ${LANG_TRADCHINESE} "WebView2 安裝中..." LangString newerVersionInstalled ${LANG_TRADCHINESE} "已安裝更新版本的 ${PRODUCTNAME}！不建議安裝舊版。如果真的想要安裝舊版的話，最好先解除安裝現在的版本。選擇你想要進行的操作後再進行下一步。" LangString older ${LANG_TRADCHINESE} "舊版" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Turkish.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Turkish.nsh index c47665de58ea..a2d1162e6e81 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Turkish.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Turkish.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_TURKISH} "Bileşen Ekle/Yeniden Yükle" LangString alreadyInstalled ${LANG_TURKISH} "Daha Önceden Yüklenmiş" LangString alreadyInstalledLong ${LANG_TURKISH} "${PRODUCTNAME} ${VERSION} daha önceden yüklenmiş. Gerçekleştirmek istediğiniz işlemi seçin ve devam etmek için İleri'ye tıklayın." -LangString appRunning ${LANG_TURKISH} "${PRODUCTNAME} çalışır durumda! Lütfen önce uygulamayı kapatın ve sonra tekrar deneyin." -LangString appRunningOkKill ${LANG_TURKISH} "${PRODUCTNAME} çalışır durumda!$\nUygulamayı sonlandırmak için Tamam'a tıklayın." +LangString appRunning ${LANG_TURKISH} "{{product_name}} çalışır durumda! Lütfen önce uygulamayı kapatın ve sonra tekrar deneyin." +LangString appRunningOkKill ${LANG_TURKISH} "{{product_name}} çalışır durumda!$\nUygulamayı sonlandırmak için Tamam'a tıklayın." LangString chooseMaintenanceOption ${LANG_TURKISH} "Gerçekleştirmek istediğiniz bakım seçeneğini belirleyin." LangString choowHowToInstall ${LANG_TURKISH} "${PRODUCTNAME} uygulamasını nasıl yüklemek istediğinizi seçin." LangString createDesktop ${LANG_TURKISH} "Masaüstü kısayolu oluştur" LangString dontUninstall ${LANG_TURKISH} "Kaldırma işlemini gerçekleştirme" LangString dontUninstallDowngrade ${LANG_TURKISH} "Kaldırma işlemini gerçekleştirme (Kaldırma işlemi yapmadan sürüm düşürme bu yükleyici için devre dışı bırakılmıştır)" -LangString failedToKillApp ${LANG_TURKISH} "${PRODUCTNAME} sonlandırılamadı. Lütfen önce kapatın sonra tekrar deneyin." +LangString failedToKillApp ${LANG_TURKISH} "{{product_name}} sonlandırılamadı. Lütfen önce kapatın sonra tekrar deneyin." LangString installingWebview2 ${LANG_TURKISH} "WebView2 yükleniyor..." LangString newerVersionInstalled ${LANG_TURKISH} "${PRODUCTNAME} uygulamasının daha yeni bir sürümü zaten yüklü! Daha eski bir sürümü yüklemeniz önerilmez. Bu eski sürümü gerçekten yüklemek istiyorsanız, önce mevcut sürümü kaldırmanız daha uygundur. Gerçekleştirmek istediğiniz işlemi seçin ve devam etmek için İleri'ye tıklayın." LangString older ${LANG_TURKISH} "daha eski" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Ukrainian.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Ukrainian.nsh index d0792515bcb2..f4ea265058c4 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Ukrainian.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Ukrainian.nsh @@ -1,14 +1,14 @@ LangString addOrReinstall ${LANG_UKRAINIAN} "Додати/Перевстановити компоненти" LangString alreadyInstalled ${LANG_UKRAINIAN} "Вже встановлено" LangString alreadyInstalledLong ${LANG_UKRAINIAN} "${PRODUCTNAME} ${VERSION} вже встановлено. Виберіть дію, яку ви хочете виконати, і натисніть Далі, щоб продовжити." -LangString appRunning ${LANG_UKRAINIAN} "${PRODUCTNAME} запущено! Будь ласка, спочатку закрийте його, а потім спробуйте ще раз." -LangString appRunningOkKill ${LANG_UKRAINIAN} "${PRODUCTNAME} запущено!$\nНатисніть ОК, щоб примусово закрити його" +LangString appRunning ${LANG_UKRAINIAN} "{{product_name}} запущено! Будь ласка, спочатку закрийте його, а потім спробуйте ще раз." +LangString appRunningOkKill ${LANG_UKRAINIAN} "{{product_name}} запущено!$\nНатисніть ОК, щоб примусово закрити його" LangString chooseMaintenanceOption ${LANG_UKRAINIAN} "Виберіть дію, яку треба виконати." LangString choowHowToInstall ${LANG_UKRAINIAN} "Виберіть, як ви хочете встановити ${PRODUCTNAME}." LangString createDesktop ${LANG_UKRAINIAN} "Створити ярлик на робочому столі" LangString dontUninstall ${LANG_UKRAINIAN} "Не видаляти" LangString dontUninstallDowngrade ${LANG_UKRAINIAN} "Не видаляти (для цього встановлювача вимкнено зниження версії без видалення)" -LangString failedToKillApp ${LANG_UKRAINIAN} "Не вдалося примусово закрити ${PRODUCTNAME}. Будь ласка, спочатку закрийте його, а потім спробуйте ще раз" +LangString failedToKillApp ${LANG_UKRAINIAN} "Не вдалося примусово закрити {{product_name}}. Будь ласка, спочатку закрийте його, а потім спробуйте ще раз" LangString installingWebview2 ${LANG_UKRAINIAN} "Встановлення WebView2..." LangString newerVersionInstalled ${LANG_UKRAINIAN} "Новіша версія ${PRODUCTNAME} вже встановлена! Встановлювати старішу версію не рекомендується. Якщо ви дійсно хочете встановити цю версію, краще спочатку видаліть поточну. Виберіть дію, яку ви хочете виконати, і натисніть Далі, щоб продовжити." LangString older ${LANG_UKRAINIAN} "старішу" diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs b/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs index 3992f590fd8b..1bec36c4586b 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs +++ b/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs @@ -39,8 +39,8 @@ const NSIS_URL: &str = #[cfg(target_os = "windows")] const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4"; const NSIS_TAURI_UTILS_URL: &str = - "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.4.2/nsis_tauri_utils.dll"; -const NSIS_TAURI_UTILS_SHA1: &str = "6532DA4545864C6EC95F62F27F2199BFD668560B"; + "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.1/nsis_tauri_utils.dll"; +const NSIS_TAURI_UTILS_SHA1: &str = "B053B2E5FDB97257954C8F935D80964F056520AE"; #[cfg(target_os = "windows")] const NSIS_REQUIRED_FILES: &[&str] = &[ diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh index 1040b76f528a..ba838be02cfd 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh @@ -19,43 +19,57 @@ !macroend ; Checks whether app is running or not and prompts to kill it. -!macro CheckIfAppIsRunning +!macro CheckIfAppIsRunning executableName productName + !define UniqueID ${__LINE__} + + ; Replace {{product_name}} placeholder in the messages with the passed product name + nsis_tauri_utils::StrReplace "$(appRunning)" "{{product_name}}" "${productName}" + Pop $R1 + nsis_tauri_utils::StrReplace "$(appRunningOkKill)" "{{product_name}}" "${productName}" + Pop $R2 + nsis_tauri_utils::StrReplace "$(failedToKillApp)" "{{product_name}}" "${productName}" + Pop $R3 + !if "${INSTALLMODE}" == "currentUser" - nsis_tauri_utils::FindProcessCurrentUser "${MAINBINARYNAME}.exe" + nsis_tauri_utils::FindProcessCurrentUser "${executableName}" !else - nsis_tauri_utils::FindProcess "${MAINBINARYNAME}.exe" + nsis_tauri_utils::FindProcess "${executableName}" !endif Pop $R0 ${If} $R0 = 0 - IfSilent kill 0 - ${IfThen} $PassiveMode != 1 ${|} MessageBox MB_OKCANCEL "$(appRunningOkKill)" IDOK kill IDCANCEL cancel ${|} - kill: + IfSilent kill_${UniqueID} 0 + ${IfThen} $PassiveMode != 1 ${|} MessageBox MB_OKCANCEL $R2 IDOK kill_${UniqueID} IDCANCEL cancel_${UniqueID} ${|} + kill_${UniqueID}: !if "${INSTALLMODE}" == "currentUser" - nsis_tauri_utils::KillProcessCurrentUser "${MAINBINARYNAME}.exe" + nsis_tauri_utils::KillProcessCurrentUser "${executableName}" !else - nsis_tauri_utils::KillProcess "${MAINBINARYNAME}.exe" + nsis_tauri_utils::KillProcess "${executableName}" !endif Pop $R0 Sleep 500 ${If} $R0 = 0 - Goto app_check_done + Goto app_check_done_${UniqueID} ${Else} - IfSilent silent ui - silent: + IfSilent silent_${UniqueID} ui_${UniqueID} + silent_${UniqueID}: System::Call 'kernel32::AttachConsole(i -1)i.r0' ${If} $0 != 0 System::Call 'kernel32::GetStdHandle(i -11)i.r0' System::call 'kernel32::SetConsoleTextAttribute(i r0, i 0x0004)' ; set red color - FileWrite $0 "$(appRunning)$\n" + FileWrite $0 "$R1$\n" ${EndIf} Abort - ui: - Abort "$(failedToKillApp)" + ui_${UniqueID}: + Abort $R3 ${EndIf} - cancel: - Abort "$(appRunning)" + cancel_${UniqueID}: + Abort $R1 ${EndIf} - app_check_done: + app_check_done_${UniqueID}: + !undef UniqueID + !undef appRunning_${UniqueID} + !undef appRunningOkKill_${UniqueID} + !undef failedToKillApp_${UniqueID} !macroend ; Sets AppUserModelId on a shortcut