From eb22e0e2948f4477f5a1438cfc8f01f08f94ec8f Mon Sep 17 00:00:00 2001 From: ConfiG <cgytrus@cgyt.ru> Date: Tue, 25 Jun 2024 14:54:17 +0300 Subject: [PATCH] fix windows installer translation files formatting --- installer/windows/Language Files/EnglishExtra.nsh | 4 ++++ installer/windows/Language Files/GreekExtra.nsh | 5 +++-- installer/windows/Language Files/JapaneseExtra.nsh | 1 - installer/windows/Language Files/SpanishExtra.nsh | 4 ++-- installer/windows/Language Files/TurkishExtra.nsh | 6 +----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/installer/windows/Language Files/EnglishExtra.nsh b/installer/windows/Language Files/EnglishExtra.nsh index c27ac771..a9c76284 100644 --- a/installer/windows/Language Files/EnglishExtra.nsh +++ b/installer/windows/Language Files/EnglishExtra.nsh @@ -6,6 +6,10 @@ ; 2. copy the second line from uninstall text to install text and make it say "installation" instead of "uninstallation" ; 3. replace $(^NameDA) in second line with Geometry Dash ; 4. do not translate "(the dll trademark)", since that is replaced with the actual dll text +; Note: please, format translation files the *exact same* way they are formatted in +; other translations. Remove this entire comment block, +; do not translate the "installer" and "uninstaller" comments and +; do not remove the '!pragma ...' and '!insertmacro ...' lines at the top. ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nBefore starting the installation, make sure Geometry Dash is not running.$\r$\n$\r$\n$_CLICK" ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Setup will guide you through the uninstallation of $(^NameDA).$\r$\n$\r$\nBefore starting the uninstallation, make sure Geometry Dash is not running.$\r$\n$\r$\n$_CLICK" diff --git a/installer/windows/Language Files/GreekExtra.nsh b/installer/windows/Language Files/GreekExtra.nsh index 059806c7..81f92cdd 100644 --- a/installer/windows/Language Files/GreekExtra.nsh +++ b/installer/windows/Language Files/GreekExtra.nsh @@ -1,3 +1,6 @@ +!insertmacro LANGFILE_EXT Greek + +!pragma warning disable 6030 ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Το setup θα σας καθοδηγήσει για την εγκατάσταση του $(^NameDA).$\r$\n$\r$\nΠρίν ξεκινήσετε την εγκατάσταση, βεβαιωθήτε ότι το Geometry Dash δεν τρέχει.$\r$\n$\r$\n$_CLICK" ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Το setup θα σας καθοδηγήσει για την απεγκατάσταση του $(^NameDA).$\r$\n$\r$\nΠριν την απεγκατάσταση, βεβαιωθήτε ότι το Geometry Dash δεν τρέχει.$\r$\n$\r$\n$_CLICK" !pragma warning default 6030 @@ -11,5 +14,3 @@ ${LangFileString} GEODE_TEXT_MOD_LOADER_ALREADY_INSTALLED "Αυτό το path έ ; uninstaller ${LangFileString} GEODE_UNTEXT_GEODE_MISSING "Αυτό το path δεν έχει το Geode εγκατεστημένο!" - - diff --git a/installer/windows/Language Files/JapaneseExtra.nsh b/installer/windows/Language Files/JapaneseExtra.nsh index 68c4c47a..2c0f8a24 100644 --- a/installer/windows/Language Files/JapaneseExtra.nsh +++ b/installer/windows/Language Files/JapaneseExtra.nsh @@ -1,7 +1,6 @@ !insertmacro LANGFILE_EXT Japanese !pragma warning disable 6030 - ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "このセットアップは$(^NameDA)のインストールを案内します。$\r$\n$\r$\nインストールを開始する前に、Geometry Dashが実行されていないことを確認してください。$\r$\n$\r$\n$_CLICK" ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "このセットアップは$(^NameDA)のアンインストールを案内します。$\r$\n$\r$\nアンインストールを開始する前に、Geometry Dashが実行されていないことを確認してください。$\r$\n$\r$\n$_CLICK" !pragma warning default 6030 diff --git a/installer/windows/Language Files/SpanishExtra.nsh b/installer/windows/Language Files/SpanishExtra.nsh index 96adc5ae..98e3311f 100644 --- a/installer/windows/Language Files/SpanishExtra.nsh +++ b/installer/windows/Language Files/SpanishExtra.nsh @@ -5,12 +5,12 @@ ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este asistente te guiará durante ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente te guiará durante la desinstalación de $(^NameDA).$\r$\n$\r$\nAntes de comenzar la desinstalación, asegúrate de que Geometry Dash no esté en ejecución.$\r$\n$\r$\n$_CLICK" !pragma warning default 6030 -; instalador +; installer ${LangFileString} GEODE_TEXT_GD_MISSING "$\r$\n$\r$\n¡Geometry Dash no está instalado en esta ruta!" ${LangFileString} GEODE_TEXT_MH_ALREADY_INSTALLED "¡Mega Hack v6/v7 está instalado en esta ruta!$\r$\nGeode no es compatible con MHv6/v7 (MHv8 será compatible con Geode).$\r$\nPor favor, desinstálalo antes de continuar." ${LangFileString} GEODE_TEXT_MOD_LOADER_ALREADY_INSTALLED "¡Hay otro cargador de mods instalado en esta ruta!$\r$\nGeode no funciona con ningún otro cargador de mods.$\r$\nPor favor, desinstálalo antes de continuar. (the dll trademark)" -; desinstalador +; uninstaller ${LangFileString} GEODE_UNTEXT_GEODE_MISSING "¡Geode no está instalado en esta ruta!" diff --git a/installer/windows/Language Files/TurkishExtra.nsh b/installer/windows/Language Files/TurkishExtra.nsh index 13ff9d65..fa7aecc5 100644 --- a/installer/windows/Language Files/TurkishExtra.nsh +++ b/installer/windows/Language Files/TurkishExtra.nsh @@ -1,10 +1,6 @@ !insertmacro LANGFILE_EXT Turkish -!pragma warning disable 6030 ; overwriting default MUI strings on purpose -; to translate these strings: -; 1. copy them from C:\Program Files (x86)\NSIS\Contrib\Language Files\*.nsh -; 2. copy the second line from uninstall text to install text and make it say "installation" instead of "uninstallation" -; 3. replace $(^NameDA) in second line with Geometry Dash +!pragma warning disable 6030 ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Bu sihirbaz size $(^NameDA) kurulumu boyunca rehberlik edecektir.$\r$\n$\r$\nKurulumu başlatmadan önce Geometry Dash'i kapatmanızı öneririz.$\r$\n$\r$\n$_CLICK" ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Bu sihirbaz size $(^NameDA) programının kadırılımı boyunca rehberlik edecektir.$\r$\n$\r$\nKaldırım işlemeni başlatmadan önce Geometry Dash'i kapatmanızı öneririz.$\r$\n$\r$\n$_CLICK" !pragma warning default 6030