From c2d8267547a247b8353b5357ba6510419caebb54 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sun, 7 May 2023 10:28:28 +0200 Subject: [PATCH 1/2] MUI - Add an "Alternative Notepad3Portable Launcher" --- .../Other/Source/Notepad3Portable.cmd | 24 +++++++++++++++++++ .../PortableApps.comInstallerCustom.nsh | 9 +++++++ 2 files changed, 33 insertions(+) create mode 100644 np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.cmd create mode 100644 np3portableapp/Notepad3Portable/Other/Source/PortableApps.comInstallerCustom.nsh diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.cmd b/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.cmd new file mode 100644 index 000000000..d852d06d4 --- /dev/null +++ b/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.cmd @@ -0,0 +1,24 @@ +@echo off + +:: Thanks to "Wilenty" for this "Alternative Notepad3Portable Launcher". + +If not exist "%~dp0\Data\settings\" ( + If exist "%~dp0\App\DefaultData\settings\" ( + mkdir "%~dp0\Data\settings" + copy /y "%~dp0\App\DefaultData\settings" "%~dp0\Data\settings" >nul 2>&1 + For /f "delims=" %%W in (' dir /b /a:d "%~dp0\App\DefaultData\settings" ') do mkdir "%~dp0\Data\settings\%%~nW"&© /y "%~dp0\App\DefaultData\settings\%%~W" "%~dp0\Data\settings\%%~nW" >nul 2>&1 + ) +) + +set ErrorLevel=-1 + +If exist "%~dp0\Data\settings\" ( + set "NOTEPAD3_PORTABLE_SETTINGS=%~dp0\Data\settings" + If exist "%WinDir%\SysNative" ( + start "Notepad3 Portable" /b "%~dp0\App\Notepad3\x64\Notepad3.exe" %* + ) else ( + start "Notepad3 Portable" /b "%~dp0\App\Notepad3\x86\Notepad3.exe" %* + ) +) + +exit /b %ErrorLevel% diff --git a/np3portableapp/Notepad3Portable/Other/Source/PortableApps.comInstallerCustom.nsh b/np3portableapp/Notepad3Portable/Other/Source/PortableApps.comInstallerCustom.nsh new file mode 100644 index 000000000..d2f5c7140 --- /dev/null +++ b/np3portableapp/Notepad3Portable/Other/Source/PortableApps.comInstallerCustom.nsh @@ -0,0 +1,9 @@ +# +# Thanks to "jooseng" for this little macro "Custom_Code_Post_Install". +# +!macro CustomCodePostInstall + ${If} ${FileExists} "$INSTDIR\Other\Source\Notepad3Portable.cmd" + CopyFiles /SILENT "$INSTDIR\Other\Source\Notepad3Portable.cmd" "$INSTDIR\Notepad3Portable.cmd" + ${EndIf} +!macroend + From 8f2aa7ce353fb4b496086d98f298c2507068fbe2 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sun, 7 May 2023 10:29:51 +0200 Subject: [PATCH 2/2] MUI -Add translations for "French" and "Polish" languages. --- language/np3_fr_fr/dialogs_fr_fr.rc | 16 ++++++++-------- language/np3_fr_fr/strings_fr_fr.rc | 2 +- language/np3_pl_pl/dialogs_pl_pl.rc | 24 ++++++++++++------------ language/np3_pl_pl/menu_pl_pl.rc | 4 ++-- language/np3_pl_pl/strings_pl_pl.rc | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 845ef8b63..d587fc01e 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -657,11 +657,11 @@ BEGIN //~ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0 CONTROL IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT - CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, + CONTROL "&Ne plus afficher ce message.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10 - DEFPUSHBUTTON "&Try Again",IDRETRY,186,70,50,14 - PUSHBUTTON "&Cancel", IDCANCEL, 130, 70, 50, 14 - PUSHBUTTON "&Continue",IDCONTINUE,242,70,50,14 + DEFPUSHBUTTON "&Eéessayer",IDRETRY,186,70,50,14 + PUSHBUTTON "&Annule", IDCANCEL, 130, 70, 50, 14 + PUSHBUTTON "&Continuer",IDCONTINUE,242,70,50,14 END IDD_MUI_INFOBOX_FILECHANGED DIALOGEX 0, 0, 299, 103 @@ -672,11 +672,11 @@ BEGIN //~ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0 CONTROL IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT LTEXT "",IDC_INFOBOXTEXT,35,7,202,53,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT - CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, + CONTROL "&Ne plus afficher ce message.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,122,10 - DEFPUSHBUTTON "&Reload",IDRETRY,186,82,50,14 - PUSHBUTTON "&Cancel", IDCANCEL, 130, 82, 50, 14 - PUSHBUTTON "&Continue",IDCONTINUE,242,82,50,14 + DEFPUSHBUTTON "&Recharger",IDRETRY,186,82,50,14 + PUSHBUTTON "&Annuler", IDCANCEL, 130, 82, 50, 14 + PUSHBUTTON "&Continuer",IDCONTINUE,242,82,50,14 END IDD_MUI_SORT DIALOGEX 0, 0, 185, 188 diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index fcb514e62..94df250d4 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -177,7 +177,7 @@ BEGIN IDS_MUI_ASK_CLEAR_UNDO "Cette opération videra l'historique ""Défaire"". Continuer ?" IDS_MUI_READONLY_SAVE """%s"" est en lecture seule. Sauvegarder dans un fichier différent ?" IDS_MUI_FILECHANGENOTIFY - "The current file has been modified by an external program.\nPlease choose:\n\nCancel -\t\tIgnore further changes\nReload -\t\tReload File\nContinue -\tSwitch to file monitoring" + "Le fichier actuel a été modifié par un programme externe.\nChoisissez :\n\nAnnuler -\t\tIgnorer aussi les futures modifications ""externes""\nRecharger -\t\tRecharger le fichier modifié\nContinuer -\tBasculer en mode ""surveillance fichier""" IDS_MUI_FILECHANGENOTIFY2 "Le fichier actuel a été supprimé. Sauvegarder maintenant ?" IDS_MUI_FILELOCK_ERROR "Ne peut acquérir un verrouillage de fichier exclusif pour ""%s"" !" IDS_MUI_STICKYWINPOS "Le gel de la position de la fenêtre est activée. Toute nouvelle fenêtre Notepad3 utilisera les paramètres de placement de fenêtre en cours." diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index beceafd5a..02b87f30f 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -642,11 +642,11 @@ BEGIN //~ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0 CONTROL IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT - CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, + CONTROL "&Nie pokazuj tej wiadomości ponownie.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10 - DEFPUSHBUTTON "&Retry",IDRETRY,186,70,50,14 - PUSHBUTTON "&Abort",IDABORT, 130, 70, 50, 14 - PUSHBUTTON "&Ignore",IDIGNORE,242,70,50,14 + DEFPUSHBUTTON "&Ponów",IDRETRY,186,70,50,14 + PUSHBUTTON "&Przerwij",IDABORT, 130, 70, 50, 14 + PUSHBUTTON "&Ignoruj",IDIGNORE,242,70,50,14 END IDD_MUI_INFOBOX7 DIALOGEX 0, 0, 299, 91 @@ -657,11 +657,11 @@ BEGIN //~ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0 CONTROL IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT - CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, + CONTROL "&Nie pokazuj tej wiadomości ponownie.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10 - DEFPUSHBUTTON "&Try Again",IDRETRY,186,70,50,14 - PUSHBUTTON "&Cancel", IDCANCEL, 130, 70, 50, 14 - PUSHBUTTON "&Continue",IDCONTINUE,242,70,50,14 + DEFPUSHBUTTON "&Spróbuj ponownie",IDRETRY,186,70,50,14 + PUSHBUTTON "&Anuluj", IDCANCEL, 130, 70, 50, 14 + PUSHBUTTON "&Kontynuuj",IDCONTINUE,242,70,50,14 END IDD_MUI_INFOBOX_FILECHANGED DIALOGEX 0, 0, 299, 103 @@ -672,11 +672,11 @@ BEGIN //~ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0 CONTROL IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT LTEXT "",IDC_INFOBOXTEXT,35,7,202,53,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT - CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, + CONTROL "&Nie pokazuj tej wiadomości ponownie.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,122,10 - DEFPUSHBUTTON "&Reload",IDRETRY,186,82,50,14 - PUSHBUTTON "&Cancel", IDCANCEL, 130, 82, 50, 14 - PUSHBUTTON "&Continue",IDCONTINUE,242,82,50,14 + DEFPUSHBUTTON "&Załaduj ponownie",IDRETRY,186,82,50,14 + PUSHBUTTON "&Anuluj", IDCANCEL, 130, 82, 50, 14 + PUSHBUTTON "&Kontynuuj",IDCONTINUE,242,82,50,14 END IDD_MUI_SORT DIALOGEX 0, 0, 185, 188 diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index f57c7d66c..cb03292fa 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -425,7 +425,7 @@ BEGIN MENUITEM SEPARATOR POPUP "P&anele" BEGIN - MENUITEM "Show Titlebar", IDM_VIEW_TITLEBAR + MENUITEM "Pokaż pasek tytułu", IDM_VIEW_TITLEBAR MENUITEM "Pokaż pasek menu", IDM_VIEW_MENUBAR MENUITEM "Pokaż pasek narzędzi", IDM_VIEW_TOOLBAR MENUITEM "Pokaż pasek stanu", IDM_VIEW_STATUSBAR @@ -577,7 +577,7 @@ BEGIN END POPUP "+" BEGIN - MENUITEM "Show Titlebar", IDM_VIEW_TITLEBAR + MENUITEM "Pokaż pasek tytułu", IDM_VIEW_TITLEBAR MENUITEM "Pokaż pasek menu", IDM_VIEW_MENUBAR MENUITEM "Pokaż pasek narzędzi", IDM_VIEW_TOOLBAR MENUITEM "Pokaż pasek stanu", IDM_VIEW_STATUSBAR diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index cf1d03393..52ba9e277 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -177,7 +177,7 @@ BEGIN IDS_MUI_ASK_CLEAR_UNDO "Ta operacja wyczyści historię cofania. Kontynuować?" IDS_MUI_READONLY_SAVE """%s"" tylko do odczytu. Zapisać do innego pliku?" IDS_MUI_FILECHANGENOTIFY - "The current file has been modified by an external program.\nPlease choose:\n\nCancel -\t\tIgnore further changes\nReload -\t\tReload File\nContinue -\tSwitch to file monitoring" + "Bieżący plik został zmodyfikowany przez zewnętrzny program.\nWybierz:\n\nAnuluj -\t\tIgnoruj dalsze zmiany\nZaładuj ponownie -\t\tZaładuj ponownie plik\nKontynuuj -\tPrzełącz na monitorowanie pliku" IDS_MUI_FILECHANGENOTIFY2 "Bieżący plik został usunięty. Zapisać teraz?" IDS_MUI_FILELOCK_ERROR "Nie można uzyskać wyłącznej blokady plików dla ""%s""!" IDS_MUI_STICKYWINPOS "Zamrożona pozycja okna jest włączona. Jakiekolwiek nowe okno Notepad3 zastosuje ustawienia bieżącego umiejscowienia okna." @@ -286,7 +286,7 @@ BEGIN IDS_MUI_SB_TOGGLE_VIEW "Przełącz widok..." IDS_MUI_SB_REPLACE_ALL "Zamień wszystko..." IDS_MUI_SB_WRAP_LINES "Zawiń linie..." - IDS_MUI_SB_SORTING_LINES "Sorting Lines..." + IDS_MUI_SB_SORTING_LINES "Sortowanie Linii..." IDS_MUI_SB_CONV_LNBRK "Konwertuj podziały wierszy..." IDS_MUI_SB_RECODING_DOC "Ponowne kodowanie dokumentu..." IDS_MUI_SB_LEXER_STYLING "Zastosuj stylizację Lexera..."