CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

+ chg: adapt warning dialog according to new FileRevert / AutoReload undo/redo history

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-12 02:38:25 +02:00
parent f57dace64f
commit d99af6513d
17 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
language/np3_af_za/strings_af_za.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Stoor veranderinge na ""%s""?"
IDS_MUI_ASK_REVERT "Herstel lêer na laaste gestoor toestand? Jou veranderinge sal verlore gaan!"
IDS_MUI_ASK_REVERT "Herstel lêer na laaste gestoor toestand?"
IDS_MUI_ASK_RECODE "Herkodering vereis herlaai van lêer vanaf skyf, ongestoorde veranderinge sal verlore gaan!"
IDS_MUI_ASK_CREATE """%s"" nie gevind nie.\nWil jy hierdie lêer skep?"
IDS_MUI_PRINT_HEADER "Leêrnaam, Huidige Datum en Tyd|Leêrnaam, Huidige Datum|Leêrnaam|Los leeg"

2
language/np3_be_by/strings_be_by.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Çŕőŕâŕöü çě˙íĺííł ˘ Ť%sť?"
IDS_MUI_ASK_REVERT "Узнавіць файл да апошняга захаванага стану? Незахаваныя змяненні будуць згублены!"
IDS_MUI_ASK_REVERT "Узнавіць файл да апошняга захаванага стану?"
IDS_MUI_ASK_RECODE "Ęŕá ďĺđŕŕäęđűöü ó łířŕé ęŕäî˘öű, íĺŕáőîäíŕ ďĺđŕëŕäŕâŕöü ôŕéë ç äűńęŕ. Íĺçŕőŕâŕíű˙ çě˙íĺííł áóäóöü çăóáëĺíű!"
IDS_MUI_ASK_CREATE "Ť%sť íĺ çíîéäĺíű.\nŐî÷ŕöĺ ńňâŕđűöü ăýňű ôŕéë?"
IDS_MUI_PRINT_HEADER "˛ě˙ ôŕéëŕ, ö˙ďĺđŕříł˙ äŕňŕ ł ÷ŕń|˛ě˙ ôŕéëŕ, ö˙ďĺđŕří˙˙ äŕňŕ|˛ě˙ ôŕéëŕ|Ďŕęłíóöü ďóńňűě"

2
language/np3_de_de/strings_de_de.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Speichere die Änderungen nach ""%s""?"
IDS_MUI_ASK_REVERT "Soll das Dokument aus dem zuletzt gespeicherten Zustand wieder hergestellt werden? Deine Änderungen werden dabei verloren gehen!"
IDS_MUI_ASK_REVERT "Soll das Dokument aus dem zuletzt gespeicherten Zustand wieder hergestellt werden?"
IDS_MUI_ASK_RECODE "Eine Recodierung erzwingt ein erneutes Laden der Datei vom Speichermedium, nicht gesicherte Änderungen werden verloren gehen!"
IDS_MUI_ASK_CREATE """%s"" wurde nicht gefunden.\nMöchtest Du diese Datei neu erzeugen?"
IDS_MUI_PRINT_HEADER "Dateiname, aktuelles Datum und Zeit|Dateiname, aktuelles Datum|Dateiname|Frei lassen"

2
language/np3_en_gb/strings_en_gb.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Save changes to ""%s""?"
IDS_MUI_ASK_REVERT "Revert file to last saved state? Your changes will be lost!"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "Recoding requires reloading file from disk, unsaved changes will be lost!"
IDS_MUI_ASK_CREATE """%s"" not found.\nWould you like to create this file?"
IDS_MUI_PRINT_HEADER "Filename, Current Date and Time|Filename, Current Date|Filename|Leave blank"

2
language/np3_en_us/strings_en_us.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Save changes to ""%s""?"
IDS_MUI_ASK_REVERT "Revert file to last saved state? Your changes will be lost!"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "Recoding requires reloading file from disk, unsaved changes will be lost!"
IDS_MUI_ASK_CREATE """%s"" not found.\nWould you like to create this file?"
IDS_MUI_PRINT_HEADER "Filename, Current Date and Time|Filename, Current Date|Filename|Leave blank"

2
language/np3_es_es/strings_es_es.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "¿Guardar cambios a ""%s""?"
IDS_MUI_ASK_REVERT "¿Revertir archivo al último estado guardado? ¡Sus cambios se perderán!"
IDS_MUI_ASK_REVERT "¿Revertir archivo al último estado guardado?"
IDS_MUI_ASK_RECODE "¡La recodificación requiere volver a cargar el archivo desde el disco y los cambios no guardados se perderán!"
IDS_MUI_ASK_CREATE """%s"" no encontrado.\n¿Quiere crear este archivo?"
IDS_MUI_PRINT_HEADER "Nombre de archivo, fecha y hora actual|Nombre del archivo, fecha actual|Nombre del archivo|Dejar en blanco"

2
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Sauvegarger les modification vers ""%s""?"
IDS_MUI_ASK_REVERT "Rétablir le dernier état enregistré? Vos changements seront perdus!"
IDS_MUI_ASK_REVERT "Rétablir le dernier état enregistré?"
IDS_MUI_ASK_RECODE "Le recodage nécessite le rechargement du fichier à partir du disque, les modifications non enregistrées seront perdues!"
IDS_MUI_ASK_CREATE """%s"" pas trouvé.\nVoulez-vous créer ce fichier?"
IDS_MUI_PRINT_HEADER "Non du fichier, Date et Heure actuelle|Non du fichier, Date actuelle|Non du fichier|Laisser vide"

2
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Mentsük ""%s"" módosításait?"
IDS_MUI_ASK_REVERT "Viszaállítsuk a fájlt az utolsó mentett állapotra? A változtatások elvesznek!"
IDS_MUI_ASK_REVERT "Viszaállítsuk a fájlt az utolsó mentett állapotra?"
IDS_MUI_ASK_RECODE "Recoding requires reloading file from disk, unsaved changes will be lost!"
IDS_MUI_ASK_CREATE """%s"" not found.\nWould you like to create this file?"
IDS_MUI_PRINT_HEADER "Filename, Current Date and Time|Filename, Current Date|Filename|Leave blank"

2
language/np3_it_it/strings_it_it.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Salvare le modifiche a ""%s""?"
IDS_MUI_ASK_REVERT "Ripristinare il file all'ultimo salvataggio effettuato? Le eventuali modifiche successive saranno perse!"
IDS_MUI_ASK_REVERT "Ripristinare il file all'ultimo salvataggio effettuato?"
IDS_MUI_ASK_RECODE "La ricodifica richiede di ricaricare il file dal disco: eventuali modifiche non salvate saranno perse!"
IDS_MUI_ASK_CREATE """%s"" non trovato.\nVuoi creare questo file?"
IDS_MUI_PRINT_HEADER "Nome file, data e ora correnti|Nome file, Data corrente|Nome file|Lascia vuoto"

3
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -183,7 +183,8 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE """%s"" の編集を保存しますか？"
IDS_MUI_ASK_REVERT "最後に保存された内容で再読み込みします。それ以降の変更内容は失われますがよろしいですか？"
//IDS_MUI_ASK_REVERT "最後に保存された内容で再読み込みします。それ以降の変更内容は失われますがよろしいですか？"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "読み直しはファイルを再読み込みするため、変更内容は失われます。"
IDS_MUI_ASK_CREATE """%s""はありません。\nこのファイルを作成しますか？"
IDS_MUI_PRINT_HEADER "ファイル名, 現在の日付と時刻|ファイル名, 現在の日付|ファイル名|空欄とする"

3
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -185,7 +185,8 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE """%s""에 대한 변경 사항을 저장 하시겠습니까?"
IDS_MUI_ASK_REVERT "파일을 마지막으로 저장된 상태로 되 돌리시겠습니까? 변경사항을 잃게 됩니다!"
//IDS_MUI_ASK_REVERT "파일을 마지막으로 저장된 상태로 되 돌리시겠습니까? 변경사항을 잃게 됩니다!"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "코드 변경시 파일을 다시 로드 해야 하며, 저장하지 않은 변경 내용은 잃게 됩니다!"
IDS_MUI_ASK_CREATE """%s"" 파일이 존재하지 않습니다.\n이 파일을 생성하시겠습니까?"
IDS_MUI_PRINT_HEADER "파일 이름, 현재 날짜 및 시간|파일 이름, 현재 날짜|파일 이름|비워 두기"

2
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Wijzigingen opslaan in ""%s""?"
IDS_MUI_ASK_REVERT "Herladen naar de laatst opgeslagen staat? Je wijzigingen gaan verloren!"
IDS_MUI_ASK_REVERT "Herladen naar de laatst opgeslagen staat?"
IDS_MUI_ASK_RECODE "Voor hercoderen moet het bestand opnieuw van de schijf worden geladen, niet-opgeslagen wijzigingen gaan verloren!"
IDS_MUI_ASK_CREATE """%s"" niet gevonden.\nWilt u dit bestand maken??"
IDS_MUI_PRINT_HEADER "Bestandsnaam, huidige datum en tijd|Bestandsnaam, huidige datum|Bestandsnaam|Leeg laten"

2
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Save changes to ""%s""?"
IDS_MUI_ASK_REVERT "Revert file to last saved state? Your changes will be lost!"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "Recoding requires reloading file from disk, unsaved changes will be lost!"
IDS_MUI_ASK_CREATE """%s"" not found.\nWould you like to create this file?"
IDS_MUI_PRINT_HEADER "Filename, Current Date and Time|Filename, Current Date|Filename|Leave blank"

2
language/np3_pt_br/strings_pt_br.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Save changes to ""%s""?"
IDS_MUI_ASK_REVERT "Revert file to last saved state? Your changes will be lost!"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "Recoding requires reloading file from disk, unsaved changes will be lost!"
IDS_MUI_ASK_CREATE """%s"" not found.\nWould you like to create this file?"
IDS_MUI_PRINT_HEADER "Filename, Current Date and Time|Filename, Current Date|Filename|Leave blank"

2
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -185,7 +185,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "Сохранить изменения в «%s»?"
IDS_MUI_ASK_REVERT "Восстановить файл до последнего сохраненного состояния? Несохраненные изменения будут утеряны!"
IDS_MUI_ASK_REVERT "Восстановить файл до последнего сохраненного состояния?"
IDS_MUI_ASK_RECODE "Для переоткрытия в другой кодировке требуется перезагрузка файла с диска, несохраненные изменения будут утеряны!"
IDS_MUI_ASK_CREATE "«%s» не найден.\nХотите создать этот файл?"
IDS_MUI_PRINT_HEADER "Имя файла, текущие дата и время|Имя файла, текущая дата|Имя файла|Оставить пустым"

3
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -185,7 +185,8 @@ END
STRINGTABLE
BEGIN
IDS_MUI_ASK_SAVE "将修改保存到“%s”？"
IDS_MUI_ASK_REVERT "还原文件到上次保存的状态吗？\n\n警告：所有未保存的修改将丢失。"
//IDS_MUI_ASK_REVERT "还原文件到上次保存的状态吗？\n\n警告：所有未保存的修改将丢失。"
IDS_MUI_ASK_REVERT "Revert file to last saved state?"
IDS_MUI_ASK_RECODE "更改编码并重新加载吗？\n\n警告：所有未保存的修改将丢失。"
IDS_MUI_ASK_CREATE "文件“%s”未找到。是否创建一个新的文件？"
IDS_MUI_PRINT_HEADER "文件名，当前日期和时间|文件名，当前日期|文件名|留空"

10
src/Notepad3.c
View File

@ -2708,14 +2708,12 @@ LRESULT MsgChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
if (PathFileExists(Globals.CurrentFile))
{
if (((FileWatching.FileWatchingMode == FWM_AUTORELOAD) && !IsSaveNeeded(ISN_GET)) ||
InfoBoxLng(MB_YESNO | MB_ICONWARNING, NULL, IDS_MUI_FILECHANGENOTIFY) == IDYES)
//InfoBoxLng(MB_YESNO | MB_ICONWARNING, "AutoReloadFileChangeNotify", IDS_MUI_FILECHANGENOTIFY) == IDYES)
InfoBoxLng(MB_YESNO | MB_ICONWARNING, L"AutoReloadFileNotify", IDS_MUI_FILECHANGENOTIFY) == IDYES)
{
FileRevert(Globals.CurrentFile, Encoding_HasChanged(CPI_GET));
if (FileWatching.MonitoringLog) {
SciCall_SetReadOnly(FileWatching.MonitoringLog);
SetForegroundWindow(hwnd);
SciCall_ScrollToEnd();
}
}
@ -3273,9 +3271,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_FILE_REVERT:
//§§§if (IsSaveNeeded(ISN_GET) && InfoBoxLng(MB_YESNO | MB_ICONQUESTION, NULL, IDS_MUI_ASK_REVERT) != IDYES) {
//§§§ break;
//§§§}
if (IsSaveNeeded(ISN_GET) && InfoBoxLng(MB_YESNO | MB_ICONQUESTION, L"ManualRevertFileDirty", IDS_MUI_ASK_REVERT) != IDYES) {
break;
}
FileRevert(Globals.CurrentFile, Encoding_HasChanged(CPI_GET));
break;