diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 00d589d61..d3e52fde8 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -185,7 +185,7 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE "Stoor veranderinge na ""%s""?" - IDS_MUI_ASK_REVERT "Herstel ler na laaste gestoor toestand? Jou veranderinge sal verlore gaan!" + IDS_MUI_ASK_REVERT "Herstel ler na laaste gestoor toestand?" IDS_MUI_ASK_RECODE "Herkodering vereis herlaai van ler vanaf skyf, ongestoorde veranderinge sal verlore gaan!" IDS_MUI_ASK_CREATE """%s"" nie gevind nie.\nWil jy hierdie ler skep?" IDS_MUI_PRINT_HEADER "Lernaam, Huidige Datum en Tyd|Lernaam, Huidige Datum|Lernaam|Los leeg" diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 95fb3b973..c9f46a8d9 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -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 " , | , | | " diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 7ecf2a55f..331983105 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -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.\nMchtest Du diese Datei neu erzeugen?" IDS_MUI_PRINT_HEADER "Dateiname, aktuelles Datum und Zeit|Dateiname, aktuelles Datum|Dateiname|Frei lassen" diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index 27a60cecc..ecb68116b 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -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" diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index fe5bd7d16..5889cb84a 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -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" diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 02db9b3d8..bc012e47c 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -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 perdern!" + IDS_MUI_ASK_REVERT "Revertir archivo al ltimo estado guardado?" IDS_MUI_ASK_RECODE "La recodificacin requiere volver a cargar el archivo desde el disco y los cambios no guardados se perdern!" IDS_MUI_ASK_CREATE """%s"" no encontrado.\nQuiere 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" diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index 2f1b6509f..01bfd8f22 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -185,7 +185,7 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE "Sauvegarger les modification vers ""%s""?" - IDS_MUI_ASK_REVERT "Rtablir le dernier tat enregistr? Vos changements seront perdus!" + IDS_MUI_ASK_REVERT "Rtablir le dernier tat enregistr?" IDS_MUI_ASK_RECODE "Le recodage ncessite le rechargement du fichier partir du disque, les modifications non enregistres seront perdues!" IDS_MUI_ASK_CREATE """%s"" pas trouv.\nVoulez-vous crer ce fichier?" IDS_MUI_PRINT_HEADER "Non du fichier, Date et Heure actuelle|Non du fichier, Date actuelle|Non du fichier|Laisser vide" diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 360b0f482..0a1361888 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -185,7 +185,7 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE "Mentsk ""%s"" mdostsait?" - IDS_MUI_ASK_REVERT "Viszalltsuk a fjlt az utols mentett llapotra? A vltoztatsok elvesznek!" + IDS_MUI_ASK_REVERT "Viszalltsuk a fjlt 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" diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 28925e60f..2186bebfe 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -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" diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index d99e6f7a5..84cb66897 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE """%s"" ̕ҏWۑ܂H" - IDS_MUI_ASK_REVERT "Ōɕۑꂽeōēǂݍ݂܂Bȍ~̕ύXe͎܂낵łH" + //IDS_MUI_ASK_REVERT "Ōɕۑꂽeōēǂݍ݂܂Bȍ~̕ύXe͎܂낵łH" + IDS_MUI_ASK_REVERT "Revert file to last saved state?" IDS_MUI_ASK_RECODE "ǂݒ̓t@Cēǂݍ݂邽߁AύXe͎܂B" IDS_MUI_ASK_CREATE """%s""͂܂B\ñt@C쐬܂H" IDS_MUI_PRINT_HEADER "t@C, ݂̓tƎ|t@C, ݂̓t|t@C|󗓂Ƃ" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 67619da19..e553e9aaf 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -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 " ̸, ¥ ð| ̸, ¥| ̸| α" diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 7d7aec8ff..efb489462 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -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" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 631c0fefc..57c702538 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -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" diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 8d0066971..02bb6b85d 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -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" diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 0d26b8cac..43df6cbb1 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -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 " , | , | | " diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index d7fec23fb..b3ce3fcfb 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -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 "ļǰںʱ|ļǰ|ļ|" diff --git a/src/Notepad3.c b/src/Notepad3.c index 607aa5adb..911fb13c2 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -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;