diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 9710b25b31b..aa3b58a6a7b 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -24,9 +24,9 @@ https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41 https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-x64.zip!Build\x64\Release ^ https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM.zip!Build\ARM\Release ^ https://github.com/WinMerge/winimerge/releases/download/v1.0.41/winimerge-1.0.41.0-ARM64.zip!Build\ARM64\Release ^ -https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x86.zip!Build\x86\Release ^ -https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-x64.zip!Build\x64\Release ^ -https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^ +https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x86.zip!Build\x86\Release ^ +https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-x64.zip!Build\x64\Release ^ +https://github.com/WinMerge/winwebdiff/releases/download/v1.0.8/winwebdiff-1.0.8.0-ARM64.zip!Build\ARM64\Release ^ https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^ https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^ https://github.com/jqlang/jq/releases/download/jq-1.7/jq-win32.exe!Build\jq ^ diff --git a/Externals/versions.txt b/Externals/versions.txt index 8667d9acbba..e7d1ffcf190 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -9,7 +9,7 @@ This file lists versions of the external components we are using. - WinIMerge: 1.0.41.0 - freeimage: 3.18.0 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff) -- WinWebDiff: 1.0.7.0 +- WinWebDiff: 1.0.8.0 - WebView2: 1.0.1518.46 - wil: 1.0.191107.2 - rapidjson: 1.1.1 diff --git a/Externals/winwebdiff b/Externals/winwebdiff index e4910ea3518..c37c73926fe 160000 --- a/Externals/winwebdiff +++ b/Externals/winwebdiff @@ -1 +1 @@ -Subproject commit e4910ea351806ce2d4355d916117f293709517c2 +Subproject commit c37c73926feb9cf101904a2bcdfee54bbb0fc273 diff --git a/Src/Merge.rc b/Src/Merge.rc index 192f8855faf..e5388e98e6b 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -241,6 +241,15 @@ BEGIN MENUITEM "1280x800", ID_WEB_SIZE_1280x800 MENUITEM "1440x900", ID_WEB_SIZE_1440x900 END + POPUP "&Event Synchronization" + BEGIN + MENUITEM "&Enabled", ID_WEB_SYNC_ENABLED + MENUITEM SEPARATOR + MENUITEM "&Scroll", ID_WEB_SYNC_SCROLL + MENUITEM "&Click", ID_WEB_SYNC_CLICK + MENUITEM "&Input", ID_WEB_SYNC_INPUT + MENUITEM "&GoBack/Forward", ID_WEB_SYNC_GOBACKFORWARD + END POPUP "Clear &Browsing Data" BEGIN MENUITEM "&Disk Cache", ID_WEB_CLEAR_DISK_CACHE @@ -1154,6 +1163,19 @@ BEGIN END END +IDR_POPUP_WEBPAGE_SYNC_EVENTS MENU +BEGIN + POPUP "_POPUP_" + BEGIN + MENUITEM "&Enabled", ID_WEB_SYNC_ENABLED + MENUITEM SEPARATOR + MENUITEM "&Scroll", ID_WEB_SYNC_SCROLL + MENUITEM "&Click", ID_WEB_SYNC_CLICK + MENUITEM "&Input", ID_WEB_SYNC_INPUT + MENUITEM "&GoBack/Forward", ID_WEB_SYNC_GOBACKFORWARD + END +END + ///////////////////////////////////////////////////////////////////////////// // @@ -2332,7 +2354,8 @@ BEGIN EDITTEXT IDC_ZOOM,178,2,32,14,ES_AUTOHSCROLL,WS_EX_RIGHT LTEXT "UA:",-1,214,4,16,10 EDITTEXT IDC_USERAGENT,230,2,128,14,ES_AUTOHSCROLL - CONTROL "View &Differences",IDC_SHOWDIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,362,2,96,14 + CONTROL "&Event Synchronization",IDC_SYNC_EVENTS,"Button",BS_SPLITBUTTON | WS_TABSTOP,362,2,106,14 + CONTROL "View &Differences",IDC_SHOWDIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,472,2,96,14 END diff --git a/Src/MergeFrameCommon.cpp b/Src/MergeFrameCommon.cpp index 700d6e0f5ce..7d1f5790036 100644 --- a/Src/MergeFrameCommon.cpp +++ b/Src/MergeFrameCommon.cpp @@ -88,7 +88,7 @@ void CMergeFrameCommon::RemoveBarBorder() */ void CMergeFrameCommon::SetLastCompareResult(int nResult) { - HICON hReplace = (nResult == 0) ? m_hIdentical : m_hDifferent; + HICON hReplace = (nResult == 0) ? m_hIdentical : ((nResult < 0) ? nullptr : m_hDifferent); if (m_hCurrent != hReplace) { diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h index b82147a6758..738e300f5d6 100644 --- a/Src/OptionsDef.h +++ b/Src/OptionsDef.h @@ -247,6 +247,8 @@ inline const String OPT_CMP_WEB_VIEW_WIDTH {_T("Settings/WebPageViewWidth"s)}; inline const String OPT_CMP_WEB_VIEW_HEIGHT {_T("Settings/WebPageViewHeight"s)}; inline const String OPT_CMP_WEB_ZOOM {_T("Settings/WebZoom"s)}; inline const String OPT_CMP_WEB_USER_AGENT {_T("Settings/WebUserAgent"s)}; +inline const String OPT_CMP_WEB_SYNC_EVENTS {_T("Settings/WebSyncEvents"s)}; +inline const String OPT_CMP_WEB_SYNC_EVENT_FLAGS {_T("Settings/WebSyncEventFlags"s)}; inline const String OPT_CMP_WEB_URL_PATTERN_TO_INCLUDE {_T("Settings/WebPageURLPatternToInclude"s)}; inline const String OPT_CMP_WEB_URL_PATTERN_TO_EXCLUDE {_T("Settings/WebPageURLPatternToExclude"s)}; diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp index df6c2a4bade..3ac7b64b6b0 100644 --- a/Src/OptionsInit.cpp +++ b/Src/OptionsInit.cpp @@ -186,6 +186,8 @@ void Init(COptionsMgr *pOptions) pOptions->InitOption(OPT_CMP_WEB_USER_AGENT, _T("")); pOptions->InitOption(OPT_CMP_WEB_URL_PATTERN_TO_INCLUDE, _T("")); pOptions->InitOption(OPT_CMP_WEB_URL_PATTERN_TO_EXCLUDE, _T("")); + pOptions->InitOption(OPT_CMP_WEB_SYNC_EVENTS, false); + pOptions->InitOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, 0xff); pOptions->InitOption(OPT_PROJECTS_PATH, _T("")); pOptions->InitOption(OPT_USE_SYSTEM_TEMP_PATH, true); diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp index 2b63e38dc26..a799e35d23e 100644 --- a/Src/WebPageDiffFrm.cpp +++ b/Src/WebPageDiffFrm.cpp @@ -115,6 +115,8 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon) ON_COMMAND(ID_WEB_COMPARE_HTMLS, OnWebCompareHTMLs) ON_COMMAND(ID_WEB_COMPARE_TEXTS, OnWebCompareTexts) ON_COMMAND(ID_WEB_COMPARE_RESOURCETREES, OnWebCompareResourceTrees) + ON_COMMAND_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_GOBACKFORWARD, OnWebSyncEvent) + ON_UPDATE_COMMAND_UI_RANGE(ID_WEB_SYNC_ENABLED, ID_WEB_SYNC_GOBACKFORWARD, OnUpdateWebSyncEvent) ON_COMMAND_RANGE(ID_WEB_CLEAR_DISK_CACHE, ID_WEB_CLEAR_ALL_PROFILE, OnWebClear) // [Tools] menu ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport) @@ -129,6 +131,7 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon) ON_BN_CLICKED(IDC_FITTOWINDOW, OnBnClickedFitToWindow) ON_BN_CLICKED(IDC_SHOWDIFFERENCES, OnBnClickedShowDifferences) ON_BN_CLICKED(IDC_COMPARE, OnBnClickedCompare) + ON_BN_CLICKED(IDC_SYNC_EVENTS, OnBnClickedSyncEvents) ON_EN_CHANGE(IDC_WIDTH, OnEnChangeWidth) ON_EN_CHANGE(IDC_HEIGHT, OnEnChangeHeight) ON_EN_CHANGE(IDC_ZOOM, OnEnChangeZoom) @@ -138,6 +141,7 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon) ON_EN_KILLFOCUS(IDC_ZOOM, OnKillFocusBarControls) ON_EN_KILLFOCUS(IDC_USERAGENT, OnKillFocusBarControls) ON_NOTIFY(BCN_DROPDOWN, IDC_COMPARE, OnDropDownCompare) + ON_NOTIFY(BCN_DROPDOWN, IDC_SYNC_EVENTS, OnDropDownSyncEvents) // Status bar ON_UPDATE_COMMAND_UI(ID_STATUS_DIFFNUM, OnUpdateStatusNum) //}}AFX_MSG_MAP @@ -338,6 +342,9 @@ void CWebPageDiffFrame::OnWebDiffEvent(const WebDiffEvent& event) case WebDiffEvent::ZoomFactorChanged: UpdateWebPageDiffBar(); break; + case WebDiffEvent::CompareStateChanged: + UpdateLastCompareResult(); + break; } } @@ -614,6 +621,8 @@ void CWebPageDiffFrame::LoadOptions() m_pWebDiffWindow->SetShowDifferences(GetOptionsMgr()->GetBool(OPT_CMP_WEB_SHOWDIFFERENCES)); m_pWebDiffWindow->SetShowWordDifferences(GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT)); m_pWebDiffWindow->SetUserAgent(GetOptionsMgr()->GetString(OPT_CMP_WEB_USER_AGENT).c_str()); + m_pWebDiffWindow->SetSyncEvents(GetOptionsMgr()->GetBool(OPT_CMP_WEB_SYNC_EVENTS)); + m_pWebDiffWindow->SetSyncEventFlags(GetOptionsMgr()->GetInt(OPT_CMP_WEB_SYNC_EVENT_FLAGS)); COLORSETTINGS colors; IWebDiffWindow::ColorSettings colorSettings; Options::DiffColors::Load(GetOptionsMgr(), colors); @@ -871,7 +880,7 @@ int CWebPageDiffFrame::UpdateLastCompareResult() int result = -1; if (m_bCompareCompleted) { - result = m_pWebDiffWindow->GetDiffCount() > 0 ? 1 : 0; + result = (m_pWebDiffWindow->GetCompareState() == IWebDiffWindow::COMPARED) ? (m_pWebDiffWindow->GetDiffCount() > 0 ? 1 : 0) : -1; SetLastCompareResult(result); } return result; @@ -1076,6 +1085,24 @@ void CWebPageDiffFrame::OnDropDownCompare(NMHDR *pNMHDR, LRESULT *pResult) point.x, point.y, AfxGetMainWnd()); } +void CWebPageDiffFrame::OnBnClickedSyncEvents() +{ + CRect rc; + m_wndWebPageDiffBar.GetDlgItem(IDC_SYNC_EVENTS)->GetWindowRect(&rc); + CPoint point { rc.left, rc.bottom }; + BCMenu menuPopup; + menuPopup.LoadMenu(MAKEINTRESOURCE(IDR_POPUP_WEBPAGE_SYNC_EVENTS)); + theApp.TranslateMenu(menuPopup.m_hMenu); + BCMenu* pPopup = (BCMenu*)menuPopup.GetSubMenu(0); + pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, + point.x, point.y, AfxGetMainWnd()); +} + +void CWebPageDiffFrame::OnDropDownSyncEvents(NMHDR *pNMHDR, LRESULT *pResult) +{ + OnBnClickedSyncEvents(); +} + void CWebPageDiffFrame::OnEnChangeWidth() { if (m_bInUpdateWebPageDiffBar) @@ -1576,6 +1603,59 @@ void CWebPageDiffFrame::OnWebCompareResourceTrees() })); } +void CWebPageDiffFrame::OnWebSyncEvent(UINT nID) +{ + switch (nID) + { + case ID_WEB_SYNC_ENABLED: + m_pWebDiffWindow->SetSyncEvents(!m_pWebDiffWindow->GetSyncEvents()); + GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENTS, m_pWebDiffWindow->GetSyncEvents()); + break; + case ID_WEB_SYNC_SCROLL: + m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL, + !m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL)); + GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags()); + break; + case ID_WEB_SYNC_CLICK: + m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_CLICK, + !m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_CLICK)); + GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags()); + break; + case ID_WEB_SYNC_INPUT: + m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_INPUT, + !m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT)); + GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags()); + break; + case ID_WEB_SYNC_GOBACKFORWARD: + m_pWebDiffWindow->SetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD, + !m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD)); + GetOptionsMgr()->SaveOption(OPT_CMP_WEB_SYNC_EVENT_FLAGS, m_pWebDiffWindow->GetSyncEventFlags()); + break; + } +} + +void CWebPageDiffFrame::OnUpdateWebSyncEvent(CCmdUI* pCmdUI) +{ + switch (pCmdUI->m_nID) + { + case ID_WEB_SYNC_ENABLED: + pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEvents()); + break; + case ID_WEB_SYNC_SCROLL: + pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_SCROLL)); + break; + case ID_WEB_SYNC_CLICK: + pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_CLICK)); + break; + case ID_WEB_SYNC_INPUT: + pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_INPUT)); + break; + case ID_WEB_SYNC_GOBACKFORWARD: + pCmdUI->SetCheck(m_pWebDiffWindow->GetSyncEventFlag(IWebDiffWindow::EVENT_GOBACKFORWARD)); + break; + } +} + void CWebPageDiffFrame::OnWebClear(UINT nID) { IWebDiffWindow::BrowsingDataType dataKinds; diff --git a/Src/WebPageDiffFrm.h b/Src/WebPageDiffFrm.h index 9b01815fe2c..06d099092fb 100644 --- a/Src/WebPageDiffFrm.h +++ b/Src/WebPageDiffFrm.h @@ -190,6 +190,8 @@ class CWebPageDiffFrame : public CMergeFrameCommon,public IMergeDoc afx_msg void OnWebCompareHTMLs(); afx_msg void OnWebCompareTexts(); afx_msg void OnWebCompareResourceTrees(); + afx_msg void OnWebSyncEvent(UINT nID); + afx_msg void OnUpdateWebSyncEvent(CCmdUI* pCmdUI); afx_msg void OnWebClear(UINT nID); afx_msg void OnToolsGenerateReport(); afx_msg void OnRefresh(); @@ -198,12 +200,14 @@ class CWebPageDiffFrame : public CMergeFrameCommon,public IMergeDoc afx_msg void OnBnClickedFitToWindow(); afx_msg void OnBnClickedShowDifferences(); afx_msg void OnBnClickedCompare(); + afx_msg void OnBnClickedSyncEvents(); afx_msg void OnEnChangeWidth(); afx_msg void OnEnChangeHeight(); afx_msg void OnEnChangeZoom(); afx_msg void OnEnChangeUserAgent(); afx_msg void OnKillFocusBarControls(); afx_msg void OnDropDownCompare(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnDropDownSyncEvents(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Src/WinWebDiffLib.h b/Src/WinWebDiffLib.h index bc73c2b7311..cd5829469e3 100644 --- a/Src/WinWebDiffLib.h +++ b/Src/WinWebDiffLib.h @@ -6,7 +6,7 @@ struct WebDiffEvent { - enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, WebMessageReceived, TabChanged, HSCROLL, VSCROLL }; + enum EVENT_TYPE { ZoomFactorChanged, NewWindowRequested, WindowCloseRequested, NavigationStarting, FrameNavigationStarting, HistoryChanged, SourceChanged, DocumentTitleChanged, NavigationCompleted, FrameNavigationCompleted, WebMessageReceived, FrameWebMessageReceived, TabChanged, HSCROLL, VSCROLL, CompareStateChanged }; EVENT_TYPE type; int pane; }; @@ -55,6 +55,20 @@ struct IWebDiffWindow SETTINGS = ( 1 << 13 ), ALL_PROFILE = ( 1 << 14 ) }; + enum EventType + { + EVENT_NONE = 0, + EVENT_SCROLL = ( 1 << 0 ), + EVENT_CLICK = ( 1 << 1 ), + EVENT_INPUT = ( 1 << 2 ), + EVENT_GOBACKFORWARD = ( 1 << 3 ), + }; + enum CompareState + { + NOT_COMPARED, + COMPARING, + COMPARED, + }; struct DiffOptions { enum DiffAlgorithm { @@ -170,6 +184,13 @@ struct IWebDiffWindow virtual bool CanRedo() = 0; virtual const DiffOptions& GetDiffOptions() const = 0; virtual void SetDiffOptions(const DiffOptions& diffOptions) = 0; + virtual bool GetSyncEvents() const = 0; + virtual void SetSyncEvents(bool syncEvents) = 0; + virtual unsigned GetSyncEventFlags() const = 0; + virtual void SetSyncEventFlags(unsigned flags) = 0; + virtual bool GetSyncEventFlag(EventType event) const = 0; + virtual void SetSyncEventFlag(EventType event, bool flag) = 0; + virtual CompareState GetCompareState() const = 0; }; extern "C" diff --git a/Src/resource.h b/Src/resource.h index 4441805b33f..cacb76ba2d1 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -25,6 +25,7 @@ #define IDR_POPUP_IMG_CTXT 121 #define IDR_POPUP_PROJECT_DIFF_OPTIONS 122 #define IDR_POPUP_WEBPAGE_COMPARE 123 +#define IDR_POPUP_WEBPAGE_SYNC_EVENTS 124 #define IDD_ABOUTBOX 200 #define IDD_OPEN 202 #define IDD_SAVECLOSING 203 @@ -624,6 +625,7 @@ #define IDC_USERAGENT 1628 #define IDC_COMPARE 1630 #define IDC_SHOWDIFFERENCES 1631 +#define IDC_SYNC_EVENTS 1632 #define IDC_EDIT_WHOLE_WORD 8603 #define IDC_EDIT_MATCH_CASE 8604 #define IDC_EDIT_FINDTEXT 8605 @@ -1058,10 +1060,15 @@ #define ID_WEB_COMPARE_HTMLS 33762 #define ID_WEB_COMPARE_TEXTS 33763 #define ID_WEB_COMPARE_RESOURCETREES 33764 -#define ID_WEB_CLEAR_DISK_CACHE 33765 -#define ID_WEB_CLEAR_COOKIES 33766 -#define ID_WEB_CLEAR_BROWSING_HISTORY 33767 -#define ID_WEB_CLEAR_ALL_PROFILE 33768 +#define ID_WEB_SYNC_ENABLED 33765 +#define ID_WEB_SYNC_SCROLL 33766 +#define ID_WEB_SYNC_CLICK 33767 +#define ID_WEB_SYNC_INPUT 33768 +#define ID_WEB_SYNC_GOBACKFORWARD 33769 +#define ID_WEB_CLEAR_DISK_CACHE 33780 +#define ID_WEB_CLEAR_COOKIES 33781 +#define ID_WEB_CLEAR_BROWSING_HISTORY 33782 +#define ID_WEB_CLEAR_ALL_PROFILE 33783 #define ID_FILE_NEW_TABLE 34164 #define ID_FILE_NEW_HEX 34165 #define ID_FILE_NEW_IMAGE 34166 diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index fb17b504060..10da16a862f 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -245,6 +245,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 4e4f35e9fbc..0f92c64e840 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -273,6 +273,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 250c244ded1..2ebfa4cc103 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -244,6 +244,24 @@ msgstr "Tamanho" msgid "Fit to Window" msgstr "Ajustar à Janela" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Limpar Dados de Navegação" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index c9fefdfff08..099cbb6ac30 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -241,6 +241,24 @@ msgstr "" msgid "Fit to Window" msgstr "Запълване на прозореца" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index e7572de25fa..e2b16cdb0ea 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -270,6 +270,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index 7c4c18b143e..b3c3dba042c 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -248,6 +248,24 @@ msgstr "大小(&S)" msgid "Fit to Window" msgstr "窗口内显示" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "清除浏览数据(&B)" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 6d9f97fa5c0..ef3c1a1dcbf 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -272,6 +272,24 @@ msgstr "大小(&S)" msgid "Fit to Window" msgstr "自適應視窗(&F)" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "清除瀏覽資料(&B)" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 9a405019d26..0f02d3711d0 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -246,6 +246,24 @@ msgstr "&Dimensione" msgid "Fit to Window" msgstr "Adattà à a finestra" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "&Viutà i dati di navigazione" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index de7ef82dc2d..52a92b624a6 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -270,6 +270,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 0fd0b242c0f..c72c25441ff 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -270,6 +270,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 56617a42fb3..318c186fb4f 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -271,6 +271,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 4fb2108f87c..aed1aec093b 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -244,6 +244,24 @@ msgstr "Grootte" msgid "Fit to Window" msgstr "Passend op scherm" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Bladergegevens wissen" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index ec567270435..8278d168f29 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" -"POT-Creation-Date: 2023-11-06 23:04+0000\n" +"POT-Creation-Date: 2023-11-19 21:53+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -238,6 +238,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index 0f0ca8571e1..4355de8d044 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -244,6 +244,24 @@ msgstr "&Koko" msgid "Fit to Window" msgstr "Sovita ikkunaan" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Tyhjennä &selaustiedot" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 2fca5244f34..4b690cb82dc 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -278,6 +278,24 @@ msgstr "&Taille" msgid "Fit to Window" msgstr "Ajuster à la fenêtre" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Effacer les données de &navigation" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 4e008cd6bfb..f378c4fb5bd 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -245,6 +245,24 @@ msgstr "&Tamaño" msgid "Fit to Window" msgstr "Axustar á ventá" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "&Borrar datos de navegación" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 27e4d93f075..a44165af22f 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -273,6 +273,24 @@ msgstr "&Größe" msgid "Fit to Window" msgstr "An Fenster anpassen" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "&Browserdaten löschen" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index acafaeb8785..bd8fcac9ac2 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -269,6 +269,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 468277fcfa5..31badd4f502 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -272,6 +272,24 @@ msgstr "Méret" msgid "Fit to Window" msgstr "Ablakhoz igazít" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Böngészési adatok törlése" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index 81cd0bdb928..65587fba5d5 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -242,6 +242,24 @@ msgstr "&Dimensione" msgid "Fit to Window" msgstr "Adatta alla finestra" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Cancella i dati di &navigazione" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 7673c3c3dfa..4e02b5e66e4 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" "POT-Creation-Date: 2020-12-05 22:07+0000\n" -"PO-Revision-Date: 2023-11-06 23:06+0900\n" +"PO-Revision-Date: 2023-11-19 22:04+0900\n" "Last-Translator: Takashi Sawanaka \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -243,6 +243,24 @@ msgstr "サイズ(&S)" msgid "Fit to Window" msgstr "ウインドウに合わせる" +msgid "&Event Synchronization" +msgstr "イベント同期(&E)" + +msgid "&Enabled" +msgstr "有効(&E)" + +msgid "&Scroll" +msgstr "スクロール(&S)" + +msgid "&Click" +msgstr "クリック(&C)" + +msgid "&Input" +msgstr "入力(&I)" + +msgid "&GoBack/Forward" +msgstr "戻る/進む(&G)" + msgid "Clear &Browsing Data" msgstr "閲覧データのクリア(&B)" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 230a9b83920..3e12cca8fc7 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -279,6 +279,24 @@ msgstr "크기(&S)" msgid "Fit to Window" msgstr "창에 맞춤" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "검색 데이터 지우기(&B)" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index c9ef0a20e34..59ece271cd6 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -244,6 +244,24 @@ msgstr "Dydi&s" msgid "Fit to Window" msgstr "Talpinti į langą" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Išvalyti &Naršymo duomenis" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 96d4837c562..8541c151c43 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -243,6 +243,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 6dc9dada815..1e59177d5f7 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -271,6 +271,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 0e77c9b88c8..fe8a1c0afec 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -245,6 +245,24 @@ msgstr "Rozmiar" msgid "Fit to Window" msgstr "Dopasuj do okna" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Wyczyść dane przeglądania" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 2408c31569b..f489afa9abc 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -245,6 +245,24 @@ msgstr "Tamanho" msgid "Fit to Window" msgstr "Ajustar à janela" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Limpar dados de navegação" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 2d3c613f388..c4d571f7031 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -243,6 +243,24 @@ msgstr "Mărime" msgid "Fit to Window" msgstr "Ajustează la fereastră" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Șterge datele de navigare" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 48d5eaea23b..3d9d00917a4 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -246,6 +246,24 @@ msgstr "&Размер" msgid "Fit to Window" msgstr "Подогнать по окну" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Очистить &историю просмотров" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index c1418e13f16..3cbbd2a3be0 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -269,6 +269,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 43083993f2c..e1ca385f27e 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -270,6 +270,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index e498f7f1b0f..4e60ff04679 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -244,6 +244,24 @@ msgstr "" msgid "Fit to Window" msgstr "" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 9f6c550e7ef..3cead33066c 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -244,6 +244,24 @@ msgstr "&Velikost" msgid "Fit to Window" msgstr "Prilagodi oknu" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Počis&ti podatke brskanja" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 76fe40b7c2c..790d992d11b 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -247,6 +247,24 @@ msgstr "T&amaño" msgid "Fit to Window" msgstr "Ajustar a la ventana" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "&Borrar datos de navegación" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 2671afa4aeb..688f07f5abd 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -246,6 +246,24 @@ msgstr "Storlek" msgid "Fit to Window" msgstr "Passa till fönster" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Rensa bläddringshistorik" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index 0c3628ebf1e..18a9436ca81 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -242,6 +242,24 @@ msgstr "&அளவு" msgid "Fit to Window" msgstr "சாளரத்தில் பொருத்து" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "&உலாவல் தரவை அழி" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 3cdfcdc3a6f..8219b4b10c0 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -244,6 +244,24 @@ msgstr "&Boyut" msgid "Fit to Window" msgstr "&Pencereye sığdır" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "&Tarayıcı verilerini temizle" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index a65f39a8c68..2d3d901945c 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -254,6 +254,24 @@ msgstr "&Розмір" msgid "Fit to Window" msgstr "Припасувати до вікна" +msgid "&Event Synchronization" +msgstr "" + +msgid "&Enabled" +msgstr "" + +msgid "&Scroll" +msgstr "" + +msgid "&Click" +msgstr "" + +msgid "&Input" +msgstr "" + +msgid "&GoBack/Forward" +msgstr "" + msgid "Clear &Browsing Data" msgstr "Очистити історію &переглядів"