diff --git a/ColorSchemes/Default.ini b/ColorSchemes/Default.ini index 3abe005adcf..aeae5113501 100644 --- a/ColorSchemes/Default.ini +++ b/ColorSchemes/Default.ini @@ -91,3 +91,5 @@ Settings/UseDirCompareColors=1 Settings/WordDifferenceColor=11395825 Settings/WordDifferenceDeletedColor=8563455 Settings/WordDifferenceTextColor=0 +Settings/SysColorHookEnabled=0 +Settings/SysColorHookColors= diff --git a/ColorSchemes/Midnight.ini b/ColorSchemes/Midnight.ini index bebf6e88ffd..dda0d242ee7 100644 --- a/ColorSchemes/Midnight.ini +++ b/ColorSchemes/Midnight.ini @@ -138,7 +138,7 @@ Settings/MovedBlockTextColor=0xffffffff Settings/SNPColor=0x40210a Settings/SNPDeletedColor=0x251305 Settings/SNPTextColor=0xffffffff -Settings/SelectedDifferenceColor=0x2b2233 +Settings/SelectedDifferenceColor=0x2b2255 Settings/SelectedDifferenceDeletedColor=0x1b1223 Settings/SelectedDifferenceTextColor=0xffffffff Settings/SelectedMovedBlockColor=0x423607 @@ -157,3 +157,23 @@ Settings/UseDirCompareColors=1 Settings/WordDifferenceColor=0x25653d Settings/WordDifferenceDeletedColor=0xde000d Settings/WordDifferenceTextColor=0xffffffff +Settings/SysColorHookEnabled=1 +; System Colors +;2 0x005555 COLOR_ACTIVECAPTION +;3 0x003322 COLOR_INACTIVECAPTION +;5 0x111111 COLOR_WINDOW +;8 0xe0e2e0 COLOR_WINDOWTEXT +;9 0xe0e0e3 COLOR_CAPTIONTEXT +;12 0x1e1e1e COLOR_APPWORKSPACE +;13 0x007acc COLOR_HIGHLIGHT +;14 0xf1f1f1 COLOR_HIGHLIGHTTEXT +;15 0x222222 COLOR_3DFACE +;16 0x161616 COLOR_3DSHADOW +;17 0x555555 COLOR_GRAYTEXT +;18 0xe4e0e0 COLOR_BTNTEXT +;19 0xe0e5e0 COLOR_INACTIVECAPTIONTEXT +;20 0x333333 COLOR_3DHIGHLIGHT +;21 0x1e1e1e COLOR_3DDKSHADOW +;27 0x2a2a2a COLOR_GRADIENTACTIVECAPTION +;28 0x333333 COLOR_GRADIENTINACTIVECAPTION +Settings/SysColorHookColors=2:0x00005555,3:0x00003322,5:0x001e1e1e,8:0x00e2e0e0,9:0x00e3e0e0,12:0x001e1e1e,13:0x00007acc,14:0x00f1f1f1,15:0x00222222,16:0x00161616,17:0x00555555,18:0x00e4e0e0,19:0x00e5e0e0,20:0x00333333,21:0x001e1e1e,27:0x002a2a2a,28:0x00333333 diff --git a/ColorSchemes/Modern.ini b/ColorSchemes/Modern.ini index 2ff4ce03198..3b89be61d2d 100644 --- a/ColorSchemes/Modern.ini +++ b/ColorSchemes/Modern.ini @@ -91,3 +91,5 @@ Settings/UseDirCompareColors=1 Settings/WordDifferenceColor=11206570 Settings/WordDifferenceDeletedColor=10544800 Settings/WordDifferenceTextColor=-1 +Settings/SysColorHookEnabled=0 +Settings/SysColorHookColors= diff --git a/ColorSchemes/Solarized Dark.ini b/ColorSchemes/Solarized Dark.ini index f919e2202c8..b925bf277f3 100644 --- a/ColorSchemes/Solarized Dark.ini +++ b/ColorSchemes/Solarized Dark.ini @@ -138,7 +138,7 @@ Settings/MovedBlockTextColor=0xffffffff Settings/SNPColor=0x40210a Settings/SNPDeletedColor=0x251305 Settings/SNPTextColor=0xffffffff -Settings/SelectedDifferenceColor=0x2b2233 +Settings/SelectedDifferenceColor=0x2b2255 Settings/SelectedDifferenceDeletedColor=0x1b1223 Settings/SelectedDifferenceTextColor=0xffffffff Settings/SelectedMovedBlockColor=0x423607 @@ -157,3 +157,23 @@ Settings/UseDirCompareColors=1 Settings/WordDifferenceColor=0x25653d Settings/WordDifferenceDeletedColor=0x416036 Settings/WordDifferenceTextColor=0xffffffff +Settings/SysColorHookEnabled=1 +; System Colors +;2 0x005555 COLOR_ACTIVECAPTION +;3 0x003322 COLOR_INACTIVECAPTION +;5 0x111111 COLOR_WINDOW +;8 0xe0e2e0 COLOR_WINDOWTEXT +;9 0xe0e0e3 COLOR_CAPTIONTEXT +;12 0x1e1e1e COLOR_APPWORKSPACE +;13 0x007acc COLOR_HIGHLIGHT +;14 0xf1f1f1 COLOR_HIGHLIGHTTEXT +;15 0x222222 COLOR_3DFACE +;16 0x161616 COLOR_3DSHADOW +;17 0x555555 COLOR_GRAYTEXT +;18 0xe4e0e0 COLOR_BTNTEXT +;19 0xe0e5e0 COLOR_INACTIVECAPTIONTEXT +;20 0x333333 COLOR_3DHIGHLIGHT +;21 0x1e1e1e COLOR_3DDKSHADOW +;27 0x2a2a2a COLOR_GRADIENTACTIVECAPTION +;28 0x333333 COLOR_GRADIENTINACTIVECAPTION +Settings/SysColorHookColors=2:0x00005555,3:0x00003322,5:0x001e1e1e,8:0x00e2e0e0,9:0x00e3e0e0,12:0x001e1e1e,13:0x00007acc,14:0x00f1f1f1,15:0x00222222,16:0x00161616,17:0x00555555,18:0x00e4e0e0,19:0x00e5e0e0,20:0x00333333,21:0x001e1e1e,27:0x002a2a2a,28:0x00333333 diff --git a/ColorSchemes/Solarized Light.ini b/ColorSchemes/Solarized Light.ini index 0eec883891f..cc0ce92fd8a 100644 --- a/ColorSchemes/Solarized Light.ini +++ b/ColorSchemes/Solarized Light.ini @@ -157,3 +157,5 @@ Settings/UseDirCompareColors=1 Settings/WordDifferenceColor=0xaaffaa Settings/WordDifferenceDeletedColor=0xa0e6a0 Settings/WordDifferenceTextColor=0xffffffff +Settings/SysColorHookEnabled=0 +Settings/SysColorHookColors= diff --git a/Src/Common/IatHook.h b/Src/Common/IatHook.h new file mode 100644 index 00000000000..f846c282002 --- /dev/null +++ b/Src/Common/IatHook.h @@ -0,0 +1,116 @@ +/* This file is a modified version of IatHook.h from the win32-darkmode project + * (https://github.com/ysc3839/win32-darkmode) + * Original file: https://github.com/ysc3839/win32-darkmode/blob/master/win32-darkmode/IatHook.h + */ +// This file contains code from +// https://github.com/stevemk14ebr/PolyHook_2_0/blob/master/sources/IatHook.cpp +// which is licensed under the MIT License. +// See PolyHook_2_0-LICENSE for more information. + +#pragma once + +#if (NTDDI_VERSION <= NTDDI_WINXP) + +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR { + union { + DWORD AllAttributes; + struct { + DWORD RvaBased : 1; + DWORD ReservedAttributes : 31; + } DUMMYSTRUCTNAME; + } Attributes; + DWORD DllNameRVA; + DWORD ModuleHandleRVA; + DWORD ImportAddressTableRVA; + DWORD ImportNameTableRVA; + DWORD BoundImportAddressTableRVA; + DWORD UnloadInformationTableRVA; + DWORD TimeDateStamp; +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR; + +#endif + +template +constexpr T RVA2VA(T1 base, T2 rva) +{ + return reinterpret_cast(reinterpret_cast(base) + rva); +} + +template +constexpr T DataDirectoryFromModuleBase(void *moduleBase, size_t entryID) +{ + auto dosHdr = reinterpret_cast(moduleBase); + auto ntHdr = RVA2VA(moduleBase, dosHdr->e_lfanew); + auto dataDir = ntHdr->OptionalHeader.DataDirectory; + return RVA2VA(moduleBase, dataDir[entryID].VirtualAddress); +} + +PIMAGE_THUNK_DATA FindAddressByName(void *moduleBase, PIMAGE_THUNK_DATA impName, PIMAGE_THUNK_DATA impAddr, const char *funcName) +{ + for (; impName->u1.Ordinal; ++impName, ++impAddr) + { + if (IMAGE_SNAP_BY_ORDINAL(impName->u1.Ordinal)) + continue; + + auto import = RVA2VA(moduleBase, impName->u1.AddressOfData); + if (strcmp(reinterpret_cast(import->Name), funcName) != 0) + continue; + return impAddr; + } + return nullptr; +} + +PIMAGE_THUNK_DATA FindAddressByOrdinal(void *moduleBase, PIMAGE_THUNK_DATA impName, PIMAGE_THUNK_DATA impAddr, uint16_t ordinal) +{ + for (; impName->u1.Ordinal; ++impName, ++impAddr) + { + if (IMAGE_SNAP_BY_ORDINAL(impName->u1.Ordinal) && IMAGE_ORDINAL(impName->u1.Ordinal) == ordinal) + return impAddr; + } + return nullptr; +} + +PIMAGE_THUNK_DATA FindIatThunkInModule(void *moduleBase, const char *dllName, const char *funcName) +{ + auto imports = DataDirectoryFromModuleBase(moduleBase, IMAGE_DIRECTORY_ENTRY_IMPORT); + for (; imports->Name; ++imports) + { + if (_stricmp(RVA2VA(moduleBase, imports->Name), dllName) != 0) + continue; + + auto origThunk = RVA2VA(moduleBase, imports->OriginalFirstThunk); + auto thunk = RVA2VA(moduleBase, imports->FirstThunk); + return FindAddressByName(moduleBase, origThunk, thunk, funcName); + } + return nullptr; +} + +PIMAGE_THUNK_DATA FindDelayLoadThunkInModule(void *moduleBase, const char *dllName, const char *funcName) +{ + auto imports = DataDirectoryFromModuleBase(moduleBase, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT); + for (; imports->DllNameRVA; ++imports) + { + if (_stricmp(RVA2VA(moduleBase, imports->DllNameRVA), dllName) != 0) + continue; + + auto impName = RVA2VA(moduleBase, imports->ImportNameTableRVA); + auto impAddr = RVA2VA(moduleBase, imports->ImportAddressTableRVA); + return FindAddressByName(moduleBase, impName, impAddr, funcName); + } + return nullptr; +} + +PIMAGE_THUNK_DATA FindDelayLoadThunkInModule(void *moduleBase, const char *dllName, uint16_t ordinal) +{ + auto imports = DataDirectoryFromModuleBase(moduleBase, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT); + for (; imports->DllNameRVA; ++imports) + { + if (_stricmp(RVA2VA(moduleBase, imports->DllNameRVA), dllName) != 0) + continue; + + auto impName = RVA2VA(moduleBase, imports->ImportNameTableRVA); + auto impAddr = RVA2VA(moduleBase, imports->ImportAddressTableRVA); + return FindAddressByOrdinal(moduleBase, impName, impAddr, ordinal); + } + return nullptr; +} diff --git a/Src/Common/MessageBoxDialog.cpp b/Src/Common/MessageBoxDialog.cpp index 34a7a2882b3..970d48ed33d 100644 --- a/Src/Common/MessageBoxDialog.cpp +++ b/Src/Common/MessageBoxDialog.cpp @@ -512,6 +512,10 @@ BOOL CMessageBoxDialog::OnInitDialog ( ) CreateCheckboxControl(); CreateButtonControls(); + const COLORREF clrWindow = GetSysColor(COLOR_WINDOW); + if ((clrWindow & 0xff) + ((clrWindow >> 8) & 0xff) + (clrWindow > 16) < 0x80 * 3) + ::SetWindowTheme(::GetDlgItem(m_hWnd, IDCHECKBOX), _T(""), _T("")); + // Define the layout of the dialog. DefineLayout(); @@ -813,8 +817,9 @@ HBRUSH CMessageBoxDialog::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) if (nCtlColor == CTLCOLOR_STATIC) { pDC->SetBkMode(OPAQUE); + pDC->SetTextColor(pWnd->m_hWnd == ::GetDlgItem(m_hWnd, IDCHECKBOX) ? + ::GetSysColor(COLOR_WINDOWTEXT) : m_clrMainInstructionFont); pDC->SetBkColor(::GetSysColor(COLOR_WINDOW)); - pDC->SetTextColor(m_clrMainInstructionFont); return static_cast(GetSysColorBrush(COLOR_WINDOW)); } return __super::OnCtlColor(pDC, pWnd, nCtlColor); diff --git a/Src/Common/PreferencesDlg.cpp b/Src/Common/PreferencesDlg.cpp index 5b845459a36..5a151127b20 100644 --- a/Src/Common/PreferencesDlg.cpp +++ b/Src/Common/PreferencesDlg.cpp @@ -47,6 +47,7 @@ CPreferencesDlg::CPreferencesDlg(COptionsMgr *regOptions, SyntaxColors *colors, , m_pageSyntaxColors(regOptions, m_pSyntaxColors.get()) , m_pageMarkerColors(regOptions, m_pSyntaxColors.get()) , m_pageDirColors(regOptions) +, m_pageSysColors(regOptions) , m_pageArchive(regOptions) , m_pageCodepage(regOptions) , m_pageEditor(regOptions) @@ -119,6 +120,7 @@ BOOL CPreferencesDlg::OnInitDialog() AddPage(&m_pageTextColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_TEXTCOLORS); AddPage(&m_pageMarkerColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MARKERCOLORS); AddPage(&m_pageDirColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_DIRCOLORS); + AddPage(&m_pageSysColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_SYSCOLORS); AddPage(&m_pageArchive, IDS_OPTIONSPG_ARCHIVE); AddPage(&m_pageProject, IDS_OPTIONSPG_PROJECT); AddPage(&m_pageSystem, IDS_OPTIONSPG_SYSTEM); @@ -289,6 +291,7 @@ void CPreferencesDlg::ReadOptions(bool bUpdate) m_pageSyntaxColors.ReadOptions(); m_pageMarkerColors.ReadOptions(); m_pageDirColors.ReadOptions(); + m_pageSysColors.ReadOptions(); m_pageSystem.ReadOptions(); m_pageCompare.ReadOptions(); m_pageCompareFolder.ReadOptions(); @@ -315,6 +318,7 @@ void CPreferencesDlg::ReadOptions(bool bUpdate) SafeUpdatePage(&m_pageSyntaxColors, false); SafeUpdatePage(&m_pageMarkerColors, false); SafeUpdatePage(&m_pageDirColors, false); + SafeUpdatePage(&m_pageSysColors, false); SafeUpdatePage(&m_pageSystem, false); SafeUpdatePage(&m_pageCompare, false); SafeUpdatePage(&m_pageCompareFolder, false); @@ -356,6 +360,7 @@ void CPreferencesDlg::SaveOptions() m_pageSyntaxColors.WriteOptions(); m_pageMarkerColors.WriteOptions(); m_pageDirColors.WriteOptions(); + m_pageSysColors.WriteOptions(); m_pageCodepage.WriteOptions(); m_pageArchive.WriteOptions(); m_pageProject.WriteOptions(); diff --git a/Src/Common/PreferencesDlg.h b/Src/Common/PreferencesDlg.h index aebe4a8b990..98f00eb7fe0 100644 --- a/Src/Common/PreferencesDlg.h +++ b/Src/Common/PreferencesDlg.h @@ -23,6 +23,7 @@ #include "PropSyntaxColors.h" #include "PropMarkerColors.h" #include "PropDirColors.h" +#include "PropSysColors.h" #include "PropCodepage.h" #include "PropArchive.h" #include "PropProject.h" @@ -80,6 +81,7 @@ class CPreferencesDlg : public CTrDialog PropSyntaxColors m_pageSyntaxColors; PropMarkerColors m_pageMarkerColors; PropDirColors m_pageDirColors; + PropSysColors m_pageSysColors; PropArchive m_pageArchive; PropProject m_pageProject; PropBackups m_pageBackups; diff --git a/Src/Common/SysColorHook.cpp b/Src/Common/SysColorHook.cpp new file mode 100644 index 00000000000..8ea8ca477ce --- /dev/null +++ b/Src/Common/SysColorHook.cpp @@ -0,0 +1,162 @@ +/** + * @file SysColorHook.h + * + * @brief Provides functionality to hook the GetSysColor() API and return custom colors. + */ +// SPDX-License-Identifier: MIT +#include "stdafx.h" +#include "IatHook.h" +#include "SysColorHook.h" + +using fnGetSysColor = DWORD(WINAPI*)(int nIndex); +using fnGetSysColorBrush = HBRUSH(WINAPI*)(int nIndex); + +struct SysColor +{ + DWORD color; + HBRUSH brush; + bool isCustom; +} g_syscolor[COLOR_MENUBAR + 1]; + +static fnGetSysColor g_orgGetSysColor; +static fnGetSysColorBrush g_orgGetSysColorBrush; + +namespace SysColorHook +{ + +DWORD __stdcall MyGetSysColor(int nIndex) +{ + if (nIndex < 0 || nIndex >= static_cast(std::size(g_syscolor))) + return 0; + return g_syscolor[nIndex].color; +} + +HBRUSH __stdcall MyGetSysColorBrush(int nIndex) +{ + if (nIndex < 0 || nIndex >= static_cast(std::size(g_syscolor))) + return 0; + return g_syscolor[nIndex].brush; +} + +bool IsCustomSysColor(int nIndex) +{ + if (nIndex < 0 || nIndex >= static_cast(std::size(g_syscolor))) + return false; + return g_syscolor[nIndex].isCustom; +} + +size_t GetSysColorCount() +{ + return std::size(g_syscolor); +} + +unsigned GetOrgSysColor(int nIndex) +{ + if (!g_orgGetSysColor) + return GetSysColor(nIndex); + return g_orgGetSysColor(nIndex); +} + +uintptr_t ReplaceFunction(IMAGE_THUNK_DATA* addr, uintptr_t newFunction) +{ + DWORD oldProtect; + if (!VirtualProtect(addr, sizeof(IMAGE_THUNK_DATA), PAGE_READWRITE, &oldProtect)) + return 0; + uintptr_t oldFunction = addr->u1.Function; + addr->u1.Function = newFunction; + VirtualProtect(addr, sizeof(IMAGE_THUNK_DATA), oldProtect, &oldProtect); + return oldFunction; +} + +void Init() +{ + auto getSysColor = (g_orgGetSysColor ? g_orgGetSysColor : GetSysColor); + auto getSysColorBrush = (g_orgGetSysColorBrush ? g_orgGetSysColorBrush : GetSysColorBrush); + for (int i = 0; i < static_cast(std::size(g_syscolor)); ++i) + { + if (g_syscolor[i].isCustom) + DeleteObject(g_syscolor[i].brush); + g_syscolor[i].color = getSysColor(i); + g_syscolor[i].brush = getSysColorBrush(i); + g_syscolor[i].isCustom = false; + } +} + +bool Hook(void* moduleBase) +{ + auto addrGetSysColor = FindIatThunkInModule(moduleBase, "user32.dll", "GetSysColor"); + auto addrGetSysColorBrush = FindIatThunkInModule(moduleBase, "user32.dll", "GetSysColorBrush"); + if (!addrGetSysColor || !addrGetSysColorBrush) + return false; + auto orgGetSysColor = reinterpret_cast(ReplaceFunction(addrGetSysColor, reinterpret_cast(static_cast(MyGetSysColor)))); + if (!g_orgGetSysColor) + g_orgGetSysColor = orgGetSysColor; + auto orgGetSysColorBrush = reinterpret_cast(ReplaceFunction(addrGetSysColorBrush, reinterpret_cast(static_cast(MyGetSysColorBrush)))); + if (!g_orgGetSysColorBrush) + g_orgGetSysColorBrush = orgGetSysColorBrush; + return true; +} + +void Unhook(void* moduleBase) +{ + if (!g_orgGetSysColor) + return; + auto addrGetSysColor = FindIatThunkInModule(moduleBase, "user32.dll", "GetSysColor"); + auto addrGetSysColorBrush = FindIatThunkInModule(moduleBase, "user32.dll", "GetSysColorBrush"); + if (!addrGetSysColor || !addrGetSysColorBrush) + return; + ReplaceFunction(addrGetSysColor, reinterpret_cast(static_cast(g_orgGetSysColor))); + ReplaceFunction(addrGetSysColorBrush, reinterpret_cast(static_cast(g_orgGetSysColorBrush))); + g_orgGetSysColor = nullptr; + g_orgGetSysColorBrush = nullptr; +} + +void SetSysColor(int nIndex, unsigned color) +{ + if (nIndex < 0 || nIndex >= static_cast(std::size(g_syscolor))) + return; + if (g_syscolor[nIndex].color == color) + return; + if (g_syscolor[nIndex].isCustom) + DeleteObject(g_syscolor[nIndex].brush); + g_syscolor[nIndex].brush = CreateSolidBrush(color); + g_syscolor[nIndex].color = color; + g_syscolor[nIndex].isCustom = true; +} + +void Deserialize(const String& colorsStr, COLORREF* colors) +{ + auto sysColorMapping = strutils::split(colorsStr, ','); + for (auto&& sysColorEntry : sysColorMapping) + { + auto pair = strutils::split(sysColorEntry, ':'); + if (pair.size() == 2) + { + const int index = tc::ttoi(String(pair[0].data(), pair[0].length()).c_str()); + tchar_t* endptr = nullptr; + const String colorStr = String(pair[1].data(), pair[1].length()); + unsigned color = static_cast(tc::tcstoll(colorStr.c_str(), &endptr, + (colorStr.length() >= 2 && colorStr[1] == 'x') ? 16 : 10)); + if (colors) + colors[index] = color; + else + SysColorHook::SetSysColor(index, color); + } + } +} + +String Serialize() +{ + std::vector sysColorMapping; + const int count = static_cast(SysColorHook::GetSysColorCount()); + for (int i = 0; i < count; ++i) + { + if (g_syscolor[i].isCustom) + sysColorMapping.push_back(strutils::format(_T("%d:0x%08x"), i, g_syscolor[i].color)); + } + return strutils::join(sysColorMapping.begin(), sysColorMapping.end(), _T(",")); +} + +} + + diff --git a/Src/Common/SysColorHook.h b/Src/Common/SysColorHook.h new file mode 100644 index 00000000000..c60498a631c --- /dev/null +++ b/Src/Common/SysColorHook.h @@ -0,0 +1,20 @@ +/** + * @file SysColorHook.h + * + * @brief Provides functionality to hook the GetSysColor() API and return custom colors. + */ +#pragma once + +namespace SysColorHook +{ +void Init(); +bool Hook(void* moduleBase); +void Unhook(void* moduleBase); +void SetSysColor(int nIndex, unsigned color); +unsigned GetOrgSysColor(int nIndex); +bool IsCustomSysColor(int nIndex); +size_t GetSysColorCount(); +void Deserialize(const String& colorStr, COLORREF* colors = nullptr); +String Serialize(); + +} diff --git a/Src/Common/sizecbar.cpp b/Src/Common/sizecbar.cpp index e620311cce7..ea100457c40 100644 --- a/Src/Common/sizecbar.cpp +++ b/Src/Common/sizecbar.cpp @@ -84,6 +84,7 @@ BEGIN_MESSAGE_MAP(CSizingControlBar, baseCSizingControlBar) ON_WM_WINDOWPOSCHANGING() ON_WM_CAPTURECHANGED() ON_WM_SETTINGCHANGE() + ON_WM_SYSCOLORCHANGE() ON_WM_LBUTTONUP() ON_WM_MOUSEMOVE() ON_WM_NCLBUTTONDOWN() @@ -566,6 +567,11 @@ void CSizingControlBar::OnSettingChange(UINT uFlags, LPCTSTR lpszSection) m_bDragShowContent = !!bDragShowContent; } +void CSizingControlBar::OnSysColorChange() +{ + ::SetClassLongPtr(m_hWnd, GCLP_HBRBACKGROUND, (LONG_PTR)GetSysColorBrush(COLOR_BTNFACE)); +} + void CSizingControlBar::OnSize(UINT nType, int cx, int cy) { UNUSED_ALWAYS(nType); diff --git a/Src/Common/sizecbar.h b/Src/Common/sizecbar.h index 917f648b2dd..7c56808fd27 100644 --- a/Src/Common/sizecbar.h +++ b/Src/Common/sizecbar.h @@ -157,6 +157,7 @@ class CSizingControlBar : public baseCSizingControlBar afx_msg LRESULT OnNcHitTest(CPoint point); afx_msg void OnCaptureChanged(CWnd *pWnd); afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection); + afx_msg void OnSysColorChange(); afx_msg void OnLButtonUp(UINT nFlags, CPoint point); afx_msg void OnMouseMove(UINT nFlags, CPoint point); afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point); diff --git a/Src/FilepathEdit.cpp b/Src/FilepathEdit.cpp index 68e48a3a2f2..8b651acd762 100644 --- a/Src/FilepathEdit.cpp +++ b/Src/FilepathEdit.cpp @@ -34,6 +34,7 @@ BEGIN_MESSAGE_MAP(CFilepathEdit, CEdit) ON_WM_SETCURSOR() ON_WM_KILLFOCUS() ON_WM_LBUTTONDOWN() + ON_WM_SYSCOLORCHANGE() ON_COMMAND(ID_EDIT_COPY, OnEditCopy) ON_COMMAND(ID_EDIT_PASTE, OnEditPaste) ON_COMMAND(ID_EDIT_CUT, OnEditCut) @@ -574,3 +575,8 @@ void CFilepathEdit::SetTextColor(COLORREF rgb) //redraw Invalidate(TRUE); } + +void CFilepathEdit::OnSysColorChange() +{ + SetActive(GetActive()); +} diff --git a/Src/FilepathEdit.h b/Src/FilepathEdit.h index 1acfcc75ace..7a9ca050e96 100644 --- a/Src/FilepathEdit.h +++ b/Src/FilepathEdit.h @@ -53,6 +53,7 @@ public : afx_msg void OnEditUndo(); afx_msg void OnEditSelectAll(); afx_msg void OnContextMenuSelected(UINT nID); + afx_msg void OnSysColorChange(); HBRUSH CtlColor(CDC* pDC, UINT nCtlColor); DECLARE_MESSAGE_MAP(); diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 01fc283bbfd..20145434160 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1179,6 +1179,8 @@ void CMainFrame::OnHelpGnulicense() */ void CMainFrame::OnOptions() { + const bool sysColorHookEnabled = GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED); + const String sysColorsSerialized = GetOptionsMgr()->GetString(OPT_SYSCOLOR_HOOK_COLORS); // Using singleton shared syntax colors CPreferencesDlg dlg(GetOptionsMgr(), theApp.GetMainSyntaxColors()); INT_PTR rv = dlg.DoModal(); @@ -1226,6 +1228,14 @@ void CMainFrame::OnOptions() pHexMergeDoc->RefreshOptions(); for (auto pImgMergeFrame : GetAllImgMergeFrames()) pImgMergeFrame->RefreshOptions(); + + if (sysColorHookEnabled != GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED) || + sysColorsSerialized != GetOptionsMgr()->GetString(OPT_SYSCOLOR_HOOK_COLORS)) + { + theApp.ReloadCustomSysColors(); + AfxGetMainWnd()->SendMessage(WM_SYSCOLORCHANGE); + RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE | RDW_ALLCHILDREN); + } } } diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 64251667f43..d011bb3cd5d 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -65,6 +65,8 @@ #include "Win_VersionHelper.h" #include "BCMenu.h" #include "MouseHook.h" +#include "SysColorHook.h" +#include <../src/mfc/afximpl.h> #ifdef _DEBUG #define new DEBUG_NEW @@ -348,6 +350,7 @@ BOOL CMergeApp::InitInstance() // Initialize i18n (multiple language) support m_pLangDlg->InitializeLanguage((WORD)GetOptionsMgr()->GetInt(OPT_SELECTED_LANGUAGE)); + SysColorHook::Init(); charsets_init(); UpdateCodepageModule(); @@ -402,6 +405,8 @@ BOOL CMergeApp::InitInstance() } } + ReloadCustomSysColors(); + strdiff::Init(); // String diff init strdiff::SetBreakChars(GetOptionsMgr()->GetString(OPT_BREAK_SEPARATORS).c_str()); @@ -1761,3 +1766,13 @@ bool CMergeApp::WaitZombieThreads() } return terminated; } + +void CMergeApp::ReloadCustomSysColors() +{ + SysColorHook::Unhook(AfxGetInstanceHandle()); + SysColorHook::Deserialize(GetOptionsMgr()->GetString(OPT_SYSCOLOR_HOOK_COLORS)); + if (GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED)) + SysColorHook::Hook(AfxGetInstanceHandle()); + afxData.UpdateSysColors(); +} + diff --git a/Src/Merge.h b/Src/Merge.h index e2fdb9aab5f..1c850848722 100644 --- a/Src/Merge.h +++ b/Src/Merge.h @@ -132,6 +132,7 @@ class CMergeApp : public CWinApp void ApplyCommandLineConfigOptions(MergeCmdLineInfo & cmdInfo); bool ShowCompareAsMenu(MergeCmdLineInfo& cmdInfo); void ShowDialog(MergeCmdLineInfo::DialogType type); + void ReloadCustomSysColors(); // End MergeArgs.cpp diff --git a/Src/Merge.rc b/Src/Merge.rc index 084595d7754..86bff7ac7a9 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -350,7 +350,7 @@ BEGIN BEGIN POPUP "Ta&b Bar" BEGIN - MENUITEM "&View Tab Bar" ID_VIEW_TAB_BAR + MENUITEM "&View Tab Bar", ID_VIEW_TAB_BAR MENUITEM "&On Title Bar", ID_VIEW_TAB_BAR_ON_TITLE_BAR END POPUP "&Toolbar" @@ -495,7 +495,7 @@ BEGIN MENUITEM SEPARATOR POPUP "Ta&b Bar" BEGIN - MENUITEM "&View Tab Bar" ID_VIEW_TAB_BAR + MENUITEM "&View Tab Bar", ID_VIEW_TAB_BAR MENUITEM "&On Title Bar", ID_VIEW_TAB_BAR_ON_TITLE_BAR END POPUP "&Toolbar" @@ -735,7 +735,7 @@ BEGIN MENUITEM SEPARATOR POPUP "Ta&b Bar" BEGIN - MENUITEM "&View Tab Bar" ID_VIEW_TAB_BAR + MENUITEM "&View Tab Bar", ID_VIEW_TAB_BAR MENUITEM "&On Title Bar", ID_VIEW_TAB_BAR_ON_TITLE_BAR END POPUP "&Toolbar" @@ -1499,7 +1499,7 @@ BEGIN COMBOBOX IDC_AUTO_RELOAD_MODIFIED_FILES,7,178,270,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Language:",IDC_STATIC,7,193,270,10 COMBOBOX IDC_LANGUAGE_LIST,7,204,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96 @@ -1669,6 +1669,78 @@ BEGIN CONTROL "",IDC_SEL_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW,214,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END +IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 285, 242 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Dialog" +FONT 8, FONTNAME, 0, 0, 0x1 +BEGIN + RTEXT "Keywords:",IDC_STATIC,6,48,144,10 + RTEXT "Function names:",IDC_STATIC,7,66,144,10 + RTEXT "Comments:",IDC_STATIC,7,84,144,10 + RTEXT "Numbers:",IDC_STATIC,7,102,144,10 + RTEXT "Operators:",IDC_STATIC,7,120,144,10 + RTEXT "Strings:",IDC_STATIC,7,138,144,10 + RTEXT "Preprocessor:",IDC_STATIC,7,156,144,10 + RTEXT "User 1:",IDC_STATIC,7,174,144,10 + RTEXT "User 2:",IDC_STATIC,7,192,144,10 + CTEXT "Text",IDC_STATIC,144,30,50,10 + CONTROL "",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,48,55,10 + CONTROL "",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,66,55,10 + CONTROL "",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,84,55,10 + CONTROL "",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,102,55,10 + CONTROL "",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,120,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_OPERATORS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,120,55,10 + CONTROL "",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,138,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,138,55,10 + CONTROL "",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,156,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,156,55,10 + CONTROL "",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW | WS_TABSTOP,162,174,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,174,55,10 + CONTROL "",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW | WS_TABSTOP,162,192,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,192,55,10 +END + +IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 285, 242 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Dialog" +FONT 8, FONTNAME, 0, 0, 0x1 +BEGIN + CONTROL "&Use customized text colors",IDC_DEFAULT_STANDARD_COLORS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,234,10 + RTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,6,48,144,10 + RTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,6,66,144,10 + RTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,6,84,144,10 + CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,144,30,50,10 + CTEXT "Text",IDC_TEXT_COLUMN_LABEL,193,30,29,10 + CONTROL "",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_REGULAR_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_SELECTION_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_SELECTION_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,201,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_REGULAR_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,201,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + RTEXT "Margin:",IDC_MARGIN_COLOR_LABEL,6,102,144,10 + CONTROL "",IDC_MARGIN_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE +END + +IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 285, 242 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Dialog" +FONT 8, FONTNAME, 0, 0, 0x1 +BEGIN + RTEXT "Search Marker:",IDC_MARKER0_COLOR_LABEL,6,48,144,10 + RTEXT "User Defined Marker1:",IDC_MARKER1_COLOR_LABEL,6,66,144,10 + RTEXT "User Defined Marker2:",IDC_MARKER2_COLOR_LABEL,6,84,144,10 + RTEXT "User Defined Marker3:",IDC_MARKER3_COLOR_LABEL,6,102,144,10 + CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,144,30,50,10 + CONTROL "",IDC_MARKER0_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_MARKER1_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_MARKER2_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE + CONTROL "",IDC_MARKER3_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE +END + IDD_PROPPAGE_COLORS_DIR DIALOGEX 0, 0, 285, 242 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Colors" @@ -1694,6 +1766,17 @@ BEGIN CONTROL "",IDC_DIR_MARGIN_COLOR,"Button",BS_OWNERDRAW,162,120,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END +IDD_PROPPAGE_COLORS_SYSTEM DIALOGEX 0, 0, 285, 242 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Colors" +FONT 8, FONTNAME, 0, 0, 0x1 +BEGIN + CONTROL "&Use custom system colors (Some UI elements may not apply)",IDC_SYSCOLOR_HOOK_ENABLED, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,264,10 + COMBOBOX IDC_SYSCOLOR_NAME,6,30,144,93,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_SYSCOLOR,"Button",BS_OWNERDRAW,162,30,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE +END + IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 285, 242 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System" @@ -1712,7 +1795,7 @@ BEGIN CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,17,114,253,10 EDITTEXT IDC_TMPFOLDER_NAME,27,126,191,14,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,224,126,50,14 - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 190 @@ -1748,9 +1831,9 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, FONTNAME, 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_PANE0,0,2,160,12,ES_AUTOHSCROLL | ES_CENTER | ES_READONLY | NOT WS_TABSTOP - EDITTEXT IDC_STATIC_TITLE_PANE1,163,2,160,12,ES_AUTOHSCROLL | ES_CENTER | ES_READONLY | NOT WS_TABSTOP - EDITTEXT IDC_STATIC_TITLE_PANE2,326,2,0,12,ES_AUTOHSCROLL | ES_CENTER | ES_READONLY | NOT WS_TABSTOP + EDITTEXT IDC_STATIC_TITLE_PANE0,0,2,160,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + EDITTEXT IDC_STATIC_TITLE_PANE1,163,2,160,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + EDITTEXT IDC_STATIC_TITLE_PANE2,326,2,0,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP END IDD_DIRCOLS DIALOGEX 0, 0, 331, 163 @@ -1903,7 +1986,7 @@ BEGIN COMBOBOX IDC_BREAK_TYPE,36,94,234,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "W&ord break characters:",IDC_STATIC,24,112,246,10 EDITTEXT IDC_BREAK_CHARS,24,124,246,14,ES_AUTOHSCROLL - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_PROPPAGE_EDITOR_SYNTAX DIALOGEX 0, 0, 285, 242 @@ -1980,7 +2063,7 @@ BEGIN CONTROL "Detect codepage for text files with mlang.dll\nNeed to restart session.",IDC_DETECT_CODEPAGE2, "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,139,269,34 COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,175,247,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_PREFERENCES DIALOGEX 0, 0, 414, 280 @@ -1998,57 +2081,6 @@ BEGIN PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,72,257,60,14 END -IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 285, 242 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Dialog" -FONT 8, FONTNAME, 0, 0, 0x1 -BEGIN - RTEXT "Keywords:",IDC_STATIC,6,48,144,10 - RTEXT "Function names:",IDC_STATIC,7,66,144,10 - RTEXT "Comments:",IDC_STATIC,7,84,144,10 - RTEXT "Numbers:",IDC_STATIC,7,102,144,10 - RTEXT "Operators:",IDC_STATIC,7,120,144,10 - RTEXT "Strings:",IDC_STATIC,7,138,144,10 - RTEXT "Preprocessor:",IDC_STATIC,7,156,144,10 - RTEXT "User 1:",IDC_STATIC,7,174,144,10 - RTEXT "User 2:",IDC_STATIC,7,192,144,10 - CTEXT "Text",IDC_STATIC,144,30,50,10 - CONTROL "",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,48,55,10 - CONTROL "",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,66,55,10 - CONTROL "",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,84,55,10 - CONTROL "",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,102,55,10 - CONTROL "",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,120,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_OPERATORS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,120,55,10 - CONTROL "",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,138,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,138,55,10 - CONTROL "",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,156,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,156,55,10 - CONTROL "",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW | WS_TABSTOP,162,174,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,174,55,10 - CONTROL "",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW | WS_TABSTOP,162,192,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,192,55,10 -END - -IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 285, 242 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Dialog" -FONT 8, FONTNAME, 0, 0, 0x1 -BEGIN - RTEXT "Search Marker:",IDC_MARKER0_COLOR_LABEL,6,48,144,10 - RTEXT "User Defined Marker1:",IDC_MARKER1_COLOR_LABEL,6,66,144,10 - RTEXT "User Defined Marker2:",IDC_MARKER2_COLOR_LABEL,6,84,144,10 - RTEXT "User Defined Marker3:",IDC_MARKER3_COLOR_LABEL,6,102,144,10 - CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,144,30,50,10 - CONTROL "",IDC_MARKER0_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_MARKER1_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_MARKER2_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_MARKER3_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE -END - IDD_DIRCMP_REPORT DIALOGEX 0, 0, 268, 97 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Folder Compare Report" @@ -2088,7 +2120,7 @@ BEGIN CONTROL "&Enable archive file support",IDC_ARCHIVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,271,10 CONTROL "&Detect archive type from file signature",IDC_ARCHIVE_DETECTTYPE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,7,18,271,10 - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_PROPPAGE_PROJECT DIALOGEX 0, 0, 285, 242 @@ -2097,7 +2129,7 @@ FONT 8, FONTNAME, 0, 0, 0x1 BEGIN LTEXT "Items saved to or restored from the project file:",IDC_STATIC,7,10,270,10 CONTROL "",IDC_PROJECT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,22,270,76 - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 174 @@ -2264,27 +2296,6 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,165,154,66,18 END -IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 285, 242 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Dialog" -FONT 8, FONTNAME, 0, 0, 0x1 -BEGIN - CONTROL "&Use customized text colors",IDC_DEFAULT_STANDARD_COLORS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,234,10 - RTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,6,48,144,10 - RTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,6,66,144,10 - RTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,6,84,144,10 - CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,144,30,50,10 - CTEXT "Text",IDC_TEXT_COLUMN_LABEL,193,30,29,10 - CONTROL "",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_REGULAR_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_SELECTION_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_SELECTION_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,201,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "",IDC_REGULAR_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,201,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Margin:",IDC_MARGIN_COLOR_LABEL,6,102,144,10 - CONTROL "",IDC_MARGIN_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE -END - IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 285, 242 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Backup Files" @@ -2301,7 +2312,7 @@ BEGIN LTEXT "Backup filename:",IDC_STATIC,7,96,269,10 CONTROL "&Append .bak extension",IDC_BACKUP_APPEND_BAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,108,259,10 CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,120,259,10 - PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14 + PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14 END IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 115 @@ -2536,7 +2547,8 @@ BEGIN PUSHBUTTON "=",IDC_PLUGIN_PIPELINE_MENU,316,140,12,12 LTEXT "&Unpacked file extension:",IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC,8,156,98,10 EDITTEXT IDC_PLUGIN_UNPACKEDFILEEXTENSION,108,156,220,12,ES_AUTOHSCROLL - CONTROL "Enable &automatic unpacking/prediffing for the plugin",IDC_PLUGIN_AUTOMATIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,170,304,10 + CONTROL "Enable &automatic unpacking/prediffing for the plugin",IDC_PLUGIN_AUTOMATIC, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,170,304,10 CONTROL "&Require arguments",IDC_PLUGIN_ARGUMENTSREQUIRED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,182,304,10 CONTROL "&Generate editor script",IDC_PLUGIN_GENERATESCRIPT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,194,304,10 @@ -2587,10 +2599,26 @@ BEGIN BEGIN END + IDD_PROPPAGE_COLORS_SYNTAX, DIALOG + BEGIN + END + + IDD_PROPPAGE_COLORS_TEXT, DIALOG + BEGIN + END + + IDD_PROPPAGE_COLORS_MARKER, DIALOG + BEGIN + END + IDD_PROPPAGE_COLORS_DIR, DIALOG BEGIN END + IDD_PROPPAGE_COLORS_SYSTEM, DIALOG + BEGIN + END + IDD_PROPPAGE_SYSTEM, DIALOG BEGIN END @@ -2639,14 +2667,6 @@ BEGIN BEGIN END - IDD_PROPPAGE_COLORS_SYNTAX, DIALOG - BEGIN - END - - IDD_PROPPAGE_COLORS_MARKER, DIALOG - BEGIN - END - IDD_DIRCMP_REPORT, DIALOG BEGIN END @@ -2659,10 +2679,6 @@ BEGIN BEGIN END - IDD_PROPPAGE_COLORS_TEXT, DIALOG - BEGIN - END - IDD_PROPPAGE_BACKUPS, DIALOG BEGIN END @@ -2732,20 +2748,6 @@ BEGIN 0, 0, 100, 0 END -IDD_PROPPAGE_COLORS_MARKER AFX_DIALOG_LAYOUT -BEGIN - 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0 -END - IDD_EDIT_MARKER AFX_DIALOG_LAYOUT BEGIN 0, @@ -2927,25 +2929,56 @@ BEGIN 0, 0, 100, 0 END -IDD_PROPPAGE_COLORS_DIR AFX_DIALOG_LAYOUT +IDD_PROPPAGE_COLORS_WINMERGE AFX_DIALOG_LAYOUT BEGIN 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 0, 0, 100, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 0, 0, 100, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 0, 0, 100, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 0, 0, 100, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, + 100, 0, 0, 0, 100, 0, 0, 0 END @@ -3000,56 +3033,39 @@ BEGIN 100, 0, 0, 0 END -IDD_PROPPAGE_COLORS_WINMERGE AFX_DIALOG_LAYOUT +IDD_PROPPAGE_COLORS_MARKER AFX_DIALOG_LAYOUT BEGIN 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, 100, 0, 0, 0, 100, 0, 0, 0, + 100, 0, 0, 0 +END + +IDD_PROPPAGE_COLORS_DIR AFX_DIALOG_LAYOUT +BEGIN + 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, - 100, 0, 0, 0, - 100, 0, 0, 0, 0, 0, 100, 0, 100, 0, 0, 0, 100, 0, 0, 0, - 100, 0, 0, 0, + 0, 0, 100, 0, 100, 0, 0, 0 END @@ -3334,6 +3350,11 @@ BEGIN 0 END +IDD_PROPPAGE_COLORS_SYSTEM AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -3443,6 +3464,7 @@ BEGIN IDS_OPTIONSPG_SYNTAXCOLORS "Syntax" IDS_OPTIONSPG_MARKERCOLORS "Markers" IDS_OPTIONSPG_DIRCOLORS "Folder Compare" + IDS_OPTIONSPG_SYSCOLORS "System" IDS_OPTIONSPG_SYSTEM "System" IDS_OPTIONSPG_CODEPAGE "Codepage" IDS_OPTIONSPG_ARCHIVE "Archive Support" diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj index a264c02afc0..cf06881554e 100644 --- a/Src/Merge.vcxproj +++ b/Src/Merge.vcxproj @@ -922,6 +922,7 @@ pch.h $(IntDir)$(TargetName)2.pch + pch.h @@ -956,6 +957,7 @@ $(IntDir)$(TargetName)2.pch + pch.h $(IntDir)$(TargetName)2.pch @@ -1449,6 +1451,7 @@ + @@ -1475,6 +1478,7 @@ + diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters index 3fea5aeea7b..852075b10bd 100644 --- a/Src/Merge.vcxproj.filters +++ b/Src/Merge.vcxproj.filters @@ -741,6 +741,12 @@ MFCGui\Main\Source Files + + Source Files + + + MFCGui\PropertyPages\Source Files + @@ -1418,6 +1424,12 @@ MFCGui\Main\Header Files + + MFCGui\PropertyPages\Header Files + + + Header Files + diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h index 13290cae970..3729395da39 100644 --- a/Src/MergeAppLib.h +++ b/Src/MergeAppLib.h @@ -3,12 +3,12 @@ /* this ALWAYS GENERATED file contains the definitions for the interfaces */ - /* File created by MIDL compiler version 8.01.0628 */ -/* at Tue Jan 19 04:14:07 2038 + /* File created by MIDL compiler version 7.00.0555 */ +/* at Sun Sep 29 15:26:48 2024 */ /* Compiler settings for MergeAppLib.idl: - Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 - protocol : all , ms_ext, c_ext, robust + Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 + protocol : dce , ms_ext, c_ext, robust error checks: allocation ref bounds_check enum stub_data VC __declspec() decoration level: __declspec(uuid()), __declspec(selectany), __declspec(novtable) @@ -16,11 +16,12 @@ */ /* @@MIDL_FILE_HEADING( ) */ +#pragma warning( disable: 4049 ) /* more than 64k source lines */ /* verify that the version is high enough to compile this file*/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 500 +#define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif #include "rpc.h" @@ -28,7 +29,7 @@ #ifndef __RPCNDR_H_VERSION__ #error this stub requires an updated version of -#endif /* __RPCNDR_H_VERSION__ */ +#endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H #include "windows.h" @@ -42,27 +43,17 @@ #pragma once #endif -#ifndef DECLSPEC_XFGVIRT -#if defined(_CONTROL_FLOW_GUARD_XFG) -#define DECLSPEC_XFGVIRT(base, func) __declspec(xfg_virtual(base, func)) -#else -#define DECLSPEC_XFGVIRT(base, func) -#endif -#endif - /* Forward Declarations */ #ifndef __IMergeApp_FWD_DEFINED__ #define __IMergeApp_FWD_DEFINED__ typedef interface IMergeApp IMergeApp; - #endif /* __IMergeApp_FWD_DEFINED__ */ #ifndef __IMergeApp_FWD_DEFINED__ #define __IMergeApp_FWD_DEFINED__ typedef interface IMergeApp IMergeApp; - #endif /* __IMergeApp_FWD_DEFINED__ */ @@ -120,41 +111,34 @@ EXTERN_C const IID IID_IMergeApp; }; - #else /* C style interface */ typedef struct IMergeAppVtbl { BEGIN_INTERFACE - DECLSPEC_XFGVIRT(IUnknown, QueryInterface) HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IMergeApp * This, /* [in] */ REFIID riid, /* [annotation][iid_is][out] */ - _COM_Outptr_ void **ppvObject); + __RPC__deref_out void **ppvObject); - DECLSPEC_XFGVIRT(IUnknown, AddRef) ULONG ( STDMETHODCALLTYPE *AddRef )( IMergeApp * This); - DECLSPEC_XFGVIRT(IUnknown, Release) ULONG ( STDMETHODCALLTYPE *Release )( IMergeApp * This); - DECLSPEC_XFGVIRT(IDispatch, GetTypeInfoCount) HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( IMergeApp * This, /* [out] */ UINT *pctinfo); - DECLSPEC_XFGVIRT(IDispatch, GetTypeInfo) HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( IMergeApp * This, /* [in] */ UINT iTInfo, /* [in] */ LCID lcid, /* [out] */ ITypeInfo **ppTInfo); - DECLSPEC_XFGVIRT(IDispatch, GetIDsOfNames) HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( IMergeApp * This, /* [in] */ REFIID riid, @@ -163,46 +147,33 @@ EXTERN_C const IID IID_IMergeApp; /* [in] */ LCID lcid, /* [size_is][out] */ DISPID *rgDispId); - DECLSPEC_XFGVIRT(IDispatch, Invoke) /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( IMergeApp * This, - /* [annotation][in] */ - _In_ DISPID dispIdMember, - /* [annotation][in] */ - _In_ REFIID riid, - /* [annotation][in] */ - _In_ LCID lcid, - /* [annotation][in] */ - _In_ WORD wFlags, - /* [annotation][out][in] */ - _In_ DISPPARAMS *pDispParams, - /* [annotation][out] */ - _Out_opt_ VARIANT *pVarResult, - /* [annotation][out] */ - _Out_opt_ EXCEPINFO *pExcepInfo, - /* [annotation][out] */ - _Out_opt_ UINT *puArgErr); + /* [in] */ DISPID dispIdMember, + /* [in] */ REFIID riid, + /* [in] */ LCID lcid, + /* [in] */ WORD wFlags, + /* [out][in] */ DISPPARAMS *pDispParams, + /* [out] */ VARIANT *pVarResult, + /* [out] */ EXCEPINFO *pExcepInfo, + /* [out] */ UINT *puArgErr); - DECLSPEC_XFGVIRT(IMergeApp, Translate) /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Translate )( IMergeApp * This, /* [in] */ BSTR text, /* [retval][out] */ BSTR *pRet); - DECLSPEC_XFGVIRT(IMergeApp, GetOption) /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetOption )( IMergeApp * This, /* [in] */ BSTR name, /* [in] */ VARIANT varDefault, /* [retval][out] */ VARIANT *pRet); - DECLSPEC_XFGVIRT(IMergeApp, SaveOption) /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SaveOption )( IMergeApp * This, /* [in] */ BSTR name, /* [in] */ VARIANT varValue); - DECLSPEC_XFGVIRT(IMergeApp, MsgBox) /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *MsgBox )( IMergeApp * This, /* [in] */ BSTR prompt, @@ -210,7 +181,6 @@ EXTERN_C const IID IID_IMergeApp; /* [optional][in] */ VARIANT varTitle, /* [retval][out] */ int *pRet); - DECLSPEC_XFGVIRT(IMergeApp, InputBox) /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *InputBox )( IMergeApp * This, /* [in] */ BSTR prompt, @@ -218,7 +188,6 @@ EXTERN_C const IID IID_IMergeApp; /* [optional][in] */ VARIANT varDefault, /* [retval][out] */ BSTR *pRet); - DECLSPEC_XFGVIRT(IMergeApp, LogError) /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *LogError )( IMergeApp * This, /* [in] */ BSTR text); @@ -312,16 +281,6 @@ unsigned char * __RPC_USER VARIANT_UserMarshal( unsigned long *, unsigned char unsigned char * __RPC_USER VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * ); void __RPC_USER VARIANT_UserFree( unsigned long *, VARIANT * ); -unsigned long __RPC_USER BSTR_UserSize64( unsigned long *, unsigned long , BSTR * ); -unsigned char * __RPC_USER BSTR_UserMarshal64( unsigned long *, unsigned char *, BSTR * ); -unsigned char * __RPC_USER BSTR_UserUnmarshal64(unsigned long *, unsigned char *, BSTR * ); -void __RPC_USER BSTR_UserFree64( unsigned long *, BSTR * ); - -unsigned long __RPC_USER VARIANT_UserSize64( unsigned long *, unsigned long , VARIANT * ); -unsigned char * __RPC_USER VARIANT_UserMarshal64( unsigned long *, unsigned char *, VARIANT * ); -unsigned char * __RPC_USER VARIANT_UserUnmarshal64(unsigned long *, unsigned char *, VARIANT * ); -void __RPC_USER VARIANT_UserFree64( unsigned long *, VARIANT * ); - /* end of Additional Prototypes */ #ifdef __cplusplus diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h index fbf8d7a41db..d10e7f5da61 100644 --- a/Src/OptionsDef.h +++ b/Src/OptionsDef.h @@ -118,6 +118,10 @@ inline const String OPT_FILE_SIZE_THRESHOLD {_T("Settings/OPT_FILE_SIZE_THRESHOL inline const String OPT_AUTO_RELOAD_MODIFIED_FILES {_T("Settings/AutoReloadModifiedFiles"s)}; // Color options +// SysColor hook +inline const String OPT_SYSCOLOR_HOOK_ENABLED {_T("Settings/SysColorHookEnabled"s)}; +inline const String OPT_SYSCOLOR_HOOK_COLORS {_T("Settings/SysColorHookColors"s)}; + // The difference color inline const String OPT_CLR_DIFF {_T("Settings/DifferenceColor"s)}; // The selected difference color diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp index 81fdb0aa006..283425bf21e 100644 --- a/Src/OptionsInit.cpp +++ b/Src/OptionsInit.cpp @@ -244,6 +244,9 @@ void Init(COptionsMgr *pOptions) pOptions->InitOption(OPT_COLOR_SCHEME, _T("Default")); + pOptions->InitOption(OPT_SYSCOLOR_HOOK_ENABLED, false); + pOptions->InitOption(OPT_SYSCOLOR_HOOK_COLORS, _T("")); + Options::CustomColors::Init(pOptions); Options::DiffOptions::Init(pOptions); Options::DiffColors::Init(pOptions); diff --git a/Src/PropColorSchemes.cpp b/Src/PropColorSchemes.cpp index f8ea1df040b..3a530809a20 100644 --- a/Src/PropColorSchemes.cpp +++ b/Src/PropColorSchemes.cpp @@ -15,6 +15,7 @@ #include "DirTravel.h" #include "paths.h" #include "Environment.h" +#include "SysColorHook.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -109,7 +110,11 @@ void PropColorSchemes::OnCbnSelchangeColorSchemes() m_sColorScheme = sColorScheme; WriteOptions(); String path = paths::ConcatPath(GetColorSchemesFolder(), sColorScheme + _T(".ini")); - if (GetOptionsMgr()->ImportOptions(path) != COption::OPT_OK) + SysColorHook::Unhook(AfxGetInstanceHandle()); + auto result = GetOptionsMgr()->ImportOptions(path); + if (GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED)) + SysColorHook::Hook(AfxGetInstanceHandle()); + if (result != COption::OPT_OK) { LangMessageBox(IDS_OPT_IMPORT_ERR, MB_ICONWARNING); return; diff --git a/Src/PropSysColors.cpp b/Src/PropSysColors.cpp new file mode 100644 index 00000000000..f50f7063c92 --- /dev/null +++ b/Src/PropSysColors.cpp @@ -0,0 +1,166 @@ +/** + * @file PropSysColors.cpp + * + * @brief Implementation of PropSysColors propertysheet + */ + +#include "stdafx.h" +#include "PropSysColors.h" +#include "SysColorHook.h" +#include "OptionsDef.h" +#include "OptionsMgr.h" +#include "OptionsPanel.h" +#include "Merge.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + +/** + * @brief Default constructor. + */ +PropSysColors::PropSysColors(COptionsMgr *optionsMgr) + : OptionsPanel(optionsMgr, PropSysColors::IDD) + , m_bEnableSysColorHook(false) + , m_cSysColors() +{ +} + +void PropSysColors::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(PropSysColors) + DDX_Check(pDX, IDC_SYSCOLOR_HOOK_ENABLED, m_bEnableSysColorHook); + DDX_Control(pDX, IDC_SYSCOLOR_NAME, m_cboSysColorName); + DDX_Control(pDX, IDC_SYSCOLOR, m_btnSysColor); + UpdateControls(); + //}}AFX_DATA_MAP +} + + +BEGIN_MESSAGE_MAP(PropSysColors, OptionsPanel) + //{{AFX_MSG_MAP(PropSysColors) + ON_BN_CLICKED(IDC_SYSCOLOR_HOOK_ENABLED, OnBnClickedSysColorHookEnabled) + ON_CBN_SELCHANGE(IDC_SYSCOLOR_NAME, OnCbnSelchangeSysColorName) + ON_BN_CLICKED(IDC_SYSCOLOR, OnBnClickedSysColor) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +/** + * @brief Reads options values from storage to UI. + * (Property sheet calls this before displaying all property pages) + */ +void PropSysColors::ReadOptions() +{ + m_bEnableSysColorHook = GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED) ? true : false; + m_oldColors = GetOptionsMgr()->GetString(OPT_SYSCOLOR_HOOK_COLORS); + for (int i = 0; i < static_cast(m_cSysColors.size()); i++) + m_cSysColors[i] = SysColorHook::GetOrgSysColor(i); + SysColorHook::Deserialize(m_oldColors, m_cSysColors.data()); +} + +/** + * @brief Writes options values from UI to storage. + * (Property sheet calls this after displaying all property pages) + */ +void PropSysColors::WriteOptions() +{ + for (int i = 0; i < static_cast(m_cSysColors.size()); i++) + SysColorHook::SetSysColor(i, m_cSysColors[i]); + String newColors = SysColorHook::Serialize(); + GetOptionsMgr()->SaveOption(OPT_SYSCOLOR_HOOK_ENABLED, m_bEnableSysColorHook); + GetOptionsMgr()->SaveOption(OPT_SYSCOLOR_HOOK_COLORS, newColors); +} + +/** + * @brief Let user browse common color dialog, and select a color + */ +void PropSysColors::BrowseColor(CColorButton & colorButton) +{ + CColorDialog dialog(colorButton.GetColor()); + + if (dialog.DoModal() == IDOK) + { + colorButton.SetColor(dialog.GetColor()); + const int i = tc::ttoi(reinterpret_cast(GetDlgItemDataCurSel(IDC_SYSCOLOR_NAME))); + m_cSysColors[i] = dialog.GetColor(); + } +} + +/** + * @brief Called Updates controls enabled/disables state. + */ +void PropSysColors::UpdateControls() +{ + const bool enabled = IsDlgButtonChecked(IDC_SYSCOLOR_HOOK_ENABLED); + EnableDlgItem(IDC_SYSCOLOR_NAME, enabled); + EnableDlgItem(IDC_SYSCOLOR, enabled); + auto data = reinterpret_cast(GetDlgItemDataCurSel(IDC_SYSCOLOR_NAME)); + const int i = (data != -1) ? tc::ttoi(reinterpret_cast(data)) : 0; + m_btnSysColor.SetColor(m_cSysColors[i]); +} + +/** + * @brief Called before propertysheet is drawn. + */ +BOOL PropSysColors::OnInitDialog() +{ + OptionsPanel::OnInitDialog(); + + SetDlgItemComboBoxList(IDC_SYSCOLOR_NAME, + { +// { _T("COLOR_SCROLLBAR"), L"0" }, +// { _T("COLOR_DESKTOP"), L"1" }, + { _T("COLOR_ACTIVECAPTION"), L"2" }, + { _T("COLOR_INACTIVECAPTION"), L"3" }, +// { _T("COLOR_MENU"), L"4" }, + { _T("COLOR_WINDOW"), L"5" }, +// { _T("COLOR_WINDOWFRAME"), L"6" }, +// { _T("COLOR_MENUTEXT"), L"7" }, + { _T("COLOR_WINDOWTEXT"), L"8" }, + { _T("COLOR_CAPTIONTEXT"), L"9" }, +// { _T("COLOR_ACTIVEBORDER"), L"10" }, +// { _T("COLOR_INACTIVEBORDER"), L"11" }, + { _T("COLOR_APPWORKSPACE"), L"12" }, + { _T("COLOR_HIGHLIGHT"), L"13" }, + { _T("COLOR_HIGHLIGHTTEXT"), L"14" }, + { _T("COLOR_3DFACE"), L"15" }, + { _T("COLOR_3DSHADOW"), L"16" }, +// { _T("COLOR_GRAYTEXT"), L"17" }, + { _T("COLOR_BTNTEXT"), L"18" }, + { _T("COLOR_INACTIVECAPTIONTEXT"), L"19" }, + { _T("COLOR_3DHIGHLIGHT"), L"20" }, + { _T("COLOR_3DDKSHADOW"), L"21" }, +// { _T("COLOR_3DLIGHT"), L"22" }, +// { _T("COLOR_INFOTEXT"), L"23" }, +// { _T("COLOR_INFOBK"), L"24" }, +// { _T("COLOR_HOTLIGHT"), L"26" }, + { _T("COLOR_GRADIENTACTIVECAPTION"), L"27" }, + { _T("COLOR_GRADIENTINACTIVECAPTION"),L"28" }, +// { _T("COLOR_MENUHILIGHT"), L"29" }, +// { _T("COLOR_MENUBAR"), L"30" }, + }, L"2"); + + OnCbnSelchangeSysColorName(); + UpdateControls(); + + return TRUE; // return TRUE unless you set the focus to a control +} + +void PropSysColors::OnBnClickedSysColorHookEnabled() +{ + UpdateControls(); +} + +void PropSysColors::OnCbnSelchangeSysColorName() +{ + UpdateControls(); +} + +/** + * @brief User wants to change equal color + */ +void PropSysColors::OnBnClickedSysColor() +{ + BrowseColor(m_btnSysColor); +} diff --git a/Src/PropSysColors.h b/Src/PropSysColors.h new file mode 100644 index 00000000000..c325e3c49e2 --- /dev/null +++ b/Src/PropSysColors.h @@ -0,0 +1,61 @@ +/** + * @file PropSysColors.h + * + * @brief Declaration file for PropSysColors propertyheet + * + */ +#pragma once + +#include "ColorButton.h" +#include "OptionsPanel.h" +#include + +class COptionsMgr; + +/** @brief Property page for system colors options; used in options property sheet */ +class PropSysColors : public OptionsPanel +{ +// Construction +public: + explicit PropSysColors(COptionsMgr *optionsMgr); + +// Implement IOptionsPanel + virtual void ReadOptions() override; + virtual void WriteOptions() override; + +// Dialog Data +private: + //{{AFX_DATA(PropSysColors) + enum { IDD = IDD_PROPPAGE_COLORS_SYSTEM }; + CComboBox m_cboSysColorName; + CColorButton m_btnSysColor; + bool m_bEnableSysColorHook; + //}}AFX_DATA + + // Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(PropSysColors) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + + typedef enum { WRITE_OPTIONS, READ_OPTIONS } OPERATION; + + void UpdateControls(); + void BrowseColor(CColorButton & colorButton); + + std::array m_cSysColors; + String m_oldColors; + + // Generated message map functions + //{{AFX_MSG(PropSysColors) + afx_msg BOOL OnInitDialog() override; + afx_msg void OnBnClickedSysColorHookEnabled(); + afx_msg void OnCbnSelchangeSysColorName(); + afx_msg void OnBnClickedSysColor(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; diff --git a/Src/resource.h b/Src/resource.h index 944c88cc55c..1c29d562a51 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -63,30 +63,31 @@ #define IDD_PROPPAGE_BACKUPS 261 #define IDD_PROPPAGE_CODEPAGE 262 #define IDD_PROPPAGE_COLOR_SCHEMES 263 -#define IDD_PROPPAGE_COLORS_DIR 264 -#define IDD_PROPPAGE_COLORS_MARKER 265 -#define IDD_PROPPAGE_COLORS_SYNTAX 266 -#define IDD_PROPPAGE_COLORS_TEXT 267 -#define IDD_PROPPAGE_COLORS_WINMERGE 268 -#define IDD_PROPPAGE_COMPARE 269 -#define IDD_PROPPAGE_COMPARE_BINARY 270 -#define IDD_PROPPAGE_COMPARE_FOLDER 271 -#define IDD_PROPPAGE_COMPARE_IMAGE 272 -#define IDD_PROPPAGE_COMPARE_TABLE 273 -#define IDD_PROPPAGE_COMPARE_WEBPAGE 274 -#define IDD_PROPPAGE_EDITOR 275 -#define IDD_PROPPAGE_EDITOR_COMPAREMERGE 276 -#define IDD_PROPPAGE_EDITOR_SYNTAX 277 -#define IDD_PROPPAGE_GENERAL 278 -#define IDD_PROPPAGE_SHELL 279 -#define IDD_PROPPAGE_SYSTEM 280 -#define IDD_PROPPAGE_MESSAGEBOXES 281 -#define IDD_PROPPAGE_PROJECT 282 -#define IDD_EDIT_FIND 283 -#define IDD_EDIT_MARKER 284 -#define IDD_EDIT_REPLACE 285 -#define IDD_INPUTBOX 286 -#define IDD_PLUGINS_EDITPLUGIN 287 +#define IDD_PROPPAGE_COLORS_WINMERGE 264 +#define IDD_PROPPAGE_COLORS_SYNTAX 265 +#define IDD_PROPPAGE_COLORS_TEXT 266 +#define IDD_PROPPAGE_COLORS_MARKER 267 +#define IDD_PROPPAGE_COLORS_DIR 268 +#define IDD_PROPPAGE_COLORS_SYSTEM 269 +#define IDD_PROPPAGE_COMPARE 270 +#define IDD_PROPPAGE_COMPARE_BINARY 271 +#define IDD_PROPPAGE_COMPARE_FOLDER 272 +#define IDD_PROPPAGE_COMPARE_IMAGE 273 +#define IDD_PROPPAGE_COMPARE_TABLE 274 +#define IDD_PROPPAGE_COMPARE_WEBPAGE 275 +#define IDD_PROPPAGE_EDITOR 276 +#define IDD_PROPPAGE_EDITOR_COMPAREMERGE 277 +#define IDD_PROPPAGE_EDITOR_SYNTAX 278 +#define IDD_PROPPAGE_GENERAL 279 +#define IDD_PROPPAGE_SHELL 280 +#define IDD_PROPPAGE_SYSTEM 281 +#define IDD_PROPPAGE_MESSAGEBOXES 282 +#define IDD_PROPPAGE_PROJECT 283 +#define IDD_EDIT_FIND 284 +#define IDD_EDIT_MARKER 285 +#define IDD_EDIT_REPLACE 286 +#define IDD_INPUTBOX 287 +#define IDD_PLUGINS_EDITPLUGIN 288 #define IDI_ROTATE2 302 #define IDR_LOGO 307 #define IDR_SPLASH 308 @@ -533,9 +534,12 @@ #define IDC_DIR_ITEM_EQUAL_COLOR 1362 #define IDC_DIR_ITEM_EQUAL_TEXT_COLOR 1363 #define IDC_USE_DIR_COMPARE_COLORS 1364 -#define IDC_RENDERING_MODE 1368 -#define IDC_REGISTER_WINMERGECONTEXTMENU 1369 -#define IDC_UNREGISTER_WINMERGECONTEXTMENU 1370 +#define IDC_SYSCOLOR_HOOK_ENABLED 1365 +#define IDC_SYSCOLOR_NAME 1366 +#define IDC_SYSCOLOR 1367 +#define IDC_RENDERING_MODE 1369 +#define IDC_REGISTER_WINMERGECONTEXTMENU 1370 +#define IDC_UNREGISTER_WINMERGECONTEXTMENU 1371 #define IDC_RESET 1378 #define IDC_LEFT1 1379 #define IDC_MIDDLE1 1380 @@ -1241,12 +1245,13 @@ #define IDS_OPTIONSPG_IMAGECOMPARE 39059 #define IDS_OPTIONSPG_WEBPAGECOMPARE 39060 #define IDS_OPTIONSPG_DIRCOLORS 39061 -#define IDS_OPTIONSPG_COLOR_SCHEMES 39062 -#define IDS_OPTIONSPG_GENEDITOR 39063 -#define IDS_OPTIONSPG_EDITOR_COMPAREMERGE 39064 -#define IDS_OPTIONSPG_EDITOR_SYNTAX 39065 -#define IDS_OPTIONSPG_MESSAGEBOXES 39066 -#define IDS_OPTIONSPG_PROJECT 39067 +#define IDS_OPTIONSPG_SYSCOLORS 39062 +#define IDS_OPTIONSPG_COLOR_SCHEMES 39063 +#define IDS_OPTIONSPG_GENEDITOR 39064 +#define IDS_OPTIONSPG_EDITOR_COMPAREMERGE 39065 +#define IDS_OPTIONSPG_EDITOR_SYNTAX 39066 +#define IDS_OPTIONSPG_MESSAGEBOXES 39067 +#define IDS_OPTIONSPG_PROJECT 39068 #define IDS_TO 40000 #define IDS_FROM_LEFT 40001 #define IDS_TO_LEFT 40002 diff --git a/Testing/GoogleTest/GUITests/OptionsDialogTest.cpp b/Testing/GoogleTest/GUITests/OptionsDialogTest.cpp index 1fcc4d5745c..2f6b52fd3b7 100644 --- a/Testing/GoogleTest/GUITests/OptionsDialogTest.cpp +++ b/Testing/GoogleTest/GUITests/OptionsDialogTest.cpp @@ -105,17 +105,19 @@ TEST_P(OptionsDialogTest, Pages) saveForegroundDialogImage("Colors/Markers"); selectCategory(hwndDlg, 19); saveForegroundDialogImage("Colors/FolderCompare"); - selectCategory(hwndDlg, 19); - saveForegroundDialogImage("Archive Support"); + selectCategory(hwndDlg, 20); + saveForegroundDialogImage("Colors/System"); selectCategory(hwndDlg, 21); - saveForegroundDialogImage("Project"); + saveForegroundDialogImage("Archive Support"); selectCategory(hwndDlg, 22); - saveForegroundDialogImage("System"); + saveForegroundDialogImage("Project"); selectCategory(hwndDlg, 23); - saveForegroundDialogImage("Backup Files"); + saveForegroundDialogImage("System"); selectCategory(hwndDlg, 24); - saveForegroundDialogImage("Codepage"); + saveForegroundDialogImage("Backup Files"); selectCategory(hwndDlg, 25); + saveForegroundDialogImage("Codepage"); + selectCategory(hwndDlg, 26); saveForegroundDialogImage("Shell Integration"); typeText(L"\x1b"); waitUntilClose(hwndDlg); diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index bd2804343f4..62ad1a19613 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -1458,6 +1458,66 @@ msgstr "الاختلافات على مستوى الكلمة:" msgid "Selected Word Diff:" msgstr "المقارنة على مستوى الكلمة المحددة:" +msgid "Dialog" +msgstr "حوار" + +msgid "Keywords:" +msgstr "الكلمات المفتاحية:" + +msgid "Function names:" +msgstr "اسماء الدوال:" + +msgid "Comments:" +msgstr "التعليقات:" + +msgid "Numbers:" +msgstr "الأرقام:" + +msgid "Operators:" +msgstr "العوامل:" + +msgid "Strings:" +msgstr "الإعدادات:" + +msgid "Preprocessor:" +msgstr "المعالج التمهيدي:" + +msgid "User 1:" +msgstr "المستخدم 1:" + +msgid "User 2:" +msgstr "المستخدم 2:" + +msgid "Bold" +msgstr "الخط العريض" + +msgid "&Use customized text colors" +msgstr "ا&ستخدام ألوان مخصصة للنص" + +msgid "Whitespace:" +msgstr "مساحة بيضاء (فارغة):" + +msgid "Regular text:" +msgstr "نص عادي:" + +msgid "Selection:" +msgstr "التحديد:" + +msgid "Margin:" +msgstr "الهامش:" + +msgid "Search Marker:" +msgstr "علامات البحث:" + +msgid "User Defined Marker1:" +msgstr "العلامات المعرفة من قبل المستخدم 1:" + +msgid "User Defined Marker2:" +msgstr "العلامات المعرفة من قبل المستخدم 2:" + +msgid "User Defined Marker3:" +msgstr "العلامات المعرفة من قبل المستخدم 3:" + msgid "&Use folder compare colors" msgstr "استخدم الألوان في مقارنة المجلدات" @@ -1473,8 +1533,8 @@ msgstr "العناصر غير مكتملة:" msgid "Items filtered:" msgstr "العناصر التي تمت حصرها بالمرشح:" -msgid "Margin:" -msgstr "الهامش:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "النظام" @@ -1791,51 +1851,6 @@ msgstr "استيراد..." msgid "Export..." msgstr "تصدير..." -msgid "Dialog" -msgstr "حوار" - -msgid "Keywords:" -msgstr "الكلمات المفتاحية:" - -msgid "Function names:" -msgstr "اسماء الدوال:" - -msgid "Comments:" -msgstr "التعليقات:" - -msgid "Numbers:" -msgstr "الأرقام:" - -msgid "Operators:" -msgstr "العوامل:" - -msgid "Strings:" -msgstr "الإعدادات:" - -msgid "Preprocessor:" -msgstr "المعالج التمهيدي:" - -msgid "User 1:" -msgstr "المستخدم 1:" - -msgid "User 2:" -msgstr "المستخدم 2:" - -msgid "Bold" -msgstr "الخط العريض" - -msgid "Search Marker:" -msgstr "علامات البحث:" - -msgid "User Defined Marker1:" -msgstr "العلامات المعرفة من قبل المستخدم 1:" - -msgid "User Defined Marker2:" -msgstr "العلامات المعرفة من قبل المستخدم 2:" - -msgid "User Defined Marker3:" -msgstr "العلامات المعرفة من قبل المستخدم 3:" - msgid "Folder Compare Report" msgstr "تقرير مقارنة المجلدات" @@ -1983,18 +1998,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -msgid "&Use customized text colors" -msgstr "ا&ستخدام ألوان مخصصة للنص" - -msgid "Whitespace:" -msgstr "مساحة بيضاء (فارغة):" - -msgid "Regular text:" -msgstr "نص عادي:" - -msgid "Selection:" -msgstr "التحديد:" - msgid "Backup Files" msgstr "ملفات النسخ الاحتياطي" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 3d04454eb39..f40cc776b28 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -1757,6 +1757,86 @@ msgstr "Hitz Ezberdintasuna:" msgid "Selected Word Diff:" msgstr "Hautatutako Hitz Ezberd:" +#, c-format +msgid "Dialog" +msgstr "Elkarrizketa" + +#, c-format +msgid "Keywords:" +msgstr "Lasterteklak:" + +#, c-format +msgid "Function names:" +msgstr "Eginkizun izenak:" + +#, c-format +msgid "Comments:" +msgstr "Aipamenak:" + +#, c-format +msgid "Numbers:" +msgstr "Zenbakiak:" + +#, c-format +msgid "Operators:" +msgstr "Eragileak:" + +#, c-format +msgid "Strings:" +msgstr "Kateak:" + +#, c-format +msgid "Preprocessor:" +msgstr "Aurreprozesapena:" + +#, c-format +msgid "User 1:" +msgstr "1 Erabiltzailea:" + +#, c-format +msgid "User 2:" +msgstr "2 Erabiltzailea:" + +#, c-format +msgid "Bold" +msgstr "Lodia" + +#, c-format +msgid "&Use customized text colors" +msgstr "&Erabili norbere idazki margoak" + +#, c-format +msgid "Whitespace:" +msgstr "Zurigunea:" + +#, c-format +msgid "Regular text:" +msgstr "Idazki arrunta:" + +#, c-format +msgid "Selection:" +msgstr "Hautapena:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1772,8 +1852,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2164,66 +2243,6 @@ msgstr "Inportatu" msgid "Export..." msgstr "Esportatu..." -#, c-format -msgid "Dialog" -msgstr "Elkarrizketa" - -#, c-format -msgid "Keywords:" -msgstr "Lasterteklak:" - -#, c-format -msgid "Function names:" -msgstr "Eginkizun izenak:" - -#, c-format -msgid "Comments:" -msgstr "Aipamenak:" - -#, c-format -msgid "Numbers:" -msgstr "Zenbakiak:" - -#, c-format -msgid "Operators:" -msgstr "Eragileak:" - -#, c-format -msgid "Strings:" -msgstr "Kateak:" - -#, c-format -msgid "Preprocessor:" -msgstr "Aurreprozesapena:" - -#, c-format -msgid "User 1:" -msgstr "1 Erabiltzailea:" - -#, c-format -msgid "User 2:" -msgstr "2 Erabiltzailea:" - -#, c-format -msgid "Bold" -msgstr "Lodia" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Agiritegi Alderaketa Jakinarazpena" @@ -2410,22 +2429,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "&Erabili norbere idazki margoak" - -#, c-format -msgid "Whitespace:" -msgstr "Zurigunea:" - -#, c-format -msgid "Regular text:" -msgstr "Idazki arrunta:" - -#, c-format -msgid "Selection:" -msgstr "Hautapena:" - #, c-format msgid "Backup Files" msgstr "Babeskopia Agiriak" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 92b631b1aa1..1fb285bef0c 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -1455,6 +1455,66 @@ msgstr "Diferença das Palavras:" msgid "Selected Word Diff:" msgstr "Diferenciação das Palavras Selecionadas:" +msgid "Dialog" +msgstr "Diálogo" + +msgid "Keywords:" +msgstr "Palavras-chave:" + +msgid "Function names:" +msgstr "Nomes das funções:" + +msgid "Comments:" +msgstr "Comentários:" + +msgid "Numbers:" +msgstr "Números:" + +msgid "Operators:" +msgstr "Operadores:" + +msgid "Strings:" +msgstr "Strings:" + +msgid "Preprocessor:" +msgstr "Pré-processador:" + +msgid "User 1:" +msgstr "Usuário 1:" + +msgid "User 2:" +msgstr "Usuário 2:" + +msgid "Bold" +msgstr "Negrito" + +msgid "&Use customized text colors" +msgstr "&Usar cores de texto personalizadas" + +msgid "Whitespace:" +msgstr "Espaço em branco:" + +msgid "Regular text:" +msgstr "Texto regular:" + +msgid "Selection:" +msgstr "Seleção:" + +msgid "Margin:" +msgstr "Margem:" + +msgid "Search Marker:" +msgstr "Procurar Marcador:" + +msgid "User Defined Marker1:" +msgstr "Marcador Definido pelo Usuário 1:" + +msgid "User Defined Marker2:" +msgstr "Marcador Definido pelo Usuário 2:" + +msgid "User Defined Marker3:" +msgstr "Marcador Definido pelo Usuário 3:" + msgid "&Use folder compare colors" msgstr "&Usar cores pra comparar as pastas" @@ -1470,8 +1530,8 @@ msgstr "Itens não existentes:" msgid "Items filtered:" msgstr "Itens filtrados:" -msgid "Margin:" -msgstr "Margem:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistema" @@ -1782,51 +1842,6 @@ msgstr "Importar..." msgid "Export..." msgstr "Exportar..." -msgid "Dialog" -msgstr "Diálogo" - -msgid "Keywords:" -msgstr "Palavras-chave:" - -msgid "Function names:" -msgstr "Nomes das funções:" - -msgid "Comments:" -msgstr "Comentários:" - -msgid "Numbers:" -msgstr "Números:" - -msgid "Operators:" -msgstr "Operadores:" - -msgid "Strings:" -msgstr "Strings:" - -msgid "Preprocessor:" -msgstr "Pré-processador:" - -msgid "User 1:" -msgstr "Usuário 1:" - -msgid "User 2:" -msgstr "Usuário 2:" - -msgid "Bold" -msgstr "Negrito" - -msgid "Search Marker:" -msgstr "Procurar Marcador:" - -msgid "User Defined Marker1:" -msgstr "Marcador Definido pelo Usuário 1:" - -msgid "User Defined Marker2:" -msgstr "Marcador Definido pelo Usuário 2:" - -msgid "User Defined Marker3:" -msgstr "Marcador Definido pelo Usuário 3:" - msgid "Folder Compare Report" msgstr "Relatório sobre a Comparação das Pastas" @@ -1974,18 +1989,6 @@ msgstr "&Permitir linhas novas nas citações" msgid "&Quote character:" msgstr "&Caractere de citação:" -msgid "&Use customized text colors" -msgstr "&Usar cores de texto personalizadas" - -msgid "Whitespace:" -msgstr "Espaço em branco:" - -msgid "Regular text:" -msgstr "Texto regular:" - -msgid "Selection:" -msgstr "Seleção:" - msgid "Backup Files" msgstr "Arquivos de Backup" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 30baaf3413e..2f791ece834 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -1452,6 +1452,66 @@ msgstr "Различия в думи:" msgid "Selected Word Diff:" msgstr "В избраните думи:" +msgid "Dialog" +msgstr "Диалог" + +msgid "Keywords:" +msgstr "Ключови думи:" + +msgid "Function names:" +msgstr "Имена на функции:" + +msgid "Comments:" +msgstr "Коментари:" + +msgid "Numbers:" +msgstr "Числа:" + +msgid "Operators:" +msgstr "Оператори:" + +msgid "Strings:" +msgstr "Низове:" + +msgid "Preprocessor:" +msgstr "Предпроцесор:" + +msgid "User 1:" +msgstr "Потребител 1:" + +msgid "User 2:" +msgstr "Потребител 2:" + +msgid "Bold" +msgstr "Получер" + +msgid "&Use customized text colors" +msgstr "&Задаване на цветове за текст" + +msgid "Whitespace:" +msgstr "Интервали:" + +msgid "Regular text:" +msgstr "Нормален текст:" + +msgid "Selection:" +msgstr "Избран:" + +msgid "Margin:" +msgstr "Поле:" + +msgid "Search Marker:" +msgstr "При търсене:" + +msgid "User Defined Marker1:" +msgstr "Маркер 1:" + +msgid "User Defined Marker2:" +msgstr "Маркер 2:" + +msgid "User Defined Marker3:" +msgstr "Маркер 3:" + msgid "&Use folder compare colors" msgstr "&Задаване на цветове при сравняване на папки" @@ -1467,8 +1527,8 @@ msgstr "Несъществуващи елементи:" msgid "Items filtered:" msgstr "Филтрирани елементи:" -msgid "Margin:" -msgstr "Поле:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Системни" @@ -1787,51 +1847,6 @@ msgstr "Внасяне…" msgid "Export..." msgstr "Изнасяне…" -msgid "Dialog" -msgstr "Диалог" - -msgid "Keywords:" -msgstr "Ключови думи:" - -msgid "Function names:" -msgstr "Имена на функции:" - -msgid "Comments:" -msgstr "Коментари:" - -msgid "Numbers:" -msgstr "Числа:" - -msgid "Operators:" -msgstr "Оператори:" - -msgid "Strings:" -msgstr "Низове:" - -msgid "Preprocessor:" -msgstr "Предпроцесор:" - -msgid "User 1:" -msgstr "Потребител 1:" - -msgid "User 2:" -msgstr "Потребител 2:" - -msgid "Bold" -msgstr "Получер" - -msgid "Search Marker:" -msgstr "При търсене:" - -msgid "User Defined Marker1:" -msgstr "Маркер 1:" - -msgid "User Defined Marker2:" -msgstr "Маркер 2:" - -msgid "User Defined Marker3:" -msgstr "Маркер 3:" - msgid "Folder Compare Report" msgstr "Отчет за сравняване на папки" @@ -1979,18 +1994,6 @@ msgstr "Разрешаване на нов ред в &кавичките" msgid "&Quote character:" msgstr "&Знак за кавички:" -msgid "&Use customized text colors" -msgstr "&Задаване на цветове за текст" - -msgid "Whitespace:" -msgstr "Интервали:" - -msgid "Regular text:" -msgstr "Нормален текст:" - -msgid "Selection:" -msgstr "Избран:" - msgid "Backup Files" msgstr "Резервни файлове" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 7c7246120c2..f68a8c5e4cf 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -1755,6 +1755,86 @@ msgstr "Paraula diferent:" msgid "Selected Word Diff:" msgstr "Paraula diferent seleccionada:" +#, c-format +msgid "Dialog" +msgstr "Diàleg" + +#, c-format +msgid "Keywords:" +msgstr "Paraules clau:" + +#, c-format +msgid "Function names:" +msgstr "Noms de funció:" + +#, c-format +msgid "Comments:" +msgstr "Comentaris:" + +#, c-format +msgid "Numbers:" +msgstr "Nombres:" + +#, c-format +msgid "Operators:" +msgstr "Operadors:" + +#, c-format +msgid "Strings:" +msgstr "Cadenes:" + +#, c-format +msgid "Preprocessor:" +msgstr "Preprocessador:" + +#, c-format +msgid "User 1:" +msgstr "Usuari 1:" + +#, c-format +msgid "User 2:" +msgstr "Usuari 2:" + +#, c-format +msgid "Bold" +msgstr "Negreta" + +#, c-format +msgid "&Use customized text colors" +msgstr "&Usa colors de text personalitzats" + +#, c-format +msgid "Whitespace:" +msgstr "Espais:" + +#, c-format +msgid "Regular text:" +msgstr "Text regular:" + +#, c-format +msgid "Selection:" +msgstr "Selecció:" + +#, c-format +msgid "Margin:" +msgstr "Marge:" + +#, c-format +msgid "Search Marker:" +msgstr "Marcador de cerca:" + +#, c-format +msgid "User Defined Marker1:" +msgstr "Marcador definit per l'usuari1:" + +#, c-format +msgid "User Defined Marker2:" +msgstr "Marcador definit per l'usuari2:" + +#, c-format +msgid "User Defined Marker3:" +msgstr "Marcador definit per l'usuari3:" + msgid "&Use folder compare colors" msgstr "&Usa colors comparació de carpetes" @@ -1770,9 +1850,8 @@ msgstr "Elements que no existeixen en tots:" msgid "Items filtered:" msgstr "Elements filtrats:" -#, c-format -msgid "Margin:" -msgstr "Marge:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" #, c-format msgid "System" @@ -2169,66 +2248,6 @@ msgstr "Importa..." msgid "Export..." msgstr "Exporta..." -#, c-format -msgid "Dialog" -msgstr "Diàleg" - -#, c-format -msgid "Keywords:" -msgstr "Paraules clau:" - -#, c-format -msgid "Function names:" -msgstr "Noms de funció:" - -#, c-format -msgid "Comments:" -msgstr "Comentaris:" - -#, c-format -msgid "Numbers:" -msgstr "Nombres:" - -#, c-format -msgid "Operators:" -msgstr "Operadors:" - -#, c-format -msgid "Strings:" -msgstr "Cadenes:" - -#, c-format -msgid "Preprocessor:" -msgstr "Preprocessador:" - -#, c-format -msgid "User 1:" -msgstr "Usuari 1:" - -#, c-format -msgid "User 2:" -msgstr "Usuari 2:" - -#, c-format -msgid "Bold" -msgstr "Negreta" - -#, c-format -msgid "Search Marker:" -msgstr "Marcador de cerca:" - -#, c-format -msgid "User Defined Marker1:" -msgstr "Marcador definit per l'usuari1:" - -#, c-format -msgid "User Defined Marker2:" -msgstr "Marcador definit per l'usuari2:" - -#, c-format -msgid "User Defined Marker3:" -msgstr "Marcador definit per l'usuari3:" - #, c-format msgid "Folder Compare Report" msgstr "Informe de comparació de directoris" @@ -2415,22 +2434,6 @@ msgstr "Permet salts de línia entre cometes" msgid "&Quote character:" msgstr "Caràcter de cometes:" -#, c-format -msgid "&Use customized text colors" -msgstr "&Usa colors de text personalitzats" - -#, c-format -msgid "Whitespace:" -msgstr "Espais:" - -#, c-format -msgid "Regular text:" -msgstr "Text regular:" - -#, c-format -msgid "Selection:" -msgstr "Selecció:" - #, c-format msgid "Backup Files" msgstr "Fitxers de còpia de seguretat" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index 1791f033077..b4381e90dca 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -1461,6 +1461,66 @@ msgstr "单词差异：" msgid "Selected Word Diff:" msgstr "选中的单词差异：" +msgid "Dialog" +msgstr "对话框" + +msgid "Keywords:" +msgstr "关键字：" + +msgid "Function names:" +msgstr "函数名：" + +msgid "Comments:" +msgstr "注释：" + +msgid "Numbers:" +msgstr "数字：" + +msgid "Operators:" +msgstr "操作符：" + +msgid "Strings:" +msgstr "字符串：" + +msgid "Preprocessor:" +msgstr "预处理指令：" + +msgid "User 1:" +msgstr "用户定义 1：" + +msgid "User 2:" +msgstr "用户定义 2：" + +msgid "Bold" +msgstr "加粗" + +msgid "&Use customized text colors" +msgstr "使用自定义的文字颜色(&U)" + +msgid "Whitespace:" +msgstr "空白：" + +msgid "Regular text:" +msgstr "普通文本：" + +msgid "Selection:" +msgstr "选中区域：" + +msgid "Margin:" +msgstr "边缘：" + +msgid "Search Marker:" +msgstr "搜索标记：" + +msgid "User Defined Marker1:" +msgstr "用户定义的标记1：" + +msgid "User Defined Marker2:" +msgstr "用户定义的标记2：" + +msgid "User Defined Marker3:" +msgstr "用户定义的标记3：" + msgid "&Use folder compare colors" msgstr "使用文件夹比较颜色(&U)" @@ -1476,8 +1536,8 @@ msgstr "并非都存在的项目：" msgid "Items filtered:" msgstr "过滤的项目：" -msgid "Margin:" -msgstr "边缘：" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "系统" @@ -1799,51 +1859,6 @@ msgstr "导入..." msgid "Export..." msgstr "导出..." -msgid "Dialog" -msgstr "对话框" - -msgid "Keywords:" -msgstr "关键字：" - -msgid "Function names:" -msgstr "函数名：" - -msgid "Comments:" -msgstr "注释：" - -msgid "Numbers:" -msgstr "数字：" - -msgid "Operators:" -msgstr "操作符：" - -msgid "Strings:" -msgstr "字符串：" - -msgid "Preprocessor:" -msgstr "预处理指令：" - -msgid "User 1:" -msgstr "用户定义 1：" - -msgid "User 2:" -msgstr "用户定义 2：" - -msgid "Bold" -msgstr "加粗" - -msgid "Search Marker:" -msgstr "搜索标记：" - -msgid "User Defined Marker1:" -msgstr "用户定义的标记1：" - -msgid "User Defined Marker2:" -msgstr "用户定义的标记2：" - -msgid "User Defined Marker3:" -msgstr "用户定义的标记3：" - msgid "Folder Compare Report" msgstr "文件夹比较报告" @@ -1991,18 +2006,6 @@ msgstr "允许引号内换行(&A)" msgid "&Quote character:" msgstr "引号字符(&Q)：" -msgid "&Use customized text colors" -msgstr "使用自定义的文字颜色(&U)" - -msgid "Whitespace:" -msgstr "空白：" - -msgid "Regular text:" -msgstr "普通文本：" - -msgid "Selection:" -msgstr "选中区域：" - msgid "Backup Files" msgstr "备份文件" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 4cf4ec49f4b..43890f3c855 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -1764,6 +1764,87 @@ msgstr "字層次的差異：" msgid "Selected Word Diff:" msgstr "已選取的字的差異：" +#, c-format +msgid "Dialog" +msgstr "對話" + +#, c-format +msgid "Keywords:" +msgstr "關鍵字：" + +#, c-format +msgid "Function names:" +msgstr "函數名：" + +#, c-format +msgid "Comments:" +msgstr "註：" + +#, c-format +msgid "Numbers:" +msgstr "數字：" + +#, c-format +msgid "Operators:" +msgstr "運算子：" + +#, c-format +msgid "Strings:" +msgstr "字串：" + +# What is preprocessor? Is it prediffer? The term "preprocessor" cannot be found elsewhere. +#, c-format +msgid "Preprocessor:" +msgstr "前處理器：" + +#, c-format +msgid "User 1:" +msgstr "使用者 1：" + +#, c-format +msgid "User 2:" +msgstr "使用者 2：" + +#, c-format +msgid "Bold" +msgstr "粗體" + +#, c-format +msgid "&Use customized text colors" +msgstr "使用自訂文字色彩 (&U)" + +#, c-format +msgid "Whitespace:" +msgstr "空白：" + +#, c-format +msgid "Regular text:" +msgstr "類型表式文：" + +#, c-format +msgid "Selection:" +msgstr "選取：" + +#, c-format +msgid "Margin:" +msgstr "邊距：" + +#, c-format +msgid "Search Marker:" +msgstr "搜尋標記：" + +#, c-format +msgid "User Defined Marker1:" +msgstr "使用者自定義標記1：" + +#, c-format +msgid "User Defined Marker2:" +msgstr "使用者自定義標記2：" + +#, c-format +msgid "User Defined Marker3:" +msgstr "使用者自定義標記3：" + msgid "&Use folder compare colors" msgstr "使用資料夾比較顏色(&U)" @@ -1779,9 +1860,8 @@ msgstr "所有項目不存在：" msgid "Items filtered:" msgstr "篩選項目：" -#, c-format -msgid "Margin:" -msgstr "邊距：" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" #, c-format msgid "System" @@ -2178,67 +2258,6 @@ msgstr "匯入..." msgid "Export..." msgstr "匯出..." -#, c-format -msgid "Dialog" -msgstr "對話" - -#, c-format -msgid "Keywords:" -msgstr "關鍵字：" - -#, c-format -msgid "Function names:" -msgstr "函數名：" - -#, c-format -msgid "Comments:" -msgstr "註：" - -#, c-format -msgid "Numbers:" -msgstr "數字：" - -#, c-format -msgid "Operators:" -msgstr "運算子：" - -#, c-format -msgid "Strings:" -msgstr "字串：" - -# What is preprocessor? Is it prediffer? The term "preprocessor" cannot be found elsewhere. -#, c-format -msgid "Preprocessor:" -msgstr "前處理器：" - -#, c-format -msgid "User 1:" -msgstr "使用者 1：" - -#, c-format -msgid "User 2:" -msgstr "使用者 2：" - -#, c-format -msgid "Bold" -msgstr "粗體" - -#, c-format -msgid "Search Marker:" -msgstr "搜尋標記：" - -#, c-format -msgid "User Defined Marker1:" -msgstr "使用者自定義標記1：" - -#, c-format -msgid "User Defined Marker2:" -msgstr "使用者自定義標記2：" - -#, c-format -msgid "User Defined Marker3:" -msgstr "使用者自定義標記3：" - #, c-format msgid "Folder Compare Report" msgstr "比較目錄後的報告" @@ -2425,22 +2444,6 @@ msgstr "允許引號中的新行字元 (&A)" msgid "&Quote character:" msgstr "引號字元 (&Q)：" -#, c-format -msgid "&Use customized text colors" -msgstr "使用自訂文字色彩 (&U)" - -#, c-format -msgid "Whitespace:" -msgstr "空白：" - -#, c-format -msgid "Regular text:" -msgstr "類型表式文：" - -#, c-format -msgid "Selection:" -msgstr "選取：" - #, c-format msgid "Backup Files" msgstr "備份檔案" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 76e2b9517f1..368cd429d33 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -1457,6 +1457,66 @@ msgstr "Sfarenza di parolla :" msgid "Selected Word Diff:" msgstr "Sfarenza di parolla selezziunata :" +msgid "Dialog" +msgstr "Dialogu" + +msgid "Keywords:" +msgstr "Parolle chjave :" + +msgid "Function names:" +msgstr "Nomi di funzione :" + +msgid "Comments:" +msgstr "Cummenti :" + +msgid "Numbers:" +msgstr "Numeri :" + +msgid "Operators:" +msgstr "Operatori :" + +msgid "Strings:" +msgstr "Catene :" + +msgid "Preprocessor:" +msgstr "Preprucessore :" + +msgid "User 1:" +msgstr "Utilizatore 1 :" + +msgid "User 2:" +msgstr "Utilizatore 2 :" + +msgid "Bold" +msgstr "Grassu" + +msgid "&Use customized text colors" +msgstr "&Impiegà culori persunalizati per u testu" + +msgid "Whitespace:" +msgstr "Spaziu biancu :" + +msgid "Regular text:" +msgstr "Testu nurmale :" + +msgid "Selection:" +msgstr "Selezzione :" + +msgid "Margin:" +msgstr "Margine :" + +msgid "Search Marker:" +msgstr "Marcatore di ricerca :" + +msgid "User Defined Marker1:" +msgstr "Marcatore 1 definitu da l’utilizatore :" + +msgid "User Defined Marker2:" +msgstr "Marcatore 2 definitu da l’utilizatore :" + +msgid "User Defined Marker3:" +msgstr "Marcatore 3 definitu da l’utilizatore :" + msgid "&Use folder compare colors" msgstr "&Impiegà i culori di paragone di cartulare" @@ -1472,8 +1532,8 @@ msgstr "Elementi inesistenti :" msgid "Items filtered:" msgstr "Elementi filtrati :" -msgid "Margin:" -msgstr "Margine :" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistema" @@ -1792,51 +1852,6 @@ msgstr "Impurtà…" msgid "Export..." msgstr "Espurtà…" -msgid "Dialog" -msgstr "Dialogu" - -msgid "Keywords:" -msgstr "Parolle chjave :" - -msgid "Function names:" -msgstr "Nomi di funzione :" - -msgid "Comments:" -msgstr "Cummenti :" - -msgid "Numbers:" -msgstr "Numeri :" - -msgid "Operators:" -msgstr "Operatori :" - -msgid "Strings:" -msgstr "Catene :" - -msgid "Preprocessor:" -msgstr "Preprucessore :" - -msgid "User 1:" -msgstr "Utilizatore 1 :" - -msgid "User 2:" -msgstr "Utilizatore 2 :" - -msgid "Bold" -msgstr "Grassu" - -msgid "Search Marker:" -msgstr "Marcatore di ricerca :" - -msgid "User Defined Marker1:" -msgstr "Marcatore 1 definitu da l’utilizatore :" - -msgid "User Defined Marker2:" -msgstr "Marcatore 2 definitu da l’utilizatore :" - -msgid "User Defined Marker3:" -msgstr "Marcatore 3 definitu da l’utilizatore :" - msgid "Folder Compare Report" msgstr "Raportu di paragone di cartulare" @@ -1984,18 +1999,6 @@ msgstr "&Permette i salti di linea in e citazioni" msgid "&Quote character:" msgstr "&Caratteru di citazione :" -msgid "&Use customized text colors" -msgstr "&Impiegà culori persunalizati per u testu" - -msgid "Whitespace:" -msgstr "Spaziu biancu :" - -msgid "Regular text:" -msgstr "Testu nurmale :" - -msgid "Selection:" -msgstr "Selezzione :" - msgid "Backup Files" msgstr "Schedarii di salvaguardia" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 7054cba522e..b2abf890a28 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -1754,6 +1754,86 @@ msgstr "Različite riječi:" msgid "Selected Word Diff:" msgstr "Razlike označene riječi:" +#, c-format +msgid "Dialog" +msgstr "Dijalog" + +#, c-format +msgid "Keywords:" +msgstr "Ključne riječi:" + +#, c-format +msgid "Function names:" +msgstr "Nazivi funkcija:" + +#, c-format +msgid "Comments:" +msgstr "Komentari:" + +#, c-format +msgid "Numbers:" +msgstr "Brojevi:" + +#, c-format +msgid "Operators:" +msgstr "Operatori:" + +#, c-format +msgid "Strings:" +msgstr "Pojmovi:" + +#, c-format +msgid "Preprocessor:" +msgstr "Predobrađeno:" + +#, c-format +msgid "User 1:" +msgstr "Korisnik 1:" + +#, c-format +msgid "User 2:" +msgstr "Korisnik 2:" + +#, c-format +msgid "Bold" +msgstr "Podebljano" + +#, c-format +msgid "&Use customized text colors" +msgstr "&Koristi odabrane boje" + +#, c-format +msgid "Whitespace:" +msgstr "Skriveni znaci i razmaci:" + +#, c-format +msgid "Regular text:" +msgstr "Pravilan tekst" + +#, c-format +msgid "Selection:" +msgstr "Odabir:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1769,8 +1849,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2162,66 +2241,6 @@ msgstr "Uvoz..." msgid "Export..." msgstr "Izvoz..." -#, c-format -msgid "Dialog" -msgstr "Dijalog" - -#, c-format -msgid "Keywords:" -msgstr "Ključne riječi:" - -#, c-format -msgid "Function names:" -msgstr "Nazivi funkcija:" - -#, c-format -msgid "Comments:" -msgstr "Komentari:" - -#, c-format -msgid "Numbers:" -msgstr "Brojevi:" - -#, c-format -msgid "Operators:" -msgstr "Operatori:" - -#, c-format -msgid "Strings:" -msgstr "Pojmovi:" - -#, c-format -msgid "Preprocessor:" -msgstr "Predobrađeno:" - -#, c-format -msgid "User 1:" -msgstr "Korisnik 1:" - -#, c-format -msgid "User 2:" -msgstr "Korisnik 2:" - -#, c-format -msgid "Bold" -msgstr "Podebljano" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Izvještaj usporedbe mapa" @@ -2408,22 +2427,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "&Koristi odabrane boje" - -#, c-format -msgid "Whitespace:" -msgstr "Skriveni znaci i razmaci:" - -#, c-format -msgid "Regular text:" -msgstr "Pravilan tekst" - -#, c-format -msgid "Selection:" -msgstr "Odabir:" - #, c-format msgid "Backup Files" msgstr "Sigurnost" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index e2d0f476088..d1c83e665c4 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -1754,6 +1754,86 @@ msgstr "Rozdílné slovo:" msgid "Selected Word Diff:" msgstr "Vybrané rozdílné slovo:" +#, c-format +msgid "Dialog" +msgstr "Syntaxe" + +#, c-format +msgid "Keywords:" +msgstr "Klíčová slova:" + +#, c-format +msgid "Function names:" +msgstr "Názvy funkcí:" + +#, c-format +msgid "Comments:" +msgstr "Komentáře:" + +#, c-format +msgid "Numbers:" +msgstr "Čísla:" + +#, c-format +msgid "Operators:" +msgstr "Operátory:" + +#, c-format +msgid "Strings:" +msgstr "Řetězce:" + +#, c-format +msgid "Preprocessor:" +msgstr "Preprocesor:" + +#, c-format +msgid "User 1:" +msgstr "Uživatelská 1:" + +#, c-format +msgid "User 2:" +msgstr "Uživatelská 2:" + +#, c-format +msgid "Bold" +msgstr "Tučné" + +#, c-format +msgid "&Use customized text colors" +msgstr "Po&užít vlastní barvy textu" + +#, c-format +msgid "Whitespace:" +msgstr "Okolí textu:" + +#, c-format +msgid "Regular text:" +msgstr "Řádný text:" + +#, c-format +msgid "Selection:" +msgstr "Výběr:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1769,8 +1849,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2162,66 +2241,6 @@ msgstr "&Načíst..." msgid "Export..." msgstr "&Uložit..." -#, c-format -msgid "Dialog" -msgstr "Syntaxe" - -#, c-format -msgid "Keywords:" -msgstr "Klíčová slova:" - -#, c-format -msgid "Function names:" -msgstr "Názvy funkcí:" - -#, c-format -msgid "Comments:" -msgstr "Komentáře:" - -#, c-format -msgid "Numbers:" -msgstr "Čísla:" - -#, c-format -msgid "Operators:" -msgstr "Operátory:" - -#, c-format -msgid "Strings:" -msgstr "Řetězce:" - -#, c-format -msgid "Preprocessor:" -msgstr "Preprocesor:" - -#, c-format -msgid "User 1:" -msgstr "Uživatelská 1:" - -#, c-format -msgid "User 2:" -msgstr "Uživatelská 2:" - -#, c-format -msgid "Bold" -msgstr "Tučné" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Protokol o porovnání složek" @@ -2408,22 +2427,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "Po&užít vlastní barvy textu" - -#, c-format -msgid "Whitespace:" -msgstr "Okolí textu:" - -#, c-format -msgid "Regular text:" -msgstr "Řádný text:" - -#, c-format -msgid "Selection:" -msgstr "Výběr:" - #, c-format msgid "Backup Files" msgstr "Zálohování souborů" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index f2822fdebdc..00f7ce43c73 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -1755,6 +1755,86 @@ msgstr "Ordforskel:" msgid "Selected Word Diff:" msgstr "Valgte ordforskelle:" +#, c-format +msgid "Dialog" +msgstr "Dialog" + +#, c-format +msgid "Keywords:" +msgstr "Nøgleord:" + +#, c-format +msgid "Function names:" +msgstr "Funktionsnavne:" + +#, c-format +msgid "Comments:" +msgstr "Kommentarer:" + +#, c-format +msgid "Numbers:" +msgstr "Numre:" + +#, c-format +msgid "Operators:" +msgstr "Operatører:" + +#, c-format +msgid "Strings:" +msgstr "Strenge:" + +#, c-format +msgid "Preprocessor:" +msgstr "Forbereder:" + +#, c-format +msgid "User 1:" +msgstr "Bruger 1:" + +#, c-format +msgid "User 2:" +msgstr "Bruger 2:" + +#, c-format +msgid "Bold" +msgstr "Fed" + +#, c-format +msgid "&Use customized text colors" +msgstr "&Brug tilpasset tekstfarve" + +#, c-format +msgid "Whitespace:" +msgstr "Mellemrum:" + +#, c-format +msgid "Regular text:" +msgstr "Almindelig tekst:" + +#, c-format +msgid "Selection:" +msgstr "Udvalgt:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1770,8 +1850,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2167,66 +2246,6 @@ msgstr "Importer..." msgid "Export..." msgstr "Eksporter..." -#, c-format -msgid "Dialog" -msgstr "Dialog" - -#, c-format -msgid "Keywords:" -msgstr "Nøgleord:" - -#, c-format -msgid "Function names:" -msgstr "Funktionsnavne:" - -#, c-format -msgid "Comments:" -msgstr "Kommentarer:" - -#, c-format -msgid "Numbers:" -msgstr "Numre:" - -#, c-format -msgid "Operators:" -msgstr "Operatører:" - -#, c-format -msgid "Strings:" -msgstr "Strenge:" - -#, c-format -msgid "Preprocessor:" -msgstr "Forbereder:" - -#, c-format -msgid "User 1:" -msgstr "Bruger 1:" - -#, c-format -msgid "User 2:" -msgstr "Bruger 2:" - -#, c-format -msgid "Bold" -msgstr "Fed" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" @@ -2413,22 +2432,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "&Brug tilpasset tekstfarve" - -#, c-format -msgid "Whitespace:" -msgstr "Mellemrum:" - -#, c-format -msgid "Regular text:" -msgstr "Almindelig tekst:" - -#, c-format -msgid "Selection:" -msgstr "Udvalgt:" - #, c-format msgid "Backup Files" msgstr "Backup filer" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 1304217133a..4cf182a6f6f 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -1459,6 +1459,66 @@ msgstr "Woordverschil:" msgid "Selected Word Diff:" msgstr "Geselecteerd woordverschil:" +msgid "Dialog" +msgstr "Venster" + +msgid "Keywords:" +msgstr "Sleutelwoorden:" + +msgid "Function names:" +msgstr "Functienamen:" + +msgid "Comments:" +msgstr "Opmerkingen:" + +msgid "Numbers:" +msgstr "Nummers:" + +msgid "Operators:" +msgstr "Operators:" + +msgid "Strings:" +msgstr "Strings:" + +msgid "Preprocessor:" +msgstr "Voorverwerker:" + +msgid "User 1:" +msgstr "Gebruiker 1:" + +msgid "User 2:" +msgstr "Gebruiker 2:" + +msgid "Bold" +msgstr "Vet" + +msgid "&Use customized text colors" +msgstr "Aangepaste tekstkleuren gebruiken" + +msgid "Whitespace:" +msgstr "Witruimte:" + +msgid "Regular text:" +msgstr "Gewone tekst:" + +msgid "Selection:" +msgstr "Selectie:" + +msgid "Margin:" +msgstr "Marge:" + +msgid "Search Marker:" +msgstr "Markering zoeken:" + +msgid "User Defined Marker1:" +msgstr "Aangepaste markering 1:" + +msgid "User Defined Marker2:" +msgstr "Aangepaste markering 2:" + +msgid "User Defined Marker3:" +msgstr "Aangepaste markering 3:" + msgid "&Use folder compare colors" msgstr "Mapvergelijkingskleuren gebruiken" @@ -1474,8 +1534,8 @@ msgstr "Items bestaan niet allemaal:" msgid "Items filtered:" msgstr "Gefilterde items:" -msgid "Margin:" -msgstr "Marge:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Systeem" @@ -1801,51 +1861,6 @@ msgstr "Importeren..." msgid "Export..." msgstr "Exporteren..." -msgid "Dialog" -msgstr "Venster" - -msgid "Keywords:" -msgstr "Sleutelwoorden:" - -msgid "Function names:" -msgstr "Functienamen:" - -msgid "Comments:" -msgstr "Opmerkingen:" - -msgid "Numbers:" -msgstr "Nummers:" - -msgid "Operators:" -msgstr "Operators:" - -msgid "Strings:" -msgstr "Strings:" - -msgid "Preprocessor:" -msgstr "Voorverwerker:" - -msgid "User 1:" -msgstr "Gebruiker 1:" - -msgid "User 2:" -msgstr "Gebruiker 2:" - -msgid "Bold" -msgstr "Vet" - -msgid "Search Marker:" -msgstr "Markering zoeken:" - -msgid "User Defined Marker1:" -msgstr "Aangepaste markering 1:" - -msgid "User Defined Marker2:" -msgstr "Aangepaste markering 2:" - -msgid "User Defined Marker3:" -msgstr "Aangepaste markering 3:" - msgid "Folder Compare Report" msgstr "Mapvergelijkingsrapport" @@ -1993,18 +2008,6 @@ msgstr "Witregels in citaten toestaan" msgid "&Quote character:" msgstr "Citaat-teken:" -msgid "&Use customized text colors" -msgstr "Aangepaste tekstkleuren gebruiken" - -msgid "Whitespace:" -msgstr "Witruimte:" - -msgid "Regular text:" -msgstr "Gewone tekst:" - -msgid "Selection:" -msgstr "Selectie:" - msgid "Backup Files" msgstr "Backupbestanden" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index f28427a478d..6b0b8a65137 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: 2024-10-07 08:25+0000\n" +"POT-Creation-Date: 2024-10-16 08:43+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -1449,6 +1449,66 @@ msgstr "" msgid "Selected Word Diff:" msgstr "" +msgid "Dialog" +msgstr "" + +msgid "Keywords:" +msgstr "" + +msgid "Function names:" +msgstr "" + +msgid "Comments:" +msgstr "" + +msgid "Numbers:" +msgstr "" + +msgid "Operators:" +msgstr "" + +msgid "Strings:" +msgstr "" + +msgid "Preprocessor:" +msgstr "" + +msgid "User 1:" +msgstr "" + +msgid "User 2:" +msgstr "" + +msgid "Bold" +msgstr "" + +msgid "&Use customized text colors" +msgstr "" + +msgid "Whitespace:" +msgstr "" + +msgid "Regular text:" +msgstr "" + +msgid "Selection:" +msgstr "" + +msgid "Margin:" +msgstr "" + +msgid "Search Marker:" +msgstr "" + +msgid "User Defined Marker1:" +msgstr "" + +msgid "User Defined Marker2:" +msgstr "" + +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1464,7 +1524,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" msgid "System" @@ -1776,51 +1836,6 @@ msgstr "" msgid "Export..." msgstr "" -msgid "Dialog" -msgstr "" - -msgid "Keywords:" -msgstr "" - -msgid "Function names:" -msgstr "" - -msgid "Comments:" -msgstr "" - -msgid "Numbers:" -msgstr "" - -msgid "Operators:" -msgstr "" - -msgid "Strings:" -msgstr "" - -msgid "Preprocessor:" -msgstr "" - -msgid "User 1:" -msgstr "" - -msgid "User 2:" -msgstr "" - -msgid "Bold" -msgstr "" - -msgid "Search Marker:" -msgstr "" - -msgid "User Defined Marker1:" -msgstr "" - -msgid "User Defined Marker2:" -msgstr "" - -msgid "User Defined Marker3:" -msgstr "" - msgid "Folder Compare Report" msgstr "" @@ -1968,18 +1983,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -msgid "&Use customized text colors" -msgstr "" - -msgid "Whitespace:" -msgstr "" - -msgid "Regular text:" -msgstr "" - -msgid "Selection:" -msgstr "" - msgid "Backup Files" msgstr "" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index e36a1b406c7..0d57fd21097 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -1459,6 +1459,66 @@ msgstr "Sanaero:" msgid "Selected Word Diff:" msgstr "Valittu sanaero:" +msgid "Dialog" +msgstr "Valintaikkuna" + +msgid "Keywords:" +msgstr "Avainsanat:" + +msgid "Function names:" +msgstr "Funktionimet:" + +msgid "Comments:" +msgstr "Kommentit:" + +msgid "Numbers:" +msgstr "Numerot:" + +msgid "Operators:" +msgstr "Operaattorit:" + +msgid "Strings:" +msgstr "Merkkijonot:" + +msgid "Preprocessor:" +msgstr "Esikäsittelijä:" + +msgid "User 1:" +msgstr "Käyttäjä 1:" + +msgid "User 2:" +msgstr "Käyttäjä 2:" + +msgid "Bold" +msgstr "Lihavoitu" + +msgid "&Use customized text colors" +msgstr "Käytä mukautettuja tekstivärejä" + +msgid "Whitespace:" +msgstr "Välilyönti:" + +msgid "Regular text:" +msgstr "Normaali teksti:" + +msgid "Selection:" +msgstr "Valinta:" + +msgid "Margin:" +msgstr "Marginaali:" + +msgid "Search Marker:" +msgstr "Hakumerkki:" + +msgid "User Defined Marker1:" +msgstr "Käyttäjän määrittämä merkintä1:" + +msgid "User Defined Marker2:" +msgstr "Käyttäjän määrittämä merkintä2:" + +msgid "User Defined Marker3:" +msgstr "Käyttäjän määrittämä merkintä3:" + msgid "&Use folder compare colors" msgstr "Käytä kansiovertailun värejä" @@ -1474,8 +1534,8 @@ msgstr "Kaikki kohteet, joita ei ole:" msgid "Items filtered:" msgstr "Suodatetut kohteet:" -msgid "Margin:" -msgstr "Marginaali:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Järjestelmä" @@ -1791,51 +1851,6 @@ msgstr "Tuo..." msgid "Export..." msgstr "Vie..." -msgid "Dialog" -msgstr "Valintaikkuna" - -msgid "Keywords:" -msgstr "Avainsanat:" - -msgid "Function names:" -msgstr "Funktionimet:" - -msgid "Comments:" -msgstr "Kommentit:" - -msgid "Numbers:" -msgstr "Numerot:" - -msgid "Operators:" -msgstr "Operaattorit:" - -msgid "Strings:" -msgstr "Merkkijonot:" - -msgid "Preprocessor:" -msgstr "Esikäsittelijä:" - -msgid "User 1:" -msgstr "Käyttäjä 1:" - -msgid "User 2:" -msgstr "Käyttäjä 2:" - -msgid "Bold" -msgstr "Lihavoitu" - -msgid "Search Marker:" -msgstr "Hakumerkki:" - -msgid "User Defined Marker1:" -msgstr "Käyttäjän määrittämä merkintä1:" - -msgid "User Defined Marker2:" -msgstr "Käyttäjän määrittämä merkintä2:" - -msgid "User Defined Marker3:" -msgstr "Käyttäjän määrittämä merkintä3:" - msgid "Folder Compare Report" msgstr "Kansiovertailun raportti" @@ -1983,18 +1998,6 @@ msgstr "&Salli uudet rivit lainauksissa" msgid "&Quote character:" msgstr "&Lainausmerkki:" -msgid "&Use customized text colors" -msgstr "Käytä mukautettuja tekstivärejä" - -msgid "Whitespace:" -msgstr "Välilyönti:" - -msgid "Regular text:" -msgstr "Normaali teksti:" - -msgid "Selection:" -msgstr "Valinta:" - msgid "Backup Files" msgstr "Varmuuskopiot" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index bf7d99e6100..56f1e70202b 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -1762,6 +1762,86 @@ msgstr "Différence de mot :" msgid "Selected Word Diff:" msgstr "Différence de mot sélectionné :" +#, c-format +msgid "Dialog" +msgstr "Dialogue" + +#, c-format +msgid "Keywords:" +msgstr "Mots clés :" + +#, c-format +msgid "Function names:" +msgstr "Nom des fonctions :" + +#, c-format +msgid "Comments:" +msgstr "Commentaires :" + +#, c-format +msgid "Numbers:" +msgstr "Nombres :" + +#, c-format +msgid "Operators:" +msgstr "Opérateurs :" + +#, c-format +msgid "Strings:" +msgstr "Chaînes :" + +#, c-format +msgid "Preprocessor:" +msgstr "Pré-processeur :" + +#, c-format +msgid "User 1:" +msgstr "Utilisateur 1 :" + +#, c-format +msgid "User 2:" +msgstr "Utilisateur 2 :" + +#, c-format +msgid "Bold" +msgstr "Gras" + +#, c-format +msgid "&Use customized text colors" +msgstr "&Utiliser des couleurs de texte personnalisées" + +#, c-format +msgid "Whitespace:" +msgstr "Caractère d'espace :" + +#, c-format +msgid "Regular text:" +msgstr "Texte régulier :" + +#, c-format +msgid "Selection:" +msgstr "Sélection :" + +#, c-format +msgid "Margin:" +msgstr "Marge :" + +#, c-format +msgid "Search Marker:" +msgstr "Marqueur de recherche :" + +#, c-format +msgid "User Defined Marker1:" +msgstr "Marqueur 1 défini par l'utilisateur :" + +#, c-format +msgid "User Defined Marker2:" +msgstr "Marqueur 2 défini par l'utilisateur :" + +#, c-format +msgid "User Defined Marker3:" +msgstr "Marqueur 3 défini par l'utilisateur :" + msgid "&Use folder compare colors" msgstr "&Utiliser les couleurs de comparaison de dossier" @@ -1777,9 +1857,8 @@ msgstr "Éléments n'existant pas :" msgid "Items filtered:" msgstr "Éléments filtrés :" -#, c-format -msgid "Margin:" -msgstr "Marge :" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" #, c-format msgid "System" @@ -2178,66 +2257,6 @@ msgstr "Importer..." msgid "Export..." msgstr "Exporter..." -#, c-format -msgid "Dialog" -msgstr "Dialogue" - -#, c-format -msgid "Keywords:" -msgstr "Mots clés :" - -#, c-format -msgid "Function names:" -msgstr "Nom des fonctions :" - -#, c-format -msgid "Comments:" -msgstr "Commentaires :" - -#, c-format -msgid "Numbers:" -msgstr "Nombres :" - -#, c-format -msgid "Operators:" -msgstr "Opérateurs :" - -#, c-format -msgid "Strings:" -msgstr "Chaînes :" - -#, c-format -msgid "Preprocessor:" -msgstr "Pré-processeur :" - -#, c-format -msgid "User 1:" -msgstr "Utilisateur 1 :" - -#, c-format -msgid "User 2:" -msgstr "Utilisateur 2 :" - -#, c-format -msgid "Bold" -msgstr "Gras" - -#, c-format -msgid "Search Marker:" -msgstr "Marqueur de recherche :" - -#, c-format -msgid "User Defined Marker1:" -msgstr "Marqueur 1 défini par l'utilisateur :" - -#, c-format -msgid "User Defined Marker2:" -msgstr "Marqueur 2 défini par l'utilisateur :" - -#, c-format -msgid "User Defined Marker3:" -msgstr "Marqueur 3 défini par l'utilisateur :" - #, c-format msgid "Folder Compare Report" msgstr "Dossier du rapport de comparaison" @@ -2424,22 +2443,6 @@ msgstr "&Autoriser les sauts lignes dans les citations" msgid "&Quote character:" msgstr "Caractère de citation :" -#, c-format -msgid "&Use customized text colors" -msgstr "&Utiliser des couleurs de texte personnalisées" - -#, c-format -msgid "Whitespace:" -msgstr "Caractère d'espace :" - -#, c-format -msgid "Regular text:" -msgstr "Texte régulier :" - -#, c-format -msgid "Selection:" -msgstr "Sélection :" - #, c-format msgid "Backup Files" msgstr "Fichiers d'archive" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index a010300b1ce..e1e83051857 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -1456,6 +1456,66 @@ msgstr "Diferenza de palabras:" msgid "Selected Word Diff:" msgstr "Diferenza de palabra seleccionada:" +msgid "Dialog" +msgstr "Diálogo" + +msgid "Keywords:" +msgstr "Palabras clave:" + +msgid "Function names:" +msgstr "Funcións:" + +msgid "Comments:" +msgstr "Comentarios:" + +msgid "Numbers:" +msgstr "Números:" + +msgid "Operators:" +msgstr "Operadores:" + +msgid "Strings:" +msgstr "Cadeas:" + +msgid "Preprocessor:" +msgstr "Preprocesador:" + +msgid "User 1:" +msgstr "Usuario 1:" + +msgid "User 2:" +msgstr "Usuario 2:" + +msgid "Bold" +msgstr "Grosa" + +msgid "&Use customized text colors" +msgstr "&Usar cores personalizadas para o texto" + +msgid "Whitespace:" +msgstr "Espazo:" + +msgid "Regular text:" +msgstr "Texto normal:" + +msgid "Selection:" +msgstr "Selección:" + +msgid "Margin:" +msgstr "Marxe:" + +msgid "Search Marker:" +msgstr "Marcador de busca:" + +msgid "User Defined Marker1:" +msgstr "Personalizado 1:" + +msgid "User Defined Marker2:" +msgstr "Personalizado 2:" + +msgid "User Defined Marker3:" +msgstr "Personalizado 3:" + msgid "&Use folder compare colors" msgstr "&Usar cores para comparar carpetas" @@ -1471,8 +1531,8 @@ msgstr "Elementos inexistentes:" msgid "Items filtered:" msgstr "Elementos filtrados:" -msgid "Margin:" -msgstr "Marxe:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistema" @@ -1791,51 +1851,6 @@ msgstr "Importar..." msgid "Export..." msgstr "Exportar..." -msgid "Dialog" -msgstr "Diálogo" - -msgid "Keywords:" -msgstr "Palabras clave:" - -msgid "Function names:" -msgstr "Funcións:" - -msgid "Comments:" -msgstr "Comentarios:" - -msgid "Numbers:" -msgstr "Números:" - -msgid "Operators:" -msgstr "Operadores:" - -msgid "Strings:" -msgstr "Cadeas:" - -msgid "Preprocessor:" -msgstr "Preprocesador:" - -msgid "User 1:" -msgstr "Usuario 1:" - -msgid "User 2:" -msgstr "Usuario 2:" - -msgid "Bold" -msgstr "Grosa" - -msgid "Search Marker:" -msgstr "Marcador de busca:" - -msgid "User Defined Marker1:" -msgstr "Personalizado 1:" - -msgid "User Defined Marker2:" -msgstr "Personalizado 2:" - -msgid "User Defined Marker3:" -msgstr "Personalizado 3:" - msgid "Folder Compare Report" msgstr "Informe da comparación de carpetas" @@ -1983,18 +1998,6 @@ msgstr "Permitir liñas nov&as entre comiñas" msgid "&Quote character:" msgstr "Carác&ter de comiñas:" -msgid "&Use customized text colors" -msgstr "&Usar cores personalizadas para o texto" - -msgid "Whitespace:" -msgstr "Espazo:" - -msgid "Regular text:" -msgstr "Texto normal:" - -msgid "Selection:" -msgstr "Selección:" - msgid "Backup Files" msgstr "Copias de seguridade" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index fdc670b2b43..27c0710cb0e 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -1758,6 +1758,86 @@ msgstr "Wortunterschied:" msgid "Selected Word Diff:" msgstr "Markierter Wortunterschied:" +#, c-format +msgid "Dialog" +msgstr "Dialog" + +#, c-format +msgid "Keywords:" +msgstr "Schlüsselwörter:" + +#, c-format +msgid "Function names:" +msgstr "Funktionsnamen:" + +#, c-format +msgid "Comments:" +msgstr "Kommentare:" + +#, c-format +msgid "Numbers:" +msgstr "Nummern:" + +#, c-format +msgid "Operators:" +msgstr "Operatoren:" + +#, c-format +msgid "Strings:" +msgstr "Zeichenketten:" + +#, c-format +msgid "Preprocessor:" +msgstr "Präprozessor:" + +#, c-format +msgid "User 1:" +msgstr "Benutzer 1:" + +#, c-format +msgid "User 2:" +msgstr "Benutzer 2:" + +#, c-format +msgid "Bold" +msgstr "Fett" + +#, c-format +msgid "&Use customized text colors" +msgstr "&Benutzerdefinierte Textfarben verwenden" + +#, c-format +msgid "Whitespace:" +msgstr "Leerzeichen:" + +#, c-format +msgid "Regular text:" +msgstr "Normaler Text:" + +#, c-format +msgid "Selection:" +msgstr "Auswahl:" + +#, c-format +msgid "Margin:" +msgstr "Rand:" + +#, c-format +msgid "Search Marker:" +msgstr "Suchmarkierung:" + +#, c-format +msgid "User Defined Marker1:" +msgstr "Benutzerdefiniert 1:" + +#, c-format +msgid "User Defined Marker2:" +msgstr "Benutzerdefiniert 2:" + +#, c-format +msgid "User Defined Marker3:" +msgstr "Benutzerdefiniert 3:" + msgid "&Use folder compare colors" msgstr "&Ordnervergleichsfarben verwenden" @@ -1773,9 +1853,8 @@ msgstr "Nicht existierende Objekte:" msgid "Items filtered:" msgstr "Gefilterte Objekte:" -#, c-format -msgid "Margin:" -msgstr "Rand:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" #, c-format msgid "System" @@ -2164,66 +2243,6 @@ msgstr "Importieren..." msgid "Export..." msgstr "Exportieren..." -#, c-format -msgid "Dialog" -msgstr "Dialog" - -#, c-format -msgid "Keywords:" -msgstr "Schlüsselwörter:" - -#, c-format -msgid "Function names:" -msgstr "Funktionsnamen:" - -#, c-format -msgid "Comments:" -msgstr "Kommentare:" - -#, c-format -msgid "Numbers:" -msgstr "Nummern:" - -#, c-format -msgid "Operators:" -msgstr "Operatoren:" - -#, c-format -msgid "Strings:" -msgstr "Zeichenketten:" - -#, c-format -msgid "Preprocessor:" -msgstr "Präprozessor:" - -#, c-format -msgid "User 1:" -msgstr "Benutzer 1:" - -#, c-format -msgid "User 2:" -msgstr "Benutzer 2:" - -#, c-format -msgid "Bold" -msgstr "Fett" - -#, c-format -msgid "Search Marker:" -msgstr "Suchmarkierung:" - -#, c-format -msgid "User Defined Marker1:" -msgstr "Benutzerdefiniert 1:" - -#, c-format -msgid "User Defined Marker2:" -msgstr "Benutzerdefiniert 2:" - -#, c-format -msgid "User Defined Marker3:" -msgstr "Benutzerdefiniert 3:" - #, c-format msgid "Folder Compare Report" msgstr "Ordnervergleichsbericht" @@ -2410,22 +2429,6 @@ msgstr "&Zeilenumbrüche in Zitaten zulassen" msgid "&Quote character:" msgstr "&Anführungszeichen:" -#, c-format -msgid "&Use customized text colors" -msgstr "&Benutzerdefinierte Textfarben verwenden" - -#, c-format -msgid "Whitespace:" -msgstr "Leerzeichen:" - -#, c-format -msgid "Regular text:" -msgstr "Normaler Text:" - -#, c-format -msgid "Selection:" -msgstr "Auswahl:" - #, c-format msgid "Backup Files" msgstr "Sicherungsdateien" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 1abd54fcb78..be00589e5d0 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -1753,6 +1753,86 @@ msgstr "Διαφορά Λέξεως:" msgid "Selected Word Diff:" msgstr "Επιλεγμένη Διαφορά Λέξεως:" +#, c-format +msgid "Dialog" +msgstr "Διάλογος" + +#, c-format +msgid "Keywords:" +msgstr "Ειδικές Λέξεις:" + +#, c-format +msgid "Function names:" +msgstr "Ονόματα Διεργασιών:" + +#, c-format +msgid "Comments:" +msgstr "Σχόλια:" + +#, c-format +msgid "Numbers:" +msgstr "Αριθμοί:" + +#, c-format +msgid "Operators:" +msgstr "Τελεστές:" + +#, c-format +msgid "Strings:" +msgstr "Αυτούσιο Κείμενο:" + +#, c-format +msgid "Preprocessor:" +msgstr "Προεπεξεργαστής:" + +#, c-format +msgid "User 1:" +msgstr "από Χρήστη 1:" + +#, c-format +msgid "User 2:" +msgstr "από Χρήστη 2:" + +#, c-format +msgid "Bold" +msgstr "Έντονα" + +#, c-format +msgid "&Use customized text colors" +msgstr "Χρήση προ&τιμωμένων χρωματισμών κειμένου" + +#, c-format +msgid "Whitespace:" +msgstr "Χαρακτήρες Διαστήματος:" + +#, c-format +msgid "Regular text:" +msgstr "Απλό κείμενο:" + +#, c-format +msgid "Selection:" +msgstr "Επιλογή:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1768,8 +1848,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2159,66 +2238,6 @@ msgstr "Εισαγωγή..." msgid "Export..." msgstr "Εξαγωγή..." -#, c-format -msgid "Dialog" -msgstr "Διάλογος" - -#, c-format -msgid "Keywords:" -msgstr "Ειδικές Λέξεις:" - -#, c-format -msgid "Function names:" -msgstr "Ονόματα Διεργασιών:" - -#, c-format -msgid "Comments:" -msgstr "Σχόλια:" - -#, c-format -msgid "Numbers:" -msgstr "Αριθμοί:" - -#, c-format -msgid "Operators:" -msgstr "Τελεστές:" - -#, c-format -msgid "Strings:" -msgstr "Αυτούσιο Κείμενο:" - -#, c-format -msgid "Preprocessor:" -msgstr "Προεπεξεργαστής:" - -#, c-format -msgid "User 1:" -msgstr "από Χρήστη 1:" - -#, c-format -msgid "User 2:" -msgstr "από Χρήστη 2:" - -#, c-format -msgid "Bold" -msgstr "Έντονα" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Αναφορά Συγκρίσεως Φακέλων" @@ -2405,22 +2424,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "Χρήση προ&τιμωμένων χρωματισμών κειμένου" - -#, c-format -msgid "Whitespace:" -msgstr "Χαρακτήρες Διαστήματος:" - -#, c-format -msgid "Regular text:" -msgstr "Απλό κείμενο:" - -#, c-format -msgid "Selection:" -msgstr "Επιλογή:" - #, c-format msgid "Backup Files" msgstr "Εφεδρικά Αρχεία" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 04bddf51d87..9699f9130ea 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -1756,6 +1756,86 @@ msgstr "Szó eltérés:" msgid "Selected Word Diff:" msgstr "Kijelölt szó eltérés:" +#, c-format +msgid "Dialog" +msgstr "Párbeszédablak" + +#, c-format +msgid "Keywords:" +msgstr "Kulcsszavak:" + +#, c-format +msgid "Function names:" +msgstr "Függvény nevek:" + +#, c-format +msgid "Comments:" +msgstr "Megjegyzések:" + +#, c-format +msgid "Numbers:" +msgstr "Számok:" + +#, c-format +msgid "Operators:" +msgstr "Operátorok:" + +#, c-format +msgid "Strings:" +msgstr "Sztringek:" + +#, c-format +msgid "Preprocessor:" +msgstr "Előfeldolgozó:" + +#, c-format +msgid "User 1:" +msgstr "Felhasználó 1:" + +#, c-format +msgid "User 2:" +msgstr "Felhasználó 2:" + +#, c-format +msgid "Bold" +msgstr "Félkövér" + +#, c-format +msgid "&Use customized text colors" +msgstr "Egyéni szövegszínek használata" + +#, c-format +msgid "Whitespace:" +msgstr "Szóköz:" + +#, c-format +msgid "Regular text:" +msgstr "Sima szöveg:" + +#, c-format +msgid "Selection:" +msgstr "Kijelölés:" + +#, c-format +msgid "Margin:" +msgstr "Margó:" + +#, c-format +msgid "Search Marker:" +msgstr "Keresés jelölő:" + +#, c-format +msgid "User Defined Marker1:" +msgstr "Saját jelölő 1:" + +#, c-format +msgid "User Defined Marker2:" +msgstr "Saját jelölő 2:" + +#, c-format +msgid "User Defined Marker3:" +msgstr "Saját jelölő 3:" + msgid "&Use folder compare colors" msgstr "Színek használata" @@ -1771,9 +1851,8 @@ msgstr "Hiányzó elemek:" msgid "Items filtered:" msgstr "Szűrt elemek:" -#, c-format -msgid "Margin:" -msgstr "Margó:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" #, c-format msgid "System" @@ -2170,66 +2249,6 @@ msgstr "Importálás" msgid "Export..." msgstr "Exportálás" -#, c-format -msgid "Dialog" -msgstr "Párbeszédablak" - -#, c-format -msgid "Keywords:" -msgstr "Kulcsszavak:" - -#, c-format -msgid "Function names:" -msgstr "Függvény nevek:" - -#, c-format -msgid "Comments:" -msgstr "Megjegyzések:" - -#, c-format -msgid "Numbers:" -msgstr "Számok:" - -#, c-format -msgid "Operators:" -msgstr "Operátorok:" - -#, c-format -msgid "Strings:" -msgstr "Sztringek:" - -#, c-format -msgid "Preprocessor:" -msgstr "Előfeldolgozó:" - -#, c-format -msgid "User 1:" -msgstr "Felhasználó 1:" - -#, c-format -msgid "User 2:" -msgstr "Felhasználó 2:" - -#, c-format -msgid "Bold" -msgstr "Félkövér" - -#, c-format -msgid "Search Marker:" -msgstr "Keresés jelölő:" - -#, c-format -msgid "User Defined Marker1:" -msgstr "Saját jelölő 1:" - -#, c-format -msgid "User Defined Marker2:" -msgstr "Saját jelölő 2:" - -#, c-format -msgid "User Defined Marker3:" -msgstr "Saját jelölő 3:" - #, c-format msgid "Folder Compare Report" msgstr "Könyvtár összehasonítási jelentés" @@ -2416,22 +2435,6 @@ msgstr "Sorugrás idézőjelek között is lehet" msgid "&Quote character:" msgstr "Idézőjel:" -#, c-format -msgid "&Use customized text colors" -msgstr "Egyéni szövegszínek használata" - -#, c-format -msgid "Whitespace:" -msgstr "Szóköz:" - -#, c-format -msgid "Regular text:" -msgstr "Sima szöveg:" - -#, c-format -msgid "Selection:" -msgstr "Kijelölés:" - #, c-format msgid "Backup Files" msgstr "Visszaállítási fájlok" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index fede0be5ae2..1a737d0468b 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -1461,6 +1461,66 @@ msgstr "Differenza di parole:" msgid "Selected Word Diff:" msgstr "Diff. parole selezionata:" +msgid "Dialog" +msgstr "Finestra di dialogo" + +msgid "Keywords:" +msgstr "Parole chiave:" + +msgid "Function names:" +msgstr "Nomi funzione:" + +msgid "Comments:" +msgstr "Commenti:" + +msgid "Numbers:" +msgstr "Numeri:" + +msgid "Operators:" +msgstr "Operatori:" + +msgid "Strings:" +msgstr "Stringhe:" + +msgid "Preprocessor:" +msgstr "Preprocessore:" + +msgid "User 1:" +msgstr "Utente 1:" + +msgid "User 2:" +msgstr "Utente 2:" + +msgid "Bold" +msgstr "Grassetto" + +msgid "&Use customized text colors" +msgstr "Per il testo &usa colori personalizzati" + +msgid "Whitespace:" +msgstr "Spazi:" + +msgid "Regular text:" +msgstr "Testo normale:" + +msgid "Selection:" +msgstr "Selezione:" + +msgid "Margin:" +msgstr "Margine:" + +msgid "Search Marker:" +msgstr "Cerca segnaposto:" + +msgid "User Defined Marker1:" +msgstr "Segnaposto predefinito 1:" + +msgid "User Defined Marker2:" +msgstr "Segnaposto predefinito 2:" + +msgid "User Defined Marker3:" +msgstr "Segnaposto predefinito 3:" + msgid "&Use folder compare colors" msgstr "&Usa colori confronto cartelle" @@ -1476,8 +1536,8 @@ msgstr "Elementi inesistenti:" msgid "Items filtered:" msgstr "Elementi filtrati:" -msgid "Margin:" -msgstr "Margine:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistema" @@ -1800,51 +1860,6 @@ msgstr "Importa..." msgid "Export..." msgstr "Esporta..." -msgid "Dialog" -msgstr "Finestra di dialogo" - -msgid "Keywords:" -msgstr "Parole chiave:" - -msgid "Function names:" -msgstr "Nomi funzione:" - -msgid "Comments:" -msgstr "Commenti:" - -msgid "Numbers:" -msgstr "Numeri:" - -msgid "Operators:" -msgstr "Operatori:" - -msgid "Strings:" -msgstr "Stringhe:" - -msgid "Preprocessor:" -msgstr "Preprocessore:" - -msgid "User 1:" -msgstr "Utente 1:" - -msgid "User 2:" -msgstr "Utente 2:" - -msgid "Bold" -msgstr "Grassetto" - -msgid "Search Marker:" -msgstr "Cerca segnaposto:" - -msgid "User Defined Marker1:" -msgstr "Segnaposto predefinito 1:" - -msgid "User Defined Marker2:" -msgstr "Segnaposto predefinito 2:" - -msgid "User Defined Marker3:" -msgstr "Segnaposto predefinito 3:" - msgid "Folder Compare Report" msgstr "Rapporto confronto tra cartelle" @@ -1992,18 +2007,6 @@ msgstr "&Consenti a capo tra le virgolette" msgid "&Quote character:" msgstr "Carattere &virgolette:" -msgid "&Use customized text colors" -msgstr "Per il testo &usa colori personalizzati" - -msgid "Whitespace:" -msgstr "Spazi:" - -msgid "Regular text:" -msgstr "Testo normale:" - -msgid "Selection:" -msgstr "Selezione:" - msgid "Backup Files" msgstr "File di backup" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 67e69aa7322..2a5832f64cb 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: 2024-09-28 15:49+0900\n" +"PO-Revision-Date: 2024-10-20 14:08+0900\n" "Last-Translator: Takashi Sawanaka \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -1458,6 +1458,66 @@ msgstr "単語の差異:" msgid "Selected Word Diff:" msgstr "選択された単語の差異:" +msgid "Dialog" +msgstr "ダイアログ" + +msgid "Keywords:" +msgstr "キーワード:" + +msgid "Function names:" +msgstr "関数名:" + +msgid "Comments:" +msgstr "コメント:" + +msgid "Numbers:" +msgstr "数値:" + +msgid "Operators:" +msgstr "オペレーター:" + +msgid "Strings:" +msgstr "文字列:" + +msgid "Preprocessor:" +msgstr "プリプロセッサ:" + +msgid "User 1:" +msgstr "ユーザー 1:" + +msgid "User 2:" +msgstr "ユーザー 2:" + +msgid "Bold" +msgstr "太字" + +msgid "&Use customized text colors" +msgstr "テキストの色をカスタマイズする(&U)" + +msgid "Whitespace:" +msgstr "空白:" + +msgid "Regular text:" +msgstr "標準テキスト:" + +msgid "Selection:" +msgstr "選択:" + +msgid "Margin:" +msgstr "マージン:" + +msgid "Search Marker:" +msgstr "検索マーカー:" + +msgid "User Defined Marker1:" +msgstr "ユーザー定義マーカー 1:" + +msgid "User Defined Marker2:" +msgstr "ユーザー定義マーカー 2:" + +msgid "User Defined Marker3:" +msgstr "ユーザー定義マーカー 3:" + msgid "&Use folder compare colors" msgstr "フォルダー比較用の色を使用する(&U)" @@ -1473,8 +1533,8 @@ msgstr "すべて存在しない項目:" msgid "Items filtered:" msgstr "無視された項目:" -msgid "Margin:" -msgstr "マージン:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "カスタムシステムカラーを使用する（一部のUI要素には適用されません）" msgid "System" msgstr "システム" @@ -1793,51 +1853,6 @@ msgstr "インポート..." msgid "Export..." msgstr "エクスポート..." -msgid "Dialog" -msgstr "ダイアログ" - -msgid "Keywords:" -msgstr "キーワード:" - -msgid "Function names:" -msgstr "関数名:" - -msgid "Comments:" -msgstr "コメント:" - -msgid "Numbers:" -msgstr "数値:" - -msgid "Operators:" -msgstr "オペレーター:" - -msgid "Strings:" -msgstr "文字列:" - -msgid "Preprocessor:" -msgstr "プリプロセッサ:" - -msgid "User 1:" -msgstr "ユーザー 1:" - -msgid "User 2:" -msgstr "ユーザー 2:" - -msgid "Bold" -msgstr "太字" - -msgid "Search Marker:" -msgstr "検索マーカー:" - -msgid "User Defined Marker1:" -msgstr "ユーザー定義マーカー 1:" - -msgid "User Defined Marker2:" -msgstr "ユーザー定義マーカー 2:" - -msgid "User Defined Marker3:" -msgstr "ユーザー定義マーカー 3:" - msgid "Folder Compare Report" msgstr "フォルダー比較レポート" @@ -1985,18 +2000,6 @@ msgstr "引用符内の改行を値として扱う(&A)" msgid "&Quote character:" msgstr "引用符文字(&Q)" -msgid "&Use customized text colors" -msgstr "テキストの色をカスタマイズする(&U)" - -msgid "Whitespace:" -msgstr "空白:" - -msgid "Regular text:" -msgstr "標準テキスト:" - -msgid "Selection:" -msgstr "選択:" - msgid "Backup Files" msgstr "バックアップ ファイル" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index c0f63b0778c..05a85417cb5 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -1763,6 +1763,86 @@ msgstr "단어 차이점:" msgid "Selected Word Diff:" msgstr "선택된 단어 차이점:" +#, c-format +msgid "Dialog" +msgstr "대화 상자" + +#, c-format +msgid "Keywords:" +msgstr "키워드:" + +#, c-format +msgid "Function names:" +msgstr "함수 이름:" + +#, c-format +msgid "Comments:" +msgstr "주석:" + +#, c-format +msgid "Numbers:" +msgstr "숫자:" + +#, c-format +msgid "Operators:" +msgstr "연산자:" + +#, c-format +msgid "Strings:" +msgstr "문자열:" + +#, c-format +msgid "Preprocessor:" +msgstr "전처리기:" + +#, c-format +msgid "User 1:" +msgstr "사용자 1:" + +#, c-format +msgid "User 2:" +msgstr "사용자 2:" + +#, c-format +msgid "Bold" +msgstr "굵게" + +#, c-format +msgid "&Use customized text colors" +msgstr "사용자 지정 텍스트 색상 사용(&U)" + +#, c-format +msgid "Whitespace:" +msgstr "공백 문자:" + +#, c-format +msgid "Regular text:" +msgstr "일반 텍스트:" + +#, c-format +msgid "Selection:" +msgstr "선택:" + +#, c-format +msgid "Margin:" +msgstr "여백:" + +#, c-format +msgid "Search Marker:" +msgstr "마커 검색:" + +#, c-format +msgid "User Defined Marker1:" +msgstr "사용자 정의 마커1:" + +#, c-format +msgid "User Defined Marker2:" +msgstr "사용자 정의 마커2:" + +#, c-format +msgid "User Defined Marker3:" +msgstr "사용자 정의 마커3:" + msgid "&Use folder compare colors" msgstr "폴더 비교 색상 사용(&U)" @@ -1778,9 +1858,8 @@ msgstr "존재하지 않는 항목:" msgid "Items filtered:" msgstr "필터된 항목:" -#, c-format -msgid "Margin:" -msgstr "여백:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" #, c-format msgid "System" @@ -2177,66 +2256,6 @@ msgstr "가져오기..." msgid "Export..." msgstr "내보내기..." -#, c-format -msgid "Dialog" -msgstr "대화 상자" - -#, c-format -msgid "Keywords:" -msgstr "키워드:" - -#, c-format -msgid "Function names:" -msgstr "함수 이름:" - -#, c-format -msgid "Comments:" -msgstr "주석:" - -#, c-format -msgid "Numbers:" -msgstr "숫자:" - -#, c-format -msgid "Operators:" -msgstr "연산자:" - -#, c-format -msgid "Strings:" -msgstr "문자열:" - -#, c-format -msgid "Preprocessor:" -msgstr "전처리기:" - -#, c-format -msgid "User 1:" -msgstr "사용자 1:" - -#, c-format -msgid "User 2:" -msgstr "사용자 2:" - -#, c-format -msgid "Bold" -msgstr "굵게" - -#, c-format -msgid "Search Marker:" -msgstr "마커 검색:" - -#, c-format -msgid "User Defined Marker1:" -msgstr "사용자 정의 마커1:" - -#, c-format -msgid "User Defined Marker2:" -msgstr "사용자 정의 마커2:" - -#, c-format -msgid "User Defined Marker3:" -msgstr "사용자 정의 마커3:" - #, c-format msgid "Folder Compare Report" msgstr "폴더 비교 보고서" @@ -2423,22 +2442,6 @@ msgstr "따옴표에 새 줄 허용(&A)" msgid "&Quote character:" msgstr "따옴표 기호(&Q)" -#, c-format -msgid "&Use customized text colors" -msgstr "사용자 지정 텍스트 색상 사용(&U)" - -#, c-format -msgid "Whitespace:" -msgstr "공백 문자:" - -#, c-format -msgid "Regular text:" -msgstr "일반 텍스트:" - -#, c-format -msgid "Selection:" -msgstr "선택:" - #, c-format msgid "Backup Files" msgstr "파일 백업" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index a710dad0d23..9de874bbdee 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -1455,6 +1455,66 @@ msgstr "Žodžio skirtumas:" msgid "Selected Word Diff:" msgstr "Pažym. žodžio skirtumas:" +msgid "Dialog" +msgstr "Dialogas" + +msgid "Keywords:" +msgstr "Raktažodžiai:" + +msgid "Function names:" +msgstr "Funkcijų vardai:" + +msgid "Comments:" +msgstr "Komentarai:" + +msgid "Numbers:" +msgstr "Skaičiai:" + +msgid "Operators:" +msgstr "Operatoriai:" + +msgid "Strings:" +msgstr "Eilutės:" + +msgid "Preprocessor:" +msgstr "Preprocessorius:" + +msgid "User 1:" +msgstr "Naudotojas 1:" + +msgid "User 2:" +msgstr "Naudotojas 2:" + +msgid "Bold" +msgstr "Pastorintas" + +msgid "&Use customized text colors" +msgstr "Na&udoti pasirinkt. teksto spalvas" + +msgid "Whitespace:" +msgstr "Tarpas:" + +msgid "Regular text:" +msgstr "Paprastas tekstas:" + +msgid "Selection:" +msgstr "Pažymėtas fragmentas:" + +msgid "Margin:" +msgstr "Paraštė:" + +msgid "Search Marker:" +msgstr "Paieškos žymeklis:" + +msgid "User Defined Marker1:" +msgstr "Naudotojo žymeklis1:" + +msgid "User Defined Marker2:" +msgstr "Naudotojo žymeklis2:" + +msgid "User Defined Marker3:" +msgstr "Naudotojo žymeklis3:" + msgid "&Use folder compare colors" msgstr "Na&udoti katalogų lyginimo spalvas" @@ -1470,8 +1530,8 @@ msgstr "Elementų visai nėra:" msgid "Items filtered:" msgstr "Elementai filtruoti:" -msgid "Margin:" -msgstr "Paraštė:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistemos" @@ -1782,51 +1842,6 @@ msgstr "Importuoti..." msgid "Export..." msgstr "Eksportuoti..." -msgid "Dialog" -msgstr "Dialogas" - -msgid "Keywords:" -msgstr "Raktažodžiai:" - -msgid "Function names:" -msgstr "Funkcijų vardai:" - -msgid "Comments:" -msgstr "Komentarai:" - -msgid "Numbers:" -msgstr "Skaičiai:" - -msgid "Operators:" -msgstr "Operatoriai:" - -msgid "Strings:" -msgstr "Eilutės:" - -msgid "Preprocessor:" -msgstr "Preprocessorius:" - -msgid "User 1:" -msgstr "Naudotojas 1:" - -msgid "User 2:" -msgstr "Naudotojas 2:" - -msgid "Bold" -msgstr "Pastorintas" - -msgid "Search Marker:" -msgstr "Paieškos žymeklis:" - -msgid "User Defined Marker1:" -msgstr "Naudotojo žymeklis1:" - -msgid "User Defined Marker2:" -msgstr "Naudotojo žymeklis2:" - -msgid "User Defined Marker3:" -msgstr "Naudotojo žymeklis3:" - msgid "Folder Compare Report" msgstr "Katalogų lyginimo ataskaita" @@ -1974,18 +1989,6 @@ msgstr "Leisti n&aujas eilutes kabutėse" msgid "&Quote character:" msgstr "&Kabučių simbolis:" -msgid "&Use customized text colors" -msgstr "Na&udoti pasirinkt. teksto spalvas" - -msgid "Whitespace:" -msgstr "Tarpas:" - -msgid "Regular text:" -msgstr "Paprastas tekstas:" - -msgid "Selection:" -msgstr "Pažymėtas fragmentas:" - msgid "Backup Files" msgstr "Rezervinių failų kurimo" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index e806971368f..1c80fd7446f 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -1456,6 +1456,66 @@ msgstr "Ordforskjell:" msgid "Selected Word Diff:" msgstr "Valgt ordforskjell:" +msgid "Dialog" +msgstr "Dialog" + +msgid "Keywords:" +msgstr "Nøkkelord:" + +msgid "Function names:" +msgstr "Funksjonsnavn:" + +msgid "Comments:" +msgstr "Kommentarer:" + +msgid "Numbers:" +msgstr "Nummere:" + +msgid "Operators:" +msgstr "Operatorer:" + +msgid "Strings:" +msgstr "Strenger:" + +msgid "Preprocessor:" +msgstr "Preprosessor:" + +msgid "User 1:" +msgstr "Bruker 1:" + +msgid "User 2:" +msgstr "Bruker 2:" + +msgid "Bold" +msgstr "Fet" + +msgid "&Use customized text colors" +msgstr "&Bruk egendefinerte tekstfarger" + +msgid "Whitespace:" +msgstr "Blanktegn:" + +msgid "Regular text:" +msgstr "Normal tekst:" + +msgid "Selection:" +msgstr "Markering:" + +msgid "Margin:" +msgstr "" + +msgid "Search Marker:" +msgstr "" + +msgid "User Defined Marker1:" +msgstr "" + +msgid "User Defined Marker2:" +msgstr "" + +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1471,7 +1531,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" msgid "System" @@ -1794,51 +1854,6 @@ msgstr "Importer..." msgid "Export..." msgstr "Eksporter..." -msgid "Dialog" -msgstr "Dialog" - -msgid "Keywords:" -msgstr "Nøkkelord:" - -msgid "Function names:" -msgstr "Funksjonsnavn:" - -msgid "Comments:" -msgstr "Kommentarer:" - -msgid "Numbers:" -msgstr "Nummere:" - -msgid "Operators:" -msgstr "Operatorer:" - -msgid "Strings:" -msgstr "Strenger:" - -msgid "Preprocessor:" -msgstr "Preprosessor:" - -msgid "User 1:" -msgstr "Bruker 1:" - -msgid "User 2:" -msgstr "Bruker 2:" - -msgid "Bold" -msgstr "Fet" - -msgid "Search Marker:" -msgstr "" - -msgid "User Defined Marker1:" -msgstr "" - -msgid "User Defined Marker2:" -msgstr "" - -msgid "User Defined Marker3:" -msgstr "" - msgid "Folder Compare Report" msgstr "Mappesammenlignings-rapport" @@ -1986,18 +2001,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -msgid "&Use customized text colors" -msgstr "&Bruk egendefinerte tekstfarger" - -msgid "Whitespace:" -msgstr "Blanktegn:" - -msgid "Regular text:" -msgstr "Normal tekst:" - -msgid "Selection:" -msgstr "Markering:" - msgid "Backup Files" msgstr "Sikkerhetskopifiler" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 7e5468742c0..97e8da5fb0f 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -1757,6 +1757,86 @@ msgstr " تفاوت واژه : " msgid "Selected Word Diff:" msgstr " تفاوت واژه انتخابي : " +#, c-format +msgid "Dialog" +msgstr "پنجره محاوره " + +#, c-format +msgid "Keywords:" +msgstr " کليدواژه ها : " + +#, c-format +msgid "Function names:" +msgstr " نام کليدکارها : " + +#, c-format +msgid "Comments:" +msgstr " توضيحات : " + +#, c-format +msgid "Numbers:" +msgstr " شماره ها : " + +#, c-format +msgid "Operators:" +msgstr " عملگرها : " + +#, c-format +msgid "Strings:" +msgstr " رشته ها : " + +#, c-format +msgid "Preprocessor:" +msgstr " پيش پرداز : " + +#, c-format +msgid "User 1:" +msgstr " کاربر 1 : " + +#, c-format +msgid "User 2:" +msgstr " کاربر 2 : " + +#, c-format +msgid "Bold" +msgstr " تيره " + +#, c-format +msgid "&Use customized text colors" +msgstr "&U استفاده از رنگهاي متن سفارشي " + +#, c-format +msgid "Whitespace:" +msgstr " فاصله سفيد : " + +#, c-format +msgid "Regular text:" +msgstr " متن منظم : " + +#, c-format +msgid "Selection:" +msgstr " انتخاب : " + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1772,8 +1852,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2169,66 +2248,6 @@ msgstr " ورود ... " msgid "Export..." msgstr " صدور ... " -#, c-format -msgid "Dialog" -msgstr "پنجره محاوره " - -#, c-format -msgid "Keywords:" -msgstr " کليدواژه ها : " - -#, c-format -msgid "Function names:" -msgstr " نام کليدکارها : " - -#, c-format -msgid "Comments:" -msgstr " توضيحات : " - -#, c-format -msgid "Numbers:" -msgstr " شماره ها : " - -#, c-format -msgid "Operators:" -msgstr " عملگرها : " - -#, c-format -msgid "Strings:" -msgstr " رشته ها : " - -#, c-format -msgid "Preprocessor:" -msgstr " پيش پرداز : " - -#, c-format -msgid "User 1:" -msgstr " کاربر 1 : " - -#, c-format -msgid "User 2:" -msgstr " کاربر 2 : " - -#, c-format -msgid "Bold" -msgstr " تيره " - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr " گزارش همسنجي پوشه " @@ -2415,22 +2434,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "&U استفاده از رنگهاي متن سفارشي " - -#, c-format -msgid "Whitespace:" -msgstr " فاصله سفيد : " - -#, c-format -msgid "Regular text:" -msgstr " متن منظم : " - -#, c-format -msgid "Selection:" -msgstr " انتخاب : " - #, c-format msgid "Backup Files" msgstr "پرونده هاي پشتيبان " diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 8c9b36485b9..c0cfe628a09 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -1456,6 +1456,66 @@ msgstr "Różniące się słowa:" msgid "Selected Word Diff:" msgstr "Zaznaczone różniące się słowa:" +msgid "Dialog" +msgstr "Okno dialogowe" + +msgid "Keywords:" +msgstr "Słowa kluczowe:" + +msgid "Function names:" +msgstr "Nazwy funkcji:" + +msgid "Comments:" +msgstr "Komentarze:" + +msgid "Numbers:" +msgstr "Liczby:" + +msgid "Operators:" +msgstr "Operatory:" + +msgid "Strings:" +msgstr "Ciągi znaków:" + +msgid "Preprocessor:" +msgstr "Preprocesor:" + +msgid "User 1:" +msgstr "Użytkownik 1:" + +msgid "User 2:" +msgstr "Użytkownik 2:" + +msgid "Bold" +msgstr "Pogrubienie" + +msgid "&Use customized text colors" +msgstr "Użyj niestandardowych kolorów tekstu" + +msgid "Whitespace:" +msgstr "Odstęp:" + +msgid "Regular text:" +msgstr "Czcionka regularna:" + +msgid "Selection:" +msgstr "Zaznaczenie:" + +msgid "Margin:" +msgstr "Margines:" + +msgid "Search Marker:" +msgstr "Znaleziony marker:" + +msgid "User Defined Marker1:" +msgstr "Zdefiniowany przez użytkownika Marker1:" + +msgid "User Defined Marker2:" +msgstr "Zdefiniowany przez użytkownika Marker2:" + +msgid "User Defined Marker3:" +msgstr "Zdefiniowany przez użytkownika Marker3:" + msgid "&Use folder compare colors" msgstr "Użyj kolorów do porównania folderów" @@ -1471,8 +1531,8 @@ msgstr "Wszystkie nieistniejące elementy:" msgid "Items filtered:" msgstr "Przefiltrowane elementy:" -msgid "Margin:" -msgstr "Margines:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "System" @@ -1783,51 +1843,6 @@ msgstr "Importuj..." msgid "Export..." msgstr "Eksportuj..." -msgid "Dialog" -msgstr "Okno dialogowe" - -msgid "Keywords:" -msgstr "Słowa kluczowe:" - -msgid "Function names:" -msgstr "Nazwy funkcji:" - -msgid "Comments:" -msgstr "Komentarze:" - -msgid "Numbers:" -msgstr "Liczby:" - -msgid "Operators:" -msgstr "Operatory:" - -msgid "Strings:" -msgstr "Ciągi znaków:" - -msgid "Preprocessor:" -msgstr "Preprocesor:" - -msgid "User 1:" -msgstr "Użytkownik 1:" - -msgid "User 2:" -msgstr "Użytkownik 2:" - -msgid "Bold" -msgstr "Pogrubienie" - -msgid "Search Marker:" -msgstr "Znaleziony marker:" - -msgid "User Defined Marker1:" -msgstr "Zdefiniowany przez użytkownika Marker1:" - -msgid "User Defined Marker2:" -msgstr "Zdefiniowany przez użytkownika Marker2:" - -msgid "User Defined Marker3:" -msgstr "Zdefiniowany przez użytkownika Marker3:" - msgid "Folder Compare Report" msgstr "Raport porównania folderów" @@ -1975,18 +1990,6 @@ msgstr "Zezwalaj na nowe wiersze w cudzysłowie" msgid "&Quote character:" msgstr "Znak cudzysłowu:" -msgid "&Use customized text colors" -msgstr "Użyj niestandardowych kolorów tekstu" - -msgid "Whitespace:" -msgstr "Odstęp:" - -msgid "Regular text:" -msgstr "Czcionka regularna:" - -msgid "Selection:" -msgstr "Zaznaczenie:" - msgid "Backup Files" msgstr "Pliki kopii zapasowej" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 774dd68627c..3b1dbebf873 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -1460,6 +1460,66 @@ msgstr "Diferença de palavra:" msgid "Selected Word Diff:" msgstr "Diferença de palavra selecionada:" +msgid "Dialog" +msgstr "Diálogo" + +msgid "Keywords:" +msgstr "Palavras-chave:" + +msgid "Function names:" +msgstr "Nomes das funções:" + +msgid "Comments:" +msgstr "Comentários:" + +msgid "Numbers:" +msgstr "Números:" + +msgid "Operators:" +msgstr "Operadores:" + +msgid "Strings:" +msgstr "Frases originais:" + +msgid "Preprocessor:" +msgstr "Pré-processador:" + +msgid "User 1:" +msgstr "Utilizador 1:" + +msgid "User 2:" +msgstr "Utilizador 2:" + +msgid "Bold" +msgstr "Negrito" + +msgid "&Use customized text colors" +msgstr "Utilizar cores de texto personalizadas" + +msgid "Whitespace:" +msgstr "Espaço:" + +msgid "Regular text:" +msgstr "Texto normal:" + +msgid "Selection:" +msgstr "Seleção:" + +msgid "Margin:" +msgstr "Margem:" + +msgid "Search Marker:" +msgstr "Procurar marcador:" + +msgid "User Defined Marker1:" +msgstr "Marcador 1 definido pelo utilizador:" + +msgid "User Defined Marker2:" +msgstr "Marcador 2 definido pelo utilizador:" + +msgid "User Defined Marker3:" +msgstr "Marcador 3 definido pelo utilizador:" + msgid "&Use folder compare colors" msgstr "&Utilizar pasta de comparar cores" @@ -1475,8 +1535,8 @@ msgstr "Os itens não existem todos:" msgid "Items filtered:" msgstr "Itens filtrados:" -msgid "Margin:" -msgstr "Margem:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistema" @@ -1799,51 +1859,6 @@ msgstr "Importar..." msgid "Export..." msgstr "Exportar..." -msgid "Dialog" -msgstr "Diálogo" - -msgid "Keywords:" -msgstr "Palavras-chave:" - -msgid "Function names:" -msgstr "Nomes das funções:" - -msgid "Comments:" -msgstr "Comentários:" - -msgid "Numbers:" -msgstr "Números:" - -msgid "Operators:" -msgstr "Operadores:" - -msgid "Strings:" -msgstr "Frases originais:" - -msgid "Preprocessor:" -msgstr "Pré-processador:" - -msgid "User 1:" -msgstr "Utilizador 1:" - -msgid "User 2:" -msgstr "Utilizador 2:" - -msgid "Bold" -msgstr "Negrito" - -msgid "Search Marker:" -msgstr "Procurar marcador:" - -msgid "User Defined Marker1:" -msgstr "Marcador 1 definido pelo utilizador:" - -msgid "User Defined Marker2:" -msgstr "Marcador 2 definido pelo utilizador:" - -msgid "User Defined Marker3:" -msgstr "Marcador 3 definido pelo utilizador:" - msgid "Folder Compare Report" msgstr "Relatório de comparação de ficheiros" @@ -1991,18 +2006,6 @@ msgstr "&Permitir novas linhas entre aspas" msgid "&Quote character:" msgstr "&Citar caráter:" -msgid "&Use customized text colors" -msgstr "Utilizar cores de texto personalizadas" - -msgid "Whitespace:" -msgstr "Espaço:" - -msgid "Regular text:" -msgstr "Texto normal:" - -msgid "Selection:" -msgstr "Seleção:" - msgid "Backup Files" msgstr "Cópia de ficheiros" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index f63e0074040..92565a6f4e2 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -1460,6 +1460,66 @@ msgstr "Diferență cuvânt:" msgid "Selected Word Diff:" msgstr "Diferență cuvânt selectată:" +msgid "Dialog" +msgstr "Dialog" + +msgid "Keywords:" +msgstr "Cuvinte cheie:" + +msgid "Function names:" +msgstr "Nume de funcții:" + +msgid "Comments:" +msgstr "Comentarii:" + +msgid "Numbers:" +msgstr "Numere:" + +msgid "Operators:" +msgstr "Operatori:" + +msgid "Strings:" +msgstr "Șiruri de caractere:" + +msgid "Preprocessor:" +msgstr "Preprocesor:" + +msgid "User 1:" +msgstr "Utilizator 1:" + +msgid "User 2:" +msgstr "Utilizator 2:" + +msgid "Bold" +msgstr "Aldine" + +msgid "&Use customized text colors" +msgstr "Folosește c&ulori ale textului personalizate" + +msgid "Whitespace:" +msgstr "Blancuri:" + +msgid "Regular text:" +msgstr "Text normal:" + +msgid "Selection:" +msgstr "Selecție:" + +msgid "Margin:" +msgstr "Margine:" + +msgid "Search Marker:" +msgstr "Marcatorul de căutare:" + +msgid "User Defined Marker1:" +msgstr "Marcatorul definit utilizator 1:" + +msgid "User Defined Marker2:" +msgstr "Marcatorul definit utilizator 2:" + +msgid "User Defined Marker3:" +msgstr "Marcatorul definit utilizator 3:" + msgid "&Use folder compare colors" msgstr "&Utilizează culorile de comparare a directoarelor" @@ -1475,8 +1535,8 @@ msgstr "Elemente nu există toate:" msgid "Items filtered:" msgstr "Elemente filtrate:" -msgid "Margin:" -msgstr "Margine:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistem" @@ -1802,51 +1862,6 @@ msgstr "Importă..." msgid "Export..." msgstr "Exportă..." -msgid "Dialog" -msgstr "Dialog" - -msgid "Keywords:" -msgstr "Cuvinte cheie:" - -msgid "Function names:" -msgstr "Nume de funcții:" - -msgid "Comments:" -msgstr "Comentarii:" - -msgid "Numbers:" -msgstr "Numere:" - -msgid "Operators:" -msgstr "Operatori:" - -msgid "Strings:" -msgstr "Șiruri de caractere:" - -msgid "Preprocessor:" -msgstr "Preprocesor:" - -msgid "User 1:" -msgstr "Utilizator 1:" - -msgid "User 2:" -msgstr "Utilizator 2:" - -msgid "Bold" -msgstr "Aldine" - -msgid "Search Marker:" -msgstr "Marcatorul de căutare:" - -msgid "User Defined Marker1:" -msgstr "Marcatorul definit utilizator 1:" - -msgid "User Defined Marker2:" -msgstr "Marcatorul definit utilizator 2:" - -msgid "User Defined Marker3:" -msgstr "Marcatorul definit utilizator 3:" - msgid "Folder Compare Report" msgstr "Raport comparare directoare" @@ -1994,18 +2009,6 @@ msgstr "Permite sfârșituri de rând în ghilimele" msgid "&Quote character:" msgstr "Caracterul de citare:" -msgid "&Use customized text colors" -msgstr "Folosește c&ulori ale textului personalizate" - -msgid "Whitespace:" -msgstr "Blancuri:" - -msgid "Regular text:" -msgstr "Text normal:" - -msgid "Selection:" -msgstr "Selecție:" - msgid "Backup Files" msgstr "Copii de siguranță" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 1222c4887ff..ec10c4089a6 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -1457,6 +1457,66 @@ msgstr "Словарное отличие:" msgid "Selected Word Diff:" msgstr "Выбранное словарное отличие:" +msgid "Dialog" +msgstr "Диалог" + +msgid "Keywords:" +msgstr "Ключевые слова:" + +msgid "Function names:" +msgstr "Имена функций:" + +msgid "Comments:" +msgstr "Комментарии:" + +msgid "Numbers:" +msgstr "Числа:" + +msgid "Operators:" +msgstr "Операторы:" + +msgid "Strings:" +msgstr "Строки:" + +msgid "Preprocessor:" +msgstr "Препроцессор:" + +msgid "User 1:" +msgstr "Пользователь 1:" + +msgid "User 2:" +msgstr "Пользователь 2:" + +msgid "Bold" +msgstr "Жирный" + +msgid "&Use customized text colors" +msgstr "Использовать особые цвета" + +msgid "Whitespace:" +msgstr "Невидимые:" + +msgid "Regular text:" +msgstr "Обычный текст:" + +msgid "Selection:" +msgstr "Выбранный текст:" + +msgid "Margin:" +msgstr "Поле:" + +msgid "Search Marker:" +msgstr "Маркер поиска:" + +msgid "User Defined Marker1:" +msgstr "Пользоват. маркер1:" + +msgid "User Defined Marker2:" +msgstr "Пользоват. маркер2:" + +msgid "User Defined Marker3:" +msgstr "Пользоват. маркер3:" + msgid "&Use folder compare colors" msgstr "Использовать цвета сравнения папок" @@ -1472,8 +1532,8 @@ msgstr "Элементы существуют не все:" msgid "Items filtered:" msgstr "Элементы отфильтрованы:" -msgid "Margin:" -msgstr "Поле:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Система" @@ -1784,51 +1844,6 @@ msgstr "Импорт..." msgid "Export..." msgstr "Экспорт..." -msgid "Dialog" -msgstr "Диалог" - -msgid "Keywords:" -msgstr "Ключевые слова:" - -msgid "Function names:" -msgstr "Имена функций:" - -msgid "Comments:" -msgstr "Комментарии:" - -msgid "Numbers:" -msgstr "Числа:" - -msgid "Operators:" -msgstr "Операторы:" - -msgid "Strings:" -msgstr "Строки:" - -msgid "Preprocessor:" -msgstr "Препроцессор:" - -msgid "User 1:" -msgstr "Пользователь 1:" - -msgid "User 2:" -msgstr "Пользователь 2:" - -msgid "Bold" -msgstr "Жирный" - -msgid "Search Marker:" -msgstr "Маркер поиска:" - -msgid "User Defined Marker1:" -msgstr "Пользоват. маркер1:" - -msgid "User Defined Marker2:" -msgstr "Пользоват. маркер2:" - -msgid "User Defined Marker3:" -msgstr "Пользоват. маркер3:" - msgid "Folder Compare Report" msgstr "Отчет сравнения папок" @@ -1976,18 +1991,6 @@ msgstr "Разрешить новые строки в кавычках" msgid "&Quote character:" msgstr "Символ кавычки:" -msgid "&Use customized text colors" -msgstr "Использовать особые цвета" - -msgid "Whitespace:" -msgstr "Невидимые:" - -msgid "Regular text:" -msgstr "Обычный текст:" - -msgid "Selection:" -msgstr "Выбранный текст:" - msgid "Backup Files" msgstr "Резервные копии" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 1b6f702a555..4fbbf526f5b 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -1739,6 +1739,86 @@ msgstr "Различите речи:" msgid "Selected Word Diff:" msgstr "Одабери различите речи:" +#, c-format +msgid "Dialog" +msgstr "Разговор" + +#, c-format +msgid "Keywords:" +msgstr "Кључне речи:" + +#, c-format +msgid "Function names:" +msgstr "Имена функција:" + +#, c-format +msgid "Comments:" +msgstr "Напомене:" + +#, c-format +msgid "Numbers:" +msgstr "Бројеви:" + +#, c-format +msgid "Operators:" +msgstr "Оператери:" + +#, c-format +msgid "Strings:" +msgstr "Појмови:" + +#, c-format +msgid "Preprocessor:" +msgstr "Претпроцесор:" + +#, c-format +msgid "User 1:" +msgstr "Корисник 1:" + +#, c-format +msgid "User 2:" +msgstr "Корисник 2:" + +#, c-format +msgid "Bold" +msgstr "Подебљано" + +#, c-format +msgid "&Use customized text colors" +msgstr "Користи жељене боје текста" + +#, c-format +msgid "Whitespace:" +msgstr "Размак:" + +#, c-format +msgid "Regular text:" +msgstr "Правилан текст:" + +#, c-format +msgid "Selection:" +msgstr "Изабери:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1754,8 +1834,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2145,66 +2224,6 @@ msgstr "Увези..." msgid "Export..." msgstr "Извези..." -#, c-format -msgid "Dialog" -msgstr "Разговор" - -#, c-format -msgid "Keywords:" -msgstr "Кључне речи:" - -#, c-format -msgid "Function names:" -msgstr "Имена функција:" - -#, c-format -msgid "Comments:" -msgstr "Напомене:" - -#, c-format -msgid "Numbers:" -msgstr "Бројеви:" - -#, c-format -msgid "Operators:" -msgstr "Оператери:" - -#, c-format -msgid "Strings:" -msgstr "Појмови:" - -#, c-format -msgid "Preprocessor:" -msgstr "Претпроцесор:" - -#, c-format -msgid "User 1:" -msgstr "Корисник 1:" - -#, c-format -msgid "User 2:" -msgstr "Корисник 2:" - -#, c-format -msgid "Bold" -msgstr "Подебљано" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Извештај упоређених фасцикли" @@ -2391,22 +2410,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "Користи жељене боје текста" - -#, c-format -msgid "Whitespace:" -msgstr "Размак:" - -#, c-format -msgid "Regular text:" -msgstr "Правилан текст:" - -#, c-format -msgid "Selection:" -msgstr "Изабери:" - #, c-format msgid "Backup Files" msgstr "Резервне датотеке" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 764d20f7520..b0aa6d06649 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -1754,6 +1754,86 @@ msgstr "වචන වෙනස:" msgid "Selected Word Diff:" msgstr "තෝරාගත් වචන වෙනස:" +#, fuzzy, c-format +msgid "Dialog" +msgstr "Dialog" + +#, c-format +msgid "Keywords:" +msgstr "මූලික පද:" + +#, c-format +msgid "Function names:" +msgstr "ක්‍රියානාම:" + +#, c-format +msgid "Comments:" +msgstr "අදහස්:" + +#, c-format +msgid "Numbers:" +msgstr "අංක:" + +#, c-format +msgid "Operators:" +msgstr "මෙහෙයුම් සංකේත:" + +#, c-format +msgid "Strings:" +msgstr "Strings:" + +#, c-format +msgid "Preprocessor:" +msgstr "පූර්ව සැකසුම" + +#, c-format +msgid "User 1:" +msgstr "පරිශීලිකයා 1:" + +#, c-format +msgid "User 2:" +msgstr "පරිශීලිකයා 2:" + +#, fuzzy, c-format +msgid "Bold" +msgstr "Bold" + +#, c-format +msgid "&Use customized text colors" +msgstr "භවිතා කරනලද වගන්ති වර්ණ භාවිතය" + +#, c-format +msgid "Whitespace:" +msgstr "සුදු අවකාශය:" + +#, c-format +msgid "Regular text:" +msgstr "විධිමත් වගන්තිය" + +#, c-format +msgid "Selection:" +msgstr "තෝරා ගැනීම:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1769,8 +1849,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2160,66 +2239,6 @@ msgstr "ආනයනය..." msgid "Export..." msgstr "අපනයනය..." -#, fuzzy, c-format -msgid "Dialog" -msgstr "Dialog" - -#, c-format -msgid "Keywords:" -msgstr "මූලික පද:" - -#, c-format -msgid "Function names:" -msgstr "ක්‍රියානාම:" - -#, c-format -msgid "Comments:" -msgstr "අදහස්:" - -#, c-format -msgid "Numbers:" -msgstr "අංක:" - -#, c-format -msgid "Operators:" -msgstr "මෙහෙයුම් සංකේත:" - -#, c-format -msgid "Strings:" -msgstr "Strings:" - -#, c-format -msgid "Preprocessor:" -msgstr "පූර්ව සැකසුම" - -#, c-format -msgid "User 1:" -msgstr "පරිශීලිකයා 1:" - -#, c-format -msgid "User 2:" -msgstr "පරිශීලිකයා 2:" - -#, fuzzy, c-format -msgid "Bold" -msgstr "Bold" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "පත්‍රිකා සැසඳීමේ වාර්තාව" @@ -2406,22 +2425,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "භවිතා කරනලද වගන්ති වර්ණ භාවිතය" - -#, c-format -msgid "Whitespace:" -msgstr "සුදු අවකාශය:" - -#, c-format -msgid "Regular text:" -msgstr "විධිමත් වගන්තිය" - -#, c-format -msgid "Selection:" -msgstr "තෝරා ගැනීම:" - #, c-format msgid "Backup Files" msgstr "රක්ෂිත ලිපි ගොනු" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 4585d12e150..975fab208ac 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -1455,6 +1455,66 @@ msgstr "Rozdiel slova:" msgid "Selected Word Diff:" msgstr "Rozdiel vybraného slova:" +msgid "Dialog" +msgstr "Dialóg" + +msgid "Keywords:" +msgstr "Kľúčové slová:" + +msgid "Function names:" +msgstr "Názvy funkcií:" + +msgid "Comments:" +msgstr "Komentáre:" + +msgid "Numbers:" +msgstr "Čísla:" + +msgid "Operators:" +msgstr "Operátory:" + +msgid "Strings:" +msgstr "Reťazce:" + +msgid "Preprocessor:" +msgstr "Preprocesor:" + +msgid "User 1:" +msgstr "Užívateľ 1:" + +msgid "User 2:" +msgstr "Užívateľ 2:" + +msgid "Bold" +msgstr "Tučné" + +msgid "&Use customized text colors" +msgstr "&Použiť prispôsobené farby textu" + +msgid "Whitespace:" +msgstr "Netlačiteľné znaky:" + +msgid "Regular text:" +msgstr "Bežný text:" + +msgid "Selection:" +msgstr "Výber:" + +msgid "Margin:" +msgstr "Okraj:" + +msgid "Search Marker:" +msgstr "Značka hľadania:" + +msgid "User Defined Marker1:" +msgstr "Užívateľom definovaná značka1:" + +msgid "User Defined Marker2:" +msgstr "Užívateľom definovaná značka2:" + +msgid "User Defined Marker3:" +msgstr "Užívateľom definovaná značka3:" + msgid "&Use folder compare colors" msgstr "&Použiť priečinky porovnania farieb" @@ -1470,8 +1530,8 @@ msgstr "Všetky neexistujúce položky:" msgid "Items filtered:" msgstr "Filtrované položky:" -msgid "Margin:" -msgstr "Okraj:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Systém" @@ -1790,51 +1850,6 @@ msgstr "Importovať..." msgid "Export..." msgstr "Exportovať..." -msgid "Dialog" -msgstr "Dialóg" - -msgid "Keywords:" -msgstr "Kľúčové slová:" - -msgid "Function names:" -msgstr "Názvy funkcií:" - -msgid "Comments:" -msgstr "Komentáre:" - -msgid "Numbers:" -msgstr "Čísla:" - -msgid "Operators:" -msgstr "Operátory:" - -msgid "Strings:" -msgstr "Reťazce:" - -msgid "Preprocessor:" -msgstr "Preprocesor:" - -msgid "User 1:" -msgstr "Užívateľ 1:" - -msgid "User 2:" -msgstr "Užívateľ 2:" - -msgid "Bold" -msgstr "Tučné" - -msgid "Search Marker:" -msgstr "Značka hľadania:" - -msgid "User Defined Marker1:" -msgstr "Užívateľom definovaná značka1:" - -msgid "User Defined Marker2:" -msgstr "Užívateľom definovaná značka2:" - -msgid "User Defined Marker3:" -msgstr "Užívateľom definovaná značka3:" - msgid "Folder Compare Report" msgstr "Správa o porovnaní priečinkov" @@ -1982,18 +1997,6 @@ msgstr "&Povoliť nové riadky v úvodzovkách" msgid "&Quote character:" msgstr "Znak ú&vodzovky:" -msgid "&Use customized text colors" -msgstr "&Použiť prispôsobené farby textu" - -msgid "Whitespace:" -msgstr "Netlačiteľné znaky:" - -msgid "Regular text:" -msgstr "Bežný text:" - -msgid "Selection:" -msgstr "Výber:" - msgid "Backup Files" msgstr "Záložné súbory" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index a5c867a8b17..2966250140d 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -1455,6 +1455,66 @@ msgstr "Besedne razlike:" msgid "Selected Word Diff:" msgstr "Izbrane razlike besed:" +msgid "Dialog" +msgstr "Pogovorno okno" + +msgid "Keywords:" +msgstr "Ključne besede:" + +msgid "Function names:" +msgstr "Imena funkcij:" + +msgid "Comments:" +msgstr "Komentarji:" + +msgid "Numbers:" +msgstr "Številke:" + +msgid "Operators:" +msgstr "Operatorji:" + +msgid "Strings:" +msgstr "Nizi:" + +msgid "Preprocessor:" +msgstr "Predobdelano:" + +msgid "User 1:" +msgstr "Uporabnik 1:" + +msgid "User 2:" +msgstr "Uporabnik 2:" + +msgid "Bold" +msgstr "Krepko" + +msgid "&Use customized text colors" +msgstr "&Uporabi prilagojene barve besedila" + +msgid "Whitespace:" +msgstr "Prazen znak:" + +msgid "Regular text:" +msgstr "Redno besedilo:" + +msgid "Selection:" +msgstr "Izbor:" + +msgid "Margin:" +msgstr "Rob:" + +msgid "Search Marker:" +msgstr "Iskalni označev.:" + +msgid "User Defined Marker1:" +msgstr "Uporabn. določen1:" + +msgid "User Defined Marker2:" +msgstr "Uporabn. določen2:" + +msgid "User Defined Marker3:" +msgstr "Uporabn. določen3:" + msgid "&Use folder compare colors" msgstr "&Uporabi barve primerjav map" @@ -1470,8 +1530,8 @@ msgstr "Vseh neobstoječih vnosov:" msgid "Items filtered:" msgstr "Filtriranih vnosov:" -msgid "Margin:" -msgstr "Rob:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistem" @@ -1790,51 +1850,6 @@ msgstr "Uvozi..." msgid "Export..." msgstr "Izvozi..." -msgid "Dialog" -msgstr "Pogovorno okno" - -msgid "Keywords:" -msgstr "Ključne besede:" - -msgid "Function names:" -msgstr "Imena funkcij:" - -msgid "Comments:" -msgstr "Komentarji:" - -msgid "Numbers:" -msgstr "Številke:" - -msgid "Operators:" -msgstr "Operatorji:" - -msgid "Strings:" -msgstr "Nizi:" - -msgid "Preprocessor:" -msgstr "Predobdelano:" - -msgid "User 1:" -msgstr "Uporabnik 1:" - -msgid "User 2:" -msgstr "Uporabnik 2:" - -msgid "Bold" -msgstr "Krepko" - -msgid "Search Marker:" -msgstr "Iskalni označev.:" - -msgid "User Defined Marker1:" -msgstr "Uporabn. določen1:" - -msgid "User Defined Marker2:" -msgstr "Uporabn. določen2:" - -msgid "User Defined Marker3:" -msgstr "Uporabn. določen3:" - msgid "Folder Compare Report" msgstr "Poročilo primerjanja datotek" @@ -1982,18 +1997,6 @@ msgstr "&Dovoli nove vrstice v narekovajih" msgid "&Quote character:" msgstr "Z&nak narekovaja:" -msgid "&Use customized text colors" -msgstr "&Uporabi prilagojene barve besedila" - -msgid "Whitespace:" -msgstr "Prazen znak:" - -msgid "Regular text:" -msgstr "Redno besedilo:" - -msgid "Selection:" -msgstr "Izbor:" - msgid "Backup Files" msgstr "Datoteke varnostnih kopij" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 06b1719c0b8..c73559bf7b7 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -1458,6 +1458,66 @@ msgstr "Diferencia de palabras:" msgid "Selected Word Diff:" msgstr "Diferencia de palabra seleccionada:" +msgid "Dialog" +msgstr "Diálogo" + +msgid "Keywords:" +msgstr "Palabras clave:" + +msgid "Function names:" +msgstr "Funciones:" + +msgid "Comments:" +msgstr "Comentarios:" + +msgid "Numbers:" +msgstr "Números:" + +msgid "Operators:" +msgstr "Operadores:" + +msgid "Strings:" +msgstr "Cadenas:" + +msgid "Preprocessor:" +msgstr "Preprocesador:" + +msgid "User 1:" +msgstr "Usuario 1:" + +msgid "User 2:" +msgstr "Usuario 2:" + +msgid "Bold" +msgstr "Negrita" + +msgid "&Use customized text colors" +msgstr "&Usar colores personalizados para el texto" + +msgid "Whitespace:" +msgstr "Espacio:" + +msgid "Regular text:" +msgstr "Texto normal:" + +msgid "Selection:" +msgstr "Selección:" + +msgid "Margin:" +msgstr "Margen:" + +msgid "Search Marker:" +msgstr "Marcador de búsqueda:" + +msgid "User Defined Marker1:" +msgstr "Personalizado #1:" + +msgid "User Defined Marker2:" +msgstr "Personalizado #2:" + +msgid "User Defined Marker3:" +msgstr "Personalizado #3:" + msgid "&Use folder compare colors" msgstr "&Usar colores para comparar carpetas" @@ -1473,8 +1533,8 @@ msgstr "Elementos inexistentes:" msgid "Items filtered:" msgstr "Elementos filtrados:" -msgid "Margin:" -msgstr "Margen:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistema" @@ -1793,51 +1853,6 @@ msgstr "Importar..." msgid "Export..." msgstr "Exportar..." -msgid "Dialog" -msgstr "Diálogo" - -msgid "Keywords:" -msgstr "Palabras clave:" - -msgid "Function names:" -msgstr "Funciones:" - -msgid "Comments:" -msgstr "Comentarios:" - -msgid "Numbers:" -msgstr "Números:" - -msgid "Operators:" -msgstr "Operadores:" - -msgid "Strings:" -msgstr "Cadenas:" - -msgid "Preprocessor:" -msgstr "Preprocesador:" - -msgid "User 1:" -msgstr "Usuario 1:" - -msgid "User 2:" -msgstr "Usuario 2:" - -msgid "Bold" -msgstr "Negrita" - -msgid "Search Marker:" -msgstr "Marcador de búsqueda:" - -msgid "User Defined Marker1:" -msgstr "Personalizado #1:" - -msgid "User Defined Marker2:" -msgstr "Personalizado #2:" - -msgid "User Defined Marker3:" -msgstr "Personalizado #3:" - msgid "Folder Compare Report" msgstr "Informe de comparación de carpetas" @@ -1985,18 +2000,6 @@ msgstr "Permitir nuev&as líneas entre comillas" msgid "&Quote character:" msgstr "Ca&rácter de comilla:" -msgid "&Use customized text colors" -msgstr "&Usar colores personalizados para el texto" - -msgid "Whitespace:" -msgstr "Espacio:" - -msgid "Regular text:" -msgstr "Texto normal:" - -msgid "Selection:" -msgstr "Selección:" - msgid "Backup Files" msgstr "Copias de seguridad" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 300195b53c3..51b510fbc8b 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -1464,6 +1464,66 @@ msgstr "Ordskillnad:" msgid "Selected Word Diff:" msgstr "Vald skillnad i ord:" +msgid "Dialog" +msgstr "Dialog" + +msgid "Keywords:" +msgstr "Nyckelord:" + +msgid "Function names:" +msgstr "Funktionsnamn:" + +msgid "Comments:" +msgstr "Kommentarer:" + +msgid "Numbers:" +msgstr "Nummer:" + +msgid "Operators:" +msgstr "Operatörer:" + +msgid "Strings:" +msgstr "Strängar:" + +msgid "Preprocessor:" +msgstr "Förbehandlare:" + +msgid "User 1:" +msgstr "Användare 1:" + +msgid "User 2:" +msgstr "Användare 2:" + +msgid "Bold" +msgstr "Fet" + +msgid "&Use customized text colors" +msgstr "Använd anpassade textfärger" + +msgid "Whitespace:" +msgstr "Blankutrymme:" + +msgid "Regular text:" +msgstr "Vanlig text:" + +msgid "Selection:" +msgstr "Markering:" + +msgid "Margin:" +msgstr "Marginal:" + +msgid "Search Marker:" +msgstr "Sökmarkör:" + +msgid "User Defined Marker1:" +msgstr "Användardefinierad markör 1:" + +msgid "User Defined Marker2:" +msgstr "Användardefinierad markör 2:" + +msgid "User Defined Marker3:" +msgstr "Användardefinierad markör 3:" + msgid "&Use folder compare colors" msgstr "Använd färger för mappjämförelse" @@ -1479,8 +1539,8 @@ msgstr "Objekt som ej finns:" msgid "Items filtered:" msgstr "Objekt filtrerade:" -msgid "Margin:" -msgstr "Marginal:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "System" @@ -1803,51 +1863,6 @@ msgstr "Importera..." msgid "Export..." msgstr "Exportera..." -msgid "Dialog" -msgstr "Dialog" - -msgid "Keywords:" -msgstr "Nyckelord:" - -msgid "Function names:" -msgstr "Funktionsnamn:" - -msgid "Comments:" -msgstr "Kommentarer:" - -msgid "Numbers:" -msgstr "Nummer:" - -msgid "Operators:" -msgstr "Operatörer:" - -msgid "Strings:" -msgstr "Strängar:" - -msgid "Preprocessor:" -msgstr "Förbehandlare:" - -msgid "User 1:" -msgstr "Användare 1:" - -msgid "User 2:" -msgstr "Användare 2:" - -msgid "Bold" -msgstr "Fet" - -msgid "Search Marker:" -msgstr "Sökmarkör:" - -msgid "User Defined Marker1:" -msgstr "Användardefinierad markör 1:" - -msgid "User Defined Marker2:" -msgstr "Användardefinierad markör 2:" - -msgid "User Defined Marker3:" -msgstr "Användardefinierad markör 3:" - msgid "Folder Compare Report" msgstr "Rapport för katalogjämförelse" @@ -1995,18 +2010,6 @@ msgstr "Tillåt nya rader i citat" msgid "&Quote character:" msgstr "Tecken för omkapsling:" -msgid "&Use customized text colors" -msgstr "Använd anpassade textfärger" - -msgid "Whitespace:" -msgstr "Blankutrymme:" - -msgid "Regular text:" -msgstr "Vanlig text:" - -msgid "Selection:" -msgstr "Markering:" - msgid "Backup Files" msgstr "Säkerhetskopierade filer" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index a702d22b579..09e2a1490a0 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -1453,6 +1453,66 @@ msgstr "சொல் வேறுபாடு:" msgid "Selected Word Diff:" msgstr "தேர்ந்தெடுக்கப்பட்ட வார்த்தை வேறுபாடு:" +msgid "Dialog" +msgstr "உரையாடல்" + +msgid "Keywords:" +msgstr "திறவுச்சொற்கள்:" + +msgid "Function names:" +msgstr "செயல்பாடு பெயர்கள்:" + +msgid "Comments:" +msgstr "கருத்துகள்:" + +msgid "Numbers:" +msgstr "எண்கள்:" + +msgid "Operators:" +msgstr "ஆபரேட்டர்கள்:" + +msgid "Strings:" +msgstr "சரங்கள்:" + +msgid "Preprocessor:" +msgstr "முன்செயலி:" + +msgid "User 1:" +msgstr "பயனர் 1:" + +msgid "User 2:" +msgstr "பயனர் 2:" + +msgid "Bold" +msgstr "தடித்த" + +msgid "&Use customized text colors" +msgstr "&பிரத்தியேகப்படுத்தப்பட்ட உரை வண்ணங்களைப் பயன்படுத்தவும்" + +msgid "Whitespace:" +msgstr "வெள்ளைவெளி:" + +msgid "Regular text:" +msgstr "வழக்கமான உரை:" + +msgid "Selection:" +msgstr "தேர்வு:" + +msgid "Margin:" +msgstr "விளிம்பு:" + +msgid "Search Marker:" +msgstr "தேடல் குறிப்பான்:" + +msgid "User Defined Marker1:" +msgstr "பயனர் வரையறுக்கப்பட்ட மார்க்கர்1:" + +msgid "User Defined Marker2:" +msgstr "பயனர் வரையறுக்கப்பட்ட மார்க்கர்2:" + +msgid "User Defined Marker3:" +msgstr "பயனர் வரையறுக்கப்பட்ட மார்க்கர்3:" + msgid "&Use folder compare colors" msgstr "நிறங்களை ஒப்பிட்டு கோப்புறையை பயன்படுத்தவும்" @@ -1468,8 +1528,8 @@ msgstr "உருப்படிகள் அனைத்தும் இல் msgid "Items filtered:" msgstr "வடிகட்டப்பட்ட உருப்படிகள்:" -msgid "Margin:" -msgstr "விளிம்பு:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "அமைப்பு" @@ -1788,51 +1848,6 @@ msgstr "இறக்குமதி..." msgid "Export..." msgstr "ஏற்றுமதி..." -msgid "Dialog" -msgstr "உரையாடல்" - -msgid "Keywords:" -msgstr "திறவுச்சொற்கள்:" - -msgid "Function names:" -msgstr "செயல்பாடு பெயர்கள்:" - -msgid "Comments:" -msgstr "கருத்துகள்:" - -msgid "Numbers:" -msgstr "எண்கள்:" - -msgid "Operators:" -msgstr "ஆபரேட்டர்கள்:" - -msgid "Strings:" -msgstr "சரங்கள்:" - -msgid "Preprocessor:" -msgstr "முன்செயலி:" - -msgid "User 1:" -msgstr "பயனர் 1:" - -msgid "User 2:" -msgstr "பயனர் 2:" - -msgid "Bold" -msgstr "தடித்த" - -msgid "Search Marker:" -msgstr "தேடல் குறிப்பான்:" - -msgid "User Defined Marker1:" -msgstr "பயனர் வரையறுக்கப்பட்ட மார்க்கர்1:" - -msgid "User Defined Marker2:" -msgstr "பயனர் வரையறுக்கப்பட்ட மார்க்கர்2:" - -msgid "User Defined Marker3:" -msgstr "பயனர் வரையறுக்கப்பட்ட மார்க்கர்3:" - msgid "Folder Compare Report" msgstr "கோப்புறை ஒப்பீட்டு அறிக்கை" @@ -1980,18 +1995,6 @@ msgstr "&மேற்கோள்களில் புதிய வரிகள msgid "&Quote character:" msgstr "&மேற்கோள் எழுத்து:" -msgid "&Use customized text colors" -msgstr "&பிரத்தியேகப்படுத்தப்பட்ட உரை வண்ணங்களைப் பயன்படுத்தவும்" - -msgid "Whitespace:" -msgstr "வெள்ளைவெளி:" - -msgid "Regular text:" -msgstr "வழக்கமான உரை:" - -msgid "Selection:" -msgstr "தேர்வு:" - msgid "Backup Files" msgstr "காப்பு கோப்புகள்" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 7a08aea92ea..a0495707bc5 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -1454,6 +1454,66 @@ msgstr "Sözcük farklılığı:" msgid "Selected Word Diff:" msgstr "Seçilmiş sözcük farklılığı:" +msgid "Dialog" +msgstr "Pencere" + +msgid "Keywords:" +msgstr "Anahtar sözcükler:" + +msgid "Function names:" +msgstr "İşlev adları:" + +msgid "Comments:" +msgstr "Açıklamalar:" + +msgid "Numbers:" +msgstr "Rakamlar:" + +msgid "Operators:" +msgstr "İşlemler:" + +msgid "Strings:" +msgstr "Dizgeler:" + +msgid "Preprocessor:" +msgstr "Ön işleyici:" + +msgid "User 1:" +msgstr "1. kullanıcı:" + +msgid "User 2:" +msgstr "2. kullanıcı:" + +msgid "Bold" +msgstr "Koyu" + +msgid "&Use customized text colors" +msgstr "Özel metin renkleri k&ullanılsın" + +msgid "Whitespace:" +msgstr "Beyaz boşluk:" + +msgid "Regular text:" +msgstr "Normal metin:" + +msgid "Selection:" +msgstr "Seçim:" + +msgid "Margin:" +msgstr "Kenar boşluğu:" + +msgid "Search Marker:" +msgstr "Arama işaretleyicisi:" + +msgid "User Defined Marker1:" +msgstr "1. kullanıcı işaretleyicisi:" + +msgid "User Defined Marker2:" +msgstr "2. kullanıcı işaretleyicisi:" + +msgid "User Defined Marker3:" +msgstr "3. kullanıcı işaretleyicisi:" + msgid "&Use folder compare colors" msgstr "Klasör karşılaştırma renkleri k&ullanılsın" @@ -1469,8 +1529,8 @@ msgstr "Artık var olmayan ögeler:" msgid "Items filtered:" msgstr "Süzülmüş ögeler:" -msgid "Margin:" -msgstr "Kenar boşluğu:" +msgid "&Use custom system colors (Some UI elements may not apply)" +msgstr "" msgid "System" msgstr "Sistem" @@ -1781,51 +1841,6 @@ msgstr "İçe aktar..." msgid "Export..." msgstr "Dışa aktar..." -msgid "Dialog" -msgstr "Pencere" - -msgid "Keywords:" -msgstr "Anahtar sözcükler:" - -msgid "Function names:" -msgstr "İşlev adları:" - -msgid "Comments:" -msgstr "Açıklamalar:" - -msgid "Numbers:" -msgstr "Rakamlar:" - -msgid "Operators:" -msgstr "İşlemler:" - -msgid "Strings:" -msgstr "Dizgeler:" - -msgid "Preprocessor:" -msgstr "Ön işleyici:" - -msgid "User 1:" -msgstr "1. kullanıcı:" - -msgid "User 2:" -msgstr "2. kullanıcı:" - -msgid "Bold" -msgstr "Koyu" - -msgid "Search Marker:" -msgstr "Arama işaretleyicisi:" - -msgid "User Defined Marker1:" -msgstr "1. kullanıcı işaretleyicisi:" - -msgid "User Defined Marker2:" -msgstr "2. kullanıcı işaretleyicisi:" - -msgid "User Defined Marker3:" -msgstr "3. kullanıcı işaretleyicisi:" - msgid "Folder Compare Report" msgstr "Klasör Karşılaştırma Raporu" @@ -1973,18 +1988,6 @@ msgstr "Tırnak içinde ¥i satır olabilsin" msgid "&Quote character:" msgstr "&Tırnak karakteri:" -msgid "&Use customized text colors" -msgstr "Özel metin renkleri k&ullanılsın" - -msgid "Whitespace:" -msgstr "Beyaz boşluk:" - -msgid "Regular text:" -msgstr "Normal metin:" - -msgid "Selection:" -msgstr "Seçim:" - msgid "Backup Files" msgstr "Yedekleme dosyaları" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 71fed518253..f9b0a1e857e 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -1738,6 +1738,86 @@ msgstr "Словникова відмінність:" msgid "Selected Word Diff:" msgstr "Відзначена словникова відмінність:" +#, c-format +msgid "Dialog" +msgstr "Діалог" + +#, c-format +msgid "Keywords:" +msgstr "Ключові слова:" + +#, c-format +msgid "Function names:" +msgstr "Імена функцій:" + +#, c-format +msgid "Comments:" +msgstr "Коментарі:" + +#, c-format +msgid "Numbers:" +msgstr "Числа:" + +#, c-format +msgid "Operators:" +msgstr "Оператори:" + +#, c-format +msgid "Strings:" +msgstr "Рядки:" + +#, c-format +msgid "Preprocessor:" +msgstr "Поперед. обрах.:" + +#, c-format +msgid "User 1:" +msgstr "Користувач 1:" + +#, c-format +msgid "User 2:" +msgstr "Користувач 2:" + +#, c-format +msgid "Bold" +msgstr "Грубий" + +#, c-format +msgid "&Use customized text colors" +msgstr "Використати особливі кольори" + +#, c-format +msgid "Whitespace:" +msgstr "Пропуски:" + +#, c-format +msgid "Regular text:" +msgstr "Звичайний текст:" + +#, c-format +msgid "Selection:" +msgstr "Відзнач. текст:" + +#, c-format +msgid "Margin:" +msgstr "" + +#, c-format +msgid "Search Marker:" +msgstr "" + +#, c-format +msgid "User Defined Marker1:" +msgstr "" + +#, c-format +msgid "User Defined Marker2:" +msgstr "" + +#, c-format +msgid "User Defined Marker3:" +msgstr "" + msgid "&Use folder compare colors" msgstr "" @@ -1753,8 +1833,7 @@ msgstr "" msgid "Items filtered:" msgstr "" -#, c-format -msgid "Margin:" +msgid "&Use custom system colors (Some UI elements may not apply)" msgstr "" #, c-format @@ -2146,66 +2225,6 @@ msgstr "Імпорт..." msgid "Export..." msgstr "Експорт..." -#, c-format -msgid "Dialog" -msgstr "Діалог" - -#, c-format -msgid "Keywords:" -msgstr "Ключові слова:" - -#, c-format -msgid "Function names:" -msgstr "Імена функцій:" - -#, c-format -msgid "Comments:" -msgstr "Коментарі:" - -#, c-format -msgid "Numbers:" -msgstr "Числа:" - -#, c-format -msgid "Operators:" -msgstr "Оператори:" - -#, c-format -msgid "Strings:" -msgstr "Рядки:" - -#, c-format -msgid "Preprocessor:" -msgstr "Поперед. обрах.:" - -#, c-format -msgid "User 1:" -msgstr "Користувач 1:" - -#, c-format -msgid "User 2:" -msgstr "Користувач 2:" - -#, c-format -msgid "Bold" -msgstr "Грубий" - -#, c-format -msgid "Search Marker:" -msgstr "" - -#, c-format -msgid "User Defined Marker1:" -msgstr "" - -#, c-format -msgid "User Defined Marker2:" -msgstr "" - -#, c-format -msgid "User Defined Marker3:" -msgstr "" - #, c-format msgid "Folder Compare Report" msgstr "Звіт порівняння тек" @@ -2392,22 +2411,6 @@ msgstr "" msgid "&Quote character:" msgstr "" -#, c-format -msgid "&Use customized text colors" -msgstr "Використати особливі кольори" - -#, c-format -msgid "Whitespace:" -msgstr "Пропуски:" - -#, c-format -msgid "Regular text:" -msgstr "Звичайний текст:" - -#, c-format -msgid "Selection:" -msgstr "Відзнач. текст:" - #, c-format msgid "Backup Files" msgstr "Резервні копії"