Skip to content

Commit 9003d73

Browse files
committed
Rewrite English.pot, add JXL image extension (winmerge/winmerge #2682)
1 parent fb065aa commit 9003d73

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/WinWebDiff/WinWebDiff.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
178178

179179
if (!m_pWebDiffWindow->IsWebView2Installed())
180180
{
181-
if (IDYES == MessageBox(nullptr, L"WebView2 runtime is not installed. Do you want to download it?", L"WinWebDiff", MB_YESNO))
181+
if (IDYES == MessageBox(nullptr, L"WebView2 runtime not installed. Download it?", L"WinWebDiff", MB_YESNO))
182182
{
183183
m_pWebDiffWindow->DownloadWebView2();
184184
}
@@ -365,7 +365,7 @@ bool GenerateHTMLReport(const wchar_t* filename)
365365
Callback<IWebDiffCallback>([](const WebDiffCallbackResult& result) -> HRESULT
366366
{
367367
if (SUCCEEDED(result.errorCode))
368-
AppMsgBox(L"The report has been created successfully.", MB_OK | MB_ICONINFORMATION);
368+
AppMsgBox(L"Report created successfully.", MB_OK | MB_ICONINFORMATION);
369369
else
370370
AppMsgBox(L"Failed to create the report", MB_OK | MB_ICONWARNING);
371371
return S_OK;

src/WinWebDiff/WinWebDiff.rc

4 Bytes
Binary file not shown.

src/WinWebDiffLib/WinWebDiffLib.h

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ struct IWebDiffWindow
8383
int diffAlgorithm; /**< Diff algorithm -option. */
8484
bool indentHeuristic; /**< Ident heuristic -option */
8585
bool completelyBlankOutIgnoredChanges;
86+
bool ignoreEOLNewlinePresence;
8687
};
8788
struct ColorSettings
8889
{

src/WinWebDiffLib/WinWebDiffLib.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ BEGIN
176176
MENUITEM "&Scroll", ID_WEB_SYNC_SCROLL
177177
MENUITEM "&Click", ID_WEB_SYNC_CLICK
178178
MENUITEM "&Input", ID_WEB_SYNC_INPUT
179-
MENUITEM "&GoBack/Forward", ID_WEB_SYNC_GOBACKFORWARD
179+
MENUITEM "&Go Back/Forward", ID_WEB_SYNC_GOBACKFORWARD
180180
END
181181
END
182182

@@ -201,7 +201,7 @@ BEGIN
201201
IDS_WEB_SYNC_SCROLL "&Scroll"
202202
IDS_WEB_SYNC_CLICK "&Click"
203203
IDS_WEB_SYNC_INPUT "&Input"
204-
IDS_WEB_SYNC_GOBACKFORWARD "&GoBack/Forward"
204+
IDS_WEB_SYNC_GOBACKFORWARD "&Go Back/Forward"
205205
END
206206

207207
#endif // English (United States) resources

0 commit comments

Comments
 (0)