diff --git a/Build/Changes.txt b/Build/Changes.txt
index 697bba68f..61e20d1fe 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,13 +33,15 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
-Current BETA/RC Version 5.21.316.(build_#) (2021-03-16)
+Current BETA/RC Version 5.21.321.(build_#) (2021-03-21)
========================================================
--------------------------------------------------------
NEW:
--------------------------------------------------------
[.###.#]- .
+[.321.1]- Experimental DarkMode support for Win10 Insider 21Hx Dev-Preview.
+[.321.1]- Exclusive File Lock option.
[.301.1]- About Dlg: version info for split-off Lexilla component.
[.301.1]- About Dlg: Copy-Ver-Info-Btn : add Dark-Mode information.
[.301.1]- Some filesystem path vs. file:// URL helpers (backslash invert).
@@ -67,6 +69,8 @@ CHANGES:
FIXES:
--------------------------------------------------------
[.###.#]- .
+[.321.1]- "Regression with vertical slope definition.
+[.321.1]- "Some regressions around external file change notification.
[.316.1]- "grepWinNP3" Language-ID "[xx-YY]" exceeds 5 chars (e.g. [es-419]) (MUI).
[.312.2]- Limit ChooseFont Dlg to CF_SCALABLEONLY for DirectWrite Technology.
[.312.1]- Rectangular selection typing issue.
diff --git a/Versions/day.txt b/Versions/day.txt
index 47eb669ba..3ae0b938f 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-316
+321
diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc
index c925c677e..4c9342edb 100644
--- a/language/np3_af_za/dialogs_af_za.rc
+++ b/language/np3_af_za/dialogs_af_za.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Lêererveranderingkennisgewing"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Geen.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Wys boodskap.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Herlaai outomaties (ongewysig).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,109,10
- CONTROL "&Stel terug as 'n nuwe lêer oopgemaak word.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,142,10
+ CONTROL "&Geen.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Wys boodskap.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Herlaai outomaties.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Stel terug as 'n nuwe lêer oopgemaak word.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,142,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Kanselleer",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc
index f5f71e0a9..331077b92 100644
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Die huidige lêer is gewysig deur 'n eksterne program. Herlaai?"
IDS_MUI_FILECHANGENOTIFY2 "Die huidige lêer is verwyder. Stoor nou?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky Window Posisie is aangeskakel. Enige nuwe Notepad3-vensters sal die huidige vensterplasinginstellings gebruik."
IDS_MUI_SAVEDSETTINGS "Die huidige program instellings is gestoor."
IDS_MUI_CREATEINI_FAIL "Kon nie konfigurasielêer skep nie."
diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc
index 8c106b8af..32d1c88e2 100644
--- a/language/np3_be_by/dialogs_be_by.rc
+++ b/language/np3_be_by/dialogs_be_by.rc
@@ -272,17 +272,19 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 213, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Паведамленне аб змяненні файла"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Няма",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,33,10
- CONTROL "&Паказаць паведамленне",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
- CONTROL "&Аўтаабнаўленне (калі не было змен)",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,140,10
- CONTROL "&Скінуць падчас адкрыцця новага файла",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,153,10
- DEFPUSHBUTTON "OK",IDOK,156,7,50,14
- PUSHBUTTON "Скасаваць",IDCANCEL,156,24,50,14
+ CONTROL "&Няма", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Паказаць паведамленне", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Аўтаабнаўленне", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Скінуць падчас адкрыцця новага файла", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,153,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "OK",IDOK,127,7,50,14
+ PUSHBUTTON "Скасаваць",IDCANCEL,127,24,50,14
END
IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc
index 4d5971b65..90f6927dd 100644
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Гэты файл быў зменены вонкавай праграмай. Пераадкрыць яго?"
IDS_MUI_FILECHANGENOTIFY2 "Гэты файл быў выдалены. Захаваць нанава?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Фіксаваная пазіцыя акна задзейнічана. Усякае новае акно Notepad3 запусціцца з цяперашнімі наладамі пазіцыі."
IDS_MUI_SAVEDSETTINGS "Цяперашнія налады праграмы былі захаваны."
IDS_MUI_CREATEINI_FAIL "Памылка падчас стварэння файла наладаў."
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index a45cae3d6..57a63e7e1 100644
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
@@ -277,12 +277,12 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Nachricht bei Dateiänderung"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Keine.",IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
- CONTROL "&Zeige Nachricht.",IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
- CONTROL "&Auto-Neuladen.",IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Exklusive Sperrung der Datei", IDC_RADIO_BTN_D, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 7, 43, 99, 10
- CONTROL "&Zurücksetzen beim öffnen einer neuen Datei.",IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,160,10
- CONTROL "&Logfile Monitoring", IDC_CHECK_BOX_B, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 74, 160, 10
+ CONTROL "&Keine.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Zeige Nachricht.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-Neuladen.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exklusive Sperrung der Datei.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Zurücksetzen beim öffnen einer neuen Datei.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,160,10
+ CONTROL "&Logfile Monitoring.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,160,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,127,24,50,14
END
diff --git a/language/np3_el_gr/dialogs_el_gr.rc b/language/np3_el_gr/dialogs_el_gr.rc
index 042e98d07..3459a2218 100644
--- a/language/np3_el_gr/dialogs_el_gr.rc
+++ b/language/np3_el_gr/dialogs_el_gr.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Change Notification"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (unmodified).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reset if a new file is opened.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&None.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Display message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Reset if a new file is opened.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_el_gr/strings_el_gr.rc b/language/np3_el_gr/strings_el_gr.rc
index 05c3afa14..7952e2f6f 100644
--- a/language/np3_el_gr/strings_el_gr.rc
+++ b/language/np3_el_gr/strings_el_gr.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"The current file has been modified by an external program. Reload?"
IDS_MUI_FILECHANGENOTIFY2 "The current file has been deleted. Save now?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky Window Position is enabled. Any new Notepad3 windows will use the current window placement settings."
IDS_MUI_SAVEDSETTINGS "The current program settings have been saved."
IDS_MUI_CREATEINI_FAIL "Error creating configuration file."
diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc
index dafcae6ac..b6d4e531b 100644
--- a/language/np3_en_gb/dialogs_en_gb.rc
+++ b/language/np3_en_gb/dialogs_en_gb.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Change Notification"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (unmodified).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reset if a new file is opened.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&None.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Display message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Reset if a new file is opened.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc
index 29ced82d5..391d472bd 100644
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"The current file has been modified by an external program. Reload?"
IDS_MUI_FILECHANGENOTIFY2 "The current file has been deleted. Save now?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky Window Position is enabled. Any new Notepad3 windows will use the current window placement settings."
IDS_MUI_SAVEDSETTINGS "The current program settings have been saved."
IDS_MUI_CREATEINI_FAIL "Error creating configuration file."
diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index 69ee7b589..667eb3e4a 100644
--- a/language/np3_en_us/dialogs_en_us.rc
+++ b/language/np3_en_us/dialogs_en_us.rc
@@ -280,9 +280,9 @@ BEGIN
CONTROL "&None.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
CONTROL "&Display message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Exclusive File Lock", IDC_RADIO_BTN_D, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 7, 43, 99, 10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
CONTROL "&Reset if a new file is opened.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
- CONTROL "&Monitoring Log", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
diff --git a/language/np3_es_419/dialogs_es_419.rc b/language/np3_es_419/dialogs_es_419.rc
index 55d92cb2f..4682a85d0 100644
--- a/language/np3_es_419/dialogs_es_419.rc
+++ b/language/np3_es_419/dialogs_es_419.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notificación de cambio de archivo"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nada.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Mostrar mensaje.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-recarga (sin notificar).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Restablecer si se abre un nuevo archivo.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,150,10
+ CONTROL "&Nada.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Mostrar mensaje.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-recarga.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Bloquear de archivo exclusivo.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,140,10
+ CONTROL "&Restablecer si se abre un nuevo archivo.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,150,10
+ CONTROL "&Monitoreo de Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_es_419/strings_es_419.rc b/language/np3_es_419/strings_es_419.rc
index 8b175ca43..ced24dab3 100644
--- a/language/np3_es_419/strings_es_419.rc
+++ b/language/np3_es_419/strings_es_419.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"El archivo actual ha sido modificado por un programa externo. ¿Recargar?"
IDS_MUI_FILECHANGENOTIFY2 "El archivo actual ha sido eliminado. ¿Guardar ahora?"
+ IDS_MUI_FILELOCK_ERROR "No se puede adquirir un bloqueo de archivo exclusivo para ""%s""!"
IDS_MUI_STICKYWINPOS "La posición de la ventana fija está activada. Cualquier nueva ventana de Notepad3 utilizará la configuración de ubicación de la ventana actual."
IDS_MUI_SAVEDSETTINGS "Los parámetros actuales del programa se han guardado."
IDS_MUI_CREATEINI_FAIL "Error al crear el archivo de configuración."
diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index 3a95e2c63..b0f52367e 100644
--- a/language/np3_es_es/dialogs_es_es.rc
+++ b/language/np3_es_es/dialogs_es_es.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notificación de cambio de archivo"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nada.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Mostrar mensaje.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-recarga (sin notificar).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Restablecer si se abre un nuevo archivo.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,150,10
+ CONTROL "&Nada.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Mostrar mensaje.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-recarga.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Bloquear de archivo exclusivo.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,140,10
+ CONTROL "&Restablecer si se abre un nuevo archivo.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,150,10
+ CONTROL "&Monitoreo de Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc
index 74db61c3d..5a7db72fe 100644
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"El archivo actual ha sido modificado por un programa externo. ¿Recargar?"
IDS_MUI_FILECHANGENOTIFY2 "El archivo actual ha sido eliminado. ¿Guardar ahora?"
+ IDS_MUI_FILELOCK_ERROR "No se puede adquirir un bloqueo de archivo exclusivo para ""%s""!"
IDS_MUI_STICKYWINPOS "La posición de la ventana fija está activada. Cualquier nueva ventana de Notepad3 utilizará la configuración de ubicación de la ventana actual."
IDS_MUI_SAVEDSETTINGS "Los parámetros actuales del programa se han guardado."
IDS_MUI_CREATEINI_FAIL "Error al crear el archivo de configuración."
diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 24ce91c61..b80678b2f 100644
--- a/language/np3_fr_fr/dialogs_fr_fr.rc
+++ b/language/np3_fr_fr/dialogs_fr_fr.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notification de modification de fichier"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "Aucu&ne.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "Afficher un &message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,91,10
- CONTROL "&Auto-rechargement (non modifié).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,115,10
- CONTROL "&Rétablir si un nouveau fichier est ouvert.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,145,10
+ CONTROL "Aucu&ne.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "Afficher un &message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-rechargement.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Verrouillage de fichier exclusif.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,125,10
+ CONTROL "&Rétablir si un nouveau fichier est ouvert.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,145,10
+ CONTROL "Log de &Contrôle.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Annuler",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc
index 3d3729d00..c30a65290 100644
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Le fichier actuel a été modifié par un programme externe. Recharger ?"
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 "La position de la fenêtre fixée est activée. Toute nouvelle fenêtre Notepad3 utilisera les paramètres de placement de fenêtre en cours."
IDS_MUI_SAVEDSETTINGS "Les paramètres courants du programme ont été sauvegardés."
IDS_MUI_CREATEINI_FAIL "Erreur de création du fichier de configuration."
diff --git a/language/np3_hi_in/dialogs_hi_in.rc b/language/np3_hi_in/dialogs_hi_in.rc
index d651b0296..f2e70ad71 100644
--- a/language/np3_hi_in/dialogs_hi_in.rc
+++ b/language/np3_hi_in/dialogs_hi_in.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "फ़ाइल परिवर्तन सूचना"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "कुछ नहीं (&N)",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,50,10
- CONTROL "संदेश दिखाएं (&D)",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "स्वतः रीलोड करें (अपरिवर्तित)(&A)",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "नई फ़ाइल खुली होने पर रेसेट करें (&R)",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "कुछ नहीं (&N)", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "संदेश दिखाएं (&D)", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "स्वतः रीलोड करें (&A)", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "Exclusive File Lock (&E)", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "नई फ़ाइल खुली होने पर रेसेट करें (&R)", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "Monitoring Log(&M)", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "सही है",IDOK,127,7,50,14
PUSHBUTTON "रद्द करें",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc
index b2329cd62..19a058b78 100644
--- a/language/np3_hi_in/strings_hi_in.rc
+++ b/language/np3_hi_in/strings_hi_in.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"चालू फ़ाईल एक बाहरी प्रोग्राम द्वारा परिवर्तित हो चुकी है। पुनः लोड करें?"
IDS_MUI_FILECHANGENOTIFY2 "चालू फ़ाईल मिटा दी गई है। अभी सहेजें?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky विंडो की स्तिथि सक्षम है. कोई भी नई Notepad3 विंडो इस विंडो की स्तिथि सेटिंग को प्रयोग मे लेगी."
IDS_MUI_SAVEDSETTINGS "चालू प्रोग्राम सेटिंग सहेजी जा चुकी हैं."
IDS_MUI_CREATEINI_FAIL "कन्फ़िगरेशन फ़ाईल बनाने में त्रुटि."
diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc
index ee392cf93..ec9323cb5 100644
--- a/language/np3_hu_hu/dialogs_hu_hu.rc
+++ b/language/np3_hu_hu/dialogs_hu_hu.rc
@@ -272,17 +272,19 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 194, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Értesítés fájl módosulásáról"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nincs.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Üzenet megjelenítése.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,80,10
- CONTROL "&Automatikus újratöltés (módosítatlan).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,125,10
- CONTROL "&Újrakezdés, ha új fájl lett megnyitva.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,120,10
- DEFPUSHBUTTON "OK",IDOK,137,7,50,14
- PUSHBUTTON "Mégsem",IDCANCEL,137,24,50,14
+ CONTROL "&Nincs.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Üzenet megjelenítése.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Automatikus újratöltés.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Újrakezdés, ha új fájl lett megnyitva.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,145,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "OK",IDOK,127,7,50,14
+ PUSHBUTTON "Mégsem",IDCANCEL,127,24,50,14
END
IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc
index ffba6eca9..434e9a697 100644
--- a/language/np3_hu_hu/strings_hu_hu.rc
+++ b/language/np3_hu_hu/strings_hu_hu.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Az aktuális fájl egy külső progarm által módosítva lett. Újratöltsük?"
IDS_MUI_FILECHANGENOTIFY2 "Az aktuális fájl törölve lett. Elmentsük?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "A ragadós ablakpozíciók be van kapcsolva. Az új Notepad3 ablakok a jelenlegi ablakhelyzetét használják majd."
IDS_MUI_SAVEDSETTINGS "A jelenlegi beállítások el lettek mentve."
IDS_MUI_CREATEINI_FAIL "Hiba a beállításfájl létrehozásakor."
diff --git a/language/np3_id_id/dialogs_id_id.rc b/language/np3_id_id/dialogs_id_id.rc
index 886500b7a..e1ee6b101 100644
--- a/language/np3_id_id/dialogs_id_id.rc
+++ b/language/np3_id_id/dialogs_id_id.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Change Notification"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (unmodified).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reset if a new file is opened.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&None.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Display message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Reset if a new file is opened.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_id_id/strings_id_id.rc b/language/np3_id_id/strings_id_id.rc
index 9c6a6fe13..41a8e9d5b 100644
--- a/language/np3_id_id/strings_id_id.rc
+++ b/language/np3_id_id/strings_id_id.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"The current file has been modified by an external program. Reload?"
IDS_MUI_FILECHANGENOTIFY2 "The current file has been deleted. Save now?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky Window Position is enabled. Any new Notepad3 windows will use the current window placement settings."
IDS_MUI_SAVEDSETTINGS "The current program settings have been saved."
IDS_MUI_CREATEINI_FAIL "Error creating configuration file."
diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc
index 64da09a72..65ea0dc70 100644
--- a/language/np3_it_it/dialogs_it_it.rc
+++ b/language/np3_it_it/dialogs_it_it.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notifica su file modificato"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nessuna.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,40,10
- CONTROL "&Mostra messaggio.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Ricarica (non modificato).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reimposta aprendo nuovo file.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&Nessuna.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Mostra messaggio.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Ricarica.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Reimposta aprendo nuovo file.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Annulla",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc
index 336f59bcd..1c340a3ff 100644
--- a/language/np3_it_it/strings_it_it.rc
+++ b/language/np3_it_it/strings_it_it.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Il file corrente è stato modificato da un programma esterno. Ricaricare?"
IDS_MUI_FILECHANGENOTIFY2 "Il file corrente è stato cancellato. Salvarlo adesso?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "La posizione della finestra ""sticky"" è abilitata. Qualunque finestra Notepad3 userà le attuali impostazioni di posizione finestra."
IDS_MUI_SAVEDSETTINGS "Le impostazioni correnti di Notepad3 sono state salvate."
IDS_MUI_CREATEINI_FAIL "Errore nella creazione del file delle impostazioni."
diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc
index 9a2331f57..f6ea5b2aa 100644
--- a/language/np3_ja_jp/dialogs_ja_jp.rc
+++ b/language/np3_ja_jp/dialogs_ja_jp.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ファイルの変更の通知"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "なし(&N)",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
- CONTROL "メッセージを表示(&D)",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,106,10
- CONTROL "自動再読み込み(修正不可)(&A)",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,114,10
- CONTROL "新たにファイルを開いたらリセット(&R)",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,165,10
+ CONTROL "なし(&N)", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "メッセージを表示(&D)", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "自動再読み込み(&A)", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "Exclusive File Lock(&E)", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "新たにファイルを開いたらリセット(&R)", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "Monitoring Log(&M)", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "キャンセル",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc
index d52d94d25..37896542a 100644
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"ファイルが他のプログラムによって変更されました。再読み込みしますか？"
IDS_MUI_FILECHANGENOTIFY2 "ファイルが削除されました。保存しますか？"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "ウィンドウ位置の固定を有効にします。新しいウインドウは、現在のウインドウ位置の設定にて開かれます。"
IDS_MUI_SAVEDSETTINGS "設定が保存されました。"
IDS_MUI_CREATEINI_FAIL "設定ファイルの作成に失敗しました。"
diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc
index b83708947..dd5ac54e5 100644
--- a/language/np3_ko_kr/dialogs_ko_kr.rc
+++ b/language/np3_ko_kr/dialogs_ko_kr.rc
@@ -272,16 +272,18 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "파일 변경 알림"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "없음(&N)",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,115,10
- CONTROL "메시지를 표시합니다(&D).",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,115,10
- CONTROL "자동 새로 고침 (수정하지 않음)(&A).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,116,10
- CONTROL "새 파일이 열리면 재설정합니다(&R).",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,163,10
- DEFPUSHBUTTON "확인",IDOK,127,7,50,14
+ CONTROL "없음(&N).", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "메시지를 표시합니다(&D).", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "자동 새로 고침(&A).", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "Exclusive File Lock(&E).", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "새 파일이 열리면 재설정합니다(&R).", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,163,10
+ CONTROL "Monitoring Log(&M).", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "취소",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
@@ -976,3 +978,4 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc
index 645f59498..a51276016 100644
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"현재 파일이 외부 프로그램에 의해 수정되었습니다. 다시 불러오시겠습니까?"
IDS_MUI_FILECHANGENOTIFY2 "현재 파일이 삭제되었습니다. 지금 저장하시겠습니까?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "고정 창 위치가 활성화되었습니다. 새 Notepad3 창은 현재 창 배치 설정을 사용합니다."
IDS_MUI_SAVEDSETTINGS "현재 프로그램 설정이 저장되었습니다."
IDS_MUI_CREATEINI_FAIL "구성 파일을 만드는 동안 오류가 발생했습니다."
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 7252b2f20..1dd9be9ae 100644
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Bestandswijziging notificatie"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Geen.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Tonen bericht.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-herladen (ongewijzigd).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Resetten als een nieuw bestand wordt geopend.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,155,10
+ CONTROL "&Geen.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Tonen bericht.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-herladen.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusieve bestandsvergrendeling.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,140,10
+ CONTROL "&Resetten als een nieuw bestand wordt geopend.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,155,10
+ CONTROL "Log &Monitoren.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Annuleren",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc
index 22e55d320..7fe050e9b 100644
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Het huidige bestand is gewijzigd door een extern programma. Herladen?"
IDS_MUI_FILECHANGENOTIFY2 "Het huidige bestand is verwijderd. Nu opslaan?"
+ IDS_MUI_FILELOCK_ERROR "Kan geen exclusieve bestandsvergrendeling verkrijgen voor ""%s""!"
IDS_MUI_STICKYWINPOS "Kleverige vensterpositie is ingeschakeld. Alle nieuwe Notepad3 vensters gebruiken de huidige instellingen voor vensterplaatsing."
IDS_MUI_SAVEDSETTINGS "De huidige programma instellingen zijn opgeslagen."
IDS_MUI_CREATEINI_FAIL "Fout bij het maken van het configuratiebestand."
diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc
index d5bc90618..1111063ff 100644
--- a/language/np3_pl_pl/dialogs_pl_pl.rc
+++ b/language/np3_pl_pl/dialogs_pl_pl.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Powiadomienie o zmianie pliku"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Żaden.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Pokaż wiadomość.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (niezmieniony).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Resetuj jeśli otwarto nowy plik.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&Żaden.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Pokaż wiadomość.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Resetuj jeśli otwarto nowy plik.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,140,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Anuluj",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc
index f9f873616..78d6ba3d6 100644
--- a/language/np3_pl_pl/strings_pl_pl.rc
+++ b/language/np3_pl_pl/strings_pl_pl.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Bieżący plik został zmieniony przez zewnętrzny program. Załadować ponownie?"
IDS_MUI_FILECHANGENOTIFY2 "Bieżący plik został usunięty. Zapisać teraz?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Zamrożona pozycja okna jest włączona. Jakiekolwiek nowe okno Notepad3 zastosuje ustawienia bieżącego umiejscowienia okna."
IDS_MUI_SAVEDSETTINGS "Bieżące ustawienia programu zostały zapisane."
IDS_MUI_CREATEINI_FAIL "Błąd podczas tworzenia pliku konfiguracyjnego."
diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc
index 6243e41d7..f77cf88d3 100644
--- a/language/np3_pt_br/dialogs_pt_br.rc
+++ b/language/np3_pt_br/dialogs_pt_br.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notificação de Mudança de Arquivo"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nenhuma.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,50,10
- CONTROL "&Mostrar mensagem.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "Recarregar &automat. (não modific.).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,118,10
- CONTROL "&Redefinir se novo arquivo for aberto.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,125,10
+ CONTROL "&Nenhuma.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Mostrar mensagem.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "Recarregar &automaticamente.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,120,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Redefinir se novo arquivo for aberto.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,125,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc
index 405fc8728..f6ab7a4c5 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"O presente arquivo foi modificado por um programa externo. Recarregar?"
IDS_MUI_FILECHANGENOTIFY2 "O presente arquivo foi apagado. Salvar agora?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Posição de Janela Fixada foi ativada. Qualquer nova janela do Notepad3 usará as configurações de posicionamento de janela correntes."
IDS_MUI_SAVEDSETTINGS "As configurações correntes do programa foram gravadas."
IDS_MUI_CREATEINI_FAIL "Erro criando arquivo de configuração."
diff --git a/language/np3_pt_pt/dialogs_pt_pt.rc b/language/np3_pt_pt/dialogs_pt_pt.rc
index e1332f13f..680e48162 100644
--- a/language/np3_pt_pt/dialogs_pt_pt.rc
+++ b/language/np3_pt_pt/dialogs_pt_pt.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notificação de alteração de ficheiro"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nenhuma.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,43,10
- CONTROL "&Exibir mensagem.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-recarregar (sem modificações).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,121,10
- CONTROL "&Repor se for aberto novo ficheiro.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,123,10
+ CONTROL "&Nenhuma.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Exibir mensagem.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-recarregar.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Repor se for aberto novo ficheiro.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,125,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_pt_pt/strings_pt_pt.rc b/language/np3_pt_pt/strings_pt_pt.rc
index bbd0d15e3..37cb443a0 100644
--- a/language/np3_pt_pt/strings_pt_pt.rc
+++ b/language/np3_pt_pt/strings_pt_pt.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"O ficheiro actual foi modificado por um programa externo. Recarregar?"
IDS_MUI_FILECHANGENOTIFY2 "O ficheiro actual foi eliminado. Guardar agora?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "A posição fixa da janela está activada. Todas as novas janelas do Notepad3 irão utilizar as actuais definições de posicionamento."
IDS_MUI_SAVEDSETTINGS "As actuais definições do programa foram guardadas."
IDS_MUI_CREATEINI_FAIL "Erro ao criar o ficheiro de configuração."
diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc
index 78eaa8856..64f6aae04 100644
--- a/language/np3_ru_ru/dialogs_ru_ru.rc
+++ b/language/np3_ru_ru/dialogs_ru_ru.rc
@@ -272,17 +272,19 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 213, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Уведомление об изменении файла"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Нет",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,29,10
- CONTROL "&Показать сообщение",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,87,10
- CONTROL "&Автообновление (если не изменен)",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,135,10
- CONTROL "&Сбросить при открытии нового файла",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,146,10
- DEFPUSHBUTTON "OK",IDOK,156,7,50,14
- PUSHBUTTON "Отмена",IDCANCEL,156,24,50,14
+ CONTROL "&Нет", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Показать сообщение", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Автообновление", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Сбросить при открытии нового файла", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,146,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "OK",IDOK,127,7,50,14
+ PUSHBUTTON "Отмена",IDCANCEL,127,24,50,14
END
IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc
index 7f350cb90..081f94e9f 100644
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Этот файл был изменен внешней программой. Переоткрыть его?"
IDS_MUI_FILECHANGENOTIFY2 "Этот файл был удален. Пересохранить?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Фиксированное положение окна включено. Любое новое окно Notepad3 будет запущено с текущими настройками положения."
IDS_MUI_SAVEDSETTINGS "Текущие настройки приложения были сохранены."
IDS_MUI_CREATEINI_FAIL "Ошибка создания конфигурационного файла."
diff --git a/language/np3_sk_sk/dialogs_sk_sk.rc b/language/np3_sk_sk/dialogs_sk_sk.rc
index fdc2874ab..640b01b64 100644
--- a/language/np3_sk_sk/dialogs_sk_sk.rc
+++ b/language/np3_sk_sk/dialogs_sk_sk.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Oznámenie o zmene súboru"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Neoznamovať.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,61,10
- CONTROL "&Zobraziť správu.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-načítanie (nemodifikované).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,119,10
- CONTROL "&Resetovať pri otvorení nového súboru.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,137,10
+ CONTROL "&Neoznamovať.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Zobraziť správu.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-načítanie.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Resetovať pri otvorení nového súboru.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,140,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Zrušiť",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc
index 42b642f38..d6d41f2e4 100644
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Aktuálny súbor bol upravený externým programom. Znovu ho načítať?"
IDS_MUI_FILECHANGENOTIFY2 "Aktuálny súbor bol odstránený. Uložiť ho znovu?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Fixovanie polohy okna je povolené. Všetky nové okná Notepad2 budú používať aktuálne nastavenie umiestnenia okna."
IDS_MUI_SAVEDSETTINGS "Aktuálne nastavenie programu bolo uložené."
IDS_MUI_CREATEINI_FAIL "Chyba pri vytváraní konfiguračného súboru."
diff --git a/language/np3_sv_se/dialogs_sv_se.rc b/language/np3_sv_se/dialogs_sv_se.rc
index 68a3a7df9..164963464 100644
--- a/language/np3_sv_se/dialogs_sv_se.rc
+++ b/language/np3_sv_se/dialogs_sv_se.rc
@@ -272,17 +272,19 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 194, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Avisering vid ändring av filändelse"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "Ingen.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "Visa meddelande.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "Ladda om automatiskt (omodifierad).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,125,10
- CONTROL "Återställ om en ny fil öppnas.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
- DEFPUSHBUTTON "OK",IDOK,137,7,50,14
- PUSHBUTTON "Avbryt",IDCANCEL,137,24,50,14
+ CONTROL "&Ingen.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "Visa meddelande.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "Ladda om automatiskt.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "Återställ om en ny fil öppnas.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "OK",IDOK,127,7,50,14
+ PUSHBUTTON "Avbryt",IDCANCEL,127,24,50,14
END
IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc
index 4c80ffdee..a92ca4042 100644
--- a/language/np3_sv_se/strings_sv_se.rc
+++ b/language/np3_sv_se/strings_sv_se.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"Aktuell fil har modifierats av ett externt program. Vill du ladda om?"
IDS_MUI_FILECHANGENOTIFY2 "Aktuell fil har tagits bort. Vill du spara nu?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Fast fönsterposition är aktiverad. Alla nya Notepad3-fönster kommer att använda aktuella fösterplaceringsinställningar."
IDS_MUI_SAVEDSETTINGS "Inställningarna har sparats."
IDS_MUI_CREATEINI_FAIL "Kunde inte skapa konfigurationsfil."
diff --git a/language/np3_tr_tr/dialogs_tr_tr.rc b/language/np3_tr_tr/dialogs_tr_tr.rc
index 7f33e0a2f..5fd078024 100644
--- a/language/np3_tr_tr/dialogs_tr_tr.rc
+++ b/language/np3_tr_tr/dialogs_tr_tr.rc
@@ -272,17 +272,19 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Change Notification"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (unmodified).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reset if a new file is opened.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
- DEFPUSHBUTTON "Tamam",IDOK,127,7,50,14
- PUSHBUTTON "İptal",IDCANCEL,127,24,50,14
+ CONTROL "&None.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Display message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Reset if a new file is opened.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "OK",IDOK,127,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc
index 227d06ddd..f5b18749b 100644
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"The current file has been modified by an external program. Reload?"
IDS_MUI_FILECHANGENOTIFY2 "The current file has been deleted. Save now?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky Window Position is enabled. Any new Notepad3 windows will use the current window placement settings."
IDS_MUI_SAVEDSETTINGS "The current program settings have been saved."
IDS_MUI_CREATEINI_FAIL "Error creating configuration file."
diff --git a/language/np3_vi_vn/dialogs_vi_vn.rc b/language/np3_vi_vn/dialogs_vi_vn.rc
index 88d8c995f..52fa5ad25 100644
--- a/language/np3_vi_vn/dialogs_vi_vn.rc
+++ b/language/np3_vi_vn/dialogs_vi_vn.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Change Notification"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (unmodified).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reset if a new file is opened.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&None.", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "&Display message.", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "&Auto-reload.", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Exclusive File Lock.", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "&Reset if a new file is opened.", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log.", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_vi_vn/strings_vi_vn.rc b/language/np3_vi_vn/strings_vi_vn.rc
index d5521d078..be6efa89e 100644
--- a/language/np3_vi_vn/strings_vi_vn.rc
+++ b/language/np3_vi_vn/strings_vi_vn.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"The current file has been modified by an external program. Reload?"
IDS_MUI_FILECHANGENOTIFY2 "The current file has been deleted. Save now?"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "Sticky Window Position is enabled. Any new Notepad3 windows will use the current window placement settings."
IDS_MUI_SAVEDSETTINGS "The current program settings have been saved."
IDS_MUI_CREATEINI_FAIL "Error creating configuration file."
diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc
index d7b108cbb..f3bdca919 100644
--- a/language/np3_zh_cn/dialogs_zh_cn.rc
+++ b/language/np3_zh_cn/dialogs_zh_cn.rc
@@ -272,17 +272,19 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 207, 66
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "文件修改通知"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "无(&N)",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,137,10
- CONTROL "显示消息框(&D)",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,137,10
- CONTROL "自动重新加载（无修改）(&A)",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,137,10
- CONTROL "打开新文件时重置(&R)",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,191,10
- DEFPUSHBUTTON "确定",IDOK,150,6,50,14
- PUSHBUTTON "取消",IDCANCEL,150,24,50,14
+ CONTROL "无(&N)", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "显示消息框(&D)", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "自动重新加载(&A)", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "Exclusive File Lock(&E)", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "打开新文件时重置(&R)", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "&Monitoring Log(&M)", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
+ DEFPUSHBUTTON "确定",IDOK,127,7,50,14
+ PUSHBUTTON "取消",IDCANCEL,127,24,50,14
END
IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc
index 1539718db..99e9fc72c 100644
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"当前文件已被其它程序修改。是否重新加载？"
IDS_MUI_FILECHANGENOTIFY2 "当前文件已被删除。是否保存？"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "粘性窗口位置已启用。新的 Notepad3 窗口将使用和当前窗口一致的位置设置。"
IDS_MUI_SAVEDSETTINGS "当前设置已保存。"
IDS_MUI_CREATEINI_FAIL "创建配置文件失败。"
diff --git a/language/np3_zh_tw/dialogs_zh_tw.rc b/language/np3_zh_tw/dialogs_zh_tw.rc
index 383fbd248..a354191ed 100644
--- a/language/np3_zh_tw/dialogs_zh_tw.rc
+++ b/language/np3_zh_tw/dialogs_zh_tw.rc
@@ -272,15 +272,17 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP,7,143,10,10
END
-IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
+IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "檔案修改通知"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "無(&N)",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
- CONTROL "顯示訊息框(&D)",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "自動重新載入（無修改）(&A)",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "開啟新檔案時重置(&R)",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "無(&N)", IDC_RADIO_BTN_A,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,99,10
+ CONTROL "顯示訊息框(&D)", IDC_RADIO_BTN_B,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,99,10
+ CONTROL "自動重新載入(&A)", IDC_RADIO_BTN_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "Exclusive File Lock(&E)", IDC_RADIO_BTN_D,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,7,43,99,10
+ CONTROL "開啟新檔案時重置(&R)", IDC_CHECK_BOX_A,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,120,10
+ CONTROL "Monitoring Log(&M)", IDC_CHECK_BOX_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,120,10
DEFPUSHBUTTON "確定",IDOK,127,7,50,14
PUSHBUTTON "取消",IDCANCEL,127,24,50,14
END
@@ -785,7 +787,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 177
TOPMARGIN, 7
- BOTTOMMARGIN, 58
+ BOTTOMMARGIN, 84
END
IDD_MUI_STYLESELECT, DIALOG
diff --git a/language/np3_zh_tw/strings_zh_tw.rc b/language/np3_zh_tw/strings_zh_tw.rc
index decbb788b..9b2ec2509 100644
--- a/language/np3_zh_tw/strings_zh_tw.rc
+++ b/language/np3_zh_tw/strings_zh_tw.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_MUI_FILECHANGENOTIFY
"目前檔案已被其它程式修改。是否重新載入？"
IDS_MUI_FILECHANGENOTIFY2 "目前檔案已被刪除。是否儲存？"
+ IDS_MUI_FILELOCK_ERROR "Can not accquire exclusive file lock for ""%s""!"
IDS_MUI_STICKYWINPOS "粘性視窗位置已啟用。新的 Notepad3 視窗將使用和目前視窗一樣的位置設定。"
IDS_MUI_SAVEDSETTINGS "目前設定已儲存。"
IDS_MUI_CREATEINI_FAIL "建立配置檔案失敗。"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 0aa7820bc..07abe6bae 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 beta
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 58ce8a10c..02420a002 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
-#define VERSION_REV 316
+#define VERSION_REV 321
#define VERSION_BUILD 1
#define SCINTILLA_VER 500
#define LEXILLA_VER 500