From d91ce547a3d528cdbacbea1332abebb5be7986f3 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 14 Dec 2018 11:13:01 +0100 Subject: [PATCH] + revert: use only reliable encoding detections ! --- language/np3_af_za/dialogs_af_za.rc | 26 +++++++++++++------------- src/Edit.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index ce3679ff3..3e04b692f 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -175,21 +175,21 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Kodering" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Standaard Kodering (nuwe l?er):",IDC_STATIC,7,7,183,48,0,WS_EX_TRANSPARENT + GROUPBOX "Standaard Kodering (nuwe lęer):",IDC_STATIC,7,7,183,48,0,WS_EX_TRANSPARENT CONTROL "",IDC_ENCODINGLIST,"ComboBoxEx32",CBS_DROPDOWNLIST | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,14,19,167,128 CONTROL "Gebruik as en terug&val op opsporing mislukking.",IDC_USEASREADINGFALLBACK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,38,155,10 GROUPBOX "Kodering Deteksie: ",IDC_STATIC,7,58,183,77,0,WS_EX_TRANSPARENT - CONTROL "Maak 7-bit &ASCII-l?ers in UTF-8 wyse oop.",IDC_ASCIIASUTF8, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,136,10 - CONTROL "Maak 8-bit *.&nfo/diz l?ers in DOS-437 wyse oop.",IDC_NFOASOEM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,83,155,10 CONTROL "Moenie enkoderingl?er &tags ontleed nie.",IDC_ENCODINGFROMFILEVARS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,96,126,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,126,10 CONTROL "Slaan &ANSI-kode opsporing oor.",IDC_NOANSICPDETECTION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,109,122,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,83,122,10 CONTROL "Slaan &UNICODE-kode opsporing oor.",IDC_NOUNICODEDETECTION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,121,122,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,96,122,10 + CONTROL "Maak 7-bit &ASCII-l?ers in UTF-8 wyse oop.",IDC_ASCIIASUTF8, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,109,136,10 + CONTROL "Maak 8-bit *.&nfo/diz l?ers in DOS-437 wyse oop.",IDC_NFOASOEM, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,121,155,10 DEFPUSHBUTTON "OK",IDOK,87,138,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,140,138,50,14 END @@ -224,12 +224,12 @@ END IDD_MUI_FILEMRU DIALOGEX 0, 0, 269, 160 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Maak Onlangse L?er Oop" +CAPTION "Maak Onlangse Lęer Oop" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,255,97 CONTROL "&Behou caret &posisie.",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,96,10 - CONTROL "&Stoor onlangse l?erlys by uitgang.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,96,10 + CONTROL "&Stoor onlangse lęerlys by uitgang.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,96,10 PUSHBUTTON "Gooi weg",IDC_REMOVE,212,107,50,14,WS_DISABLED DEFPUSHBUTTON "OK",IDOK,154,139,50,14,WS_DISABLED PUSHBUTTON "Kanselleer",IDCANCEL,212,139,50,14 @@ -240,13 +240,13 @@ END IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "L?erveranderingkennisgewing" +CAPTION "Lęerveranderingkennisgewing" FONT 8, "MS Shell Dlg", 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,99,10 - CONTROL "&Stel terug as 'n nuwe l?er oopgemaak word.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10 + CONTROL "&Stel terug as 'n nuwe lęer oopgemaak word.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10 DEFPUSHBUTTON "OK",IDOK,127,7,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,127,24,50,14 END @@ -877,7 +877,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Afrikaans (S?dafrika) resources +#endif // Afrikaans (South Africa) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/Edit.c b/src/Edit.c index 6608683c4..8bc09d58c 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -1053,7 +1053,7 @@ bool EditLoadFile( iPreferedEncoding = iFileEncWeak; } // TODO: check switch for reliability in encoding settings - else if (!Encoding_IsNONE(iAnalyzedEncoding) /* && bIsReliable */) { + else if (!Encoding_IsNONE(iAnalyzedEncoding) && bIsReliable) { iPreferedEncoding = iAnalyzedEncoding; } else if (Encoding_IsNONE(iPreferedEncoding)) {