Ros-diffs August 2024

ros-diffs@reactos.org

26 participants
139 discussions

[reactos] 01/01: [RSHELL] Fix indentation (#7238)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf681c3a7c2fb499e66dd… commit bf681c3a7c2fb499e66dd86632f9366ed124a933 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 11 23:35:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 23:35:02 2024 +0900 [RSHELL] Fix indentation (#7238) Reduce coding stress. JIRA issue: CORE-18462 Just fix indentation. --- base/shell/rshell/CQuickLaunchBand.cpp | 476 ++++++++++++++++----------------- base/shell/rshell/CQuickLaunchBand.h | 3 +- base/shell/rshell/misc.cpp | 19 +- 3 files changed, 247 insertions(+), 251 deletions(-) diff --git a/base/shell/rshell/CQuickLaunchBand.cpp b/base/shell/rshell/CQuickLaunchBand.cpp index f5ae43ef7a5..1507fc6ca10 100644 --- a/base/shell/rshell/CQuickLaunchBand.cpp +++ b/base/shell/rshell/CQuickLaunchBand.cpp @@ -6,7 +6,6 @@ * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ - #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -40,29 +39,29 @@ HRESULT WINAPI RSHELL_CISFBand_CreateInstance(REFIID riid, void** ppv); const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; // Componenet Category Registration - HRESULT RegisterComCat() +HRESULT RegisterComCat() +{ + CComPtr<ICatRegister> pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); + if (SUCCEEDED(hr)) { - CComPtr<ICatRegister> pcr; - HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); - if (SUCCEEDED(hr)) - { - CATID catid = CATID_DeskBand; - hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); - } - return hr; + CATID catid = CATID_DeskBand; + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } - - HRESULT UnregisterComCat() + return hr; +} + +HRESULT UnregisterComCat() +{ + CComPtr<ICatRegister> pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); + if (SUCCEEDED(hr)) { - CComPtr<ICatRegister> pcr; - HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); - if (SUCCEEDED(hr)) - { - CATID catid = CATID_DeskBand; - hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); - } - return hr; + CATID catid = CATID_DeskBand; + hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } + return hr; +} // Pidl Browser /*++ @@ -79,28 +78,28 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 * @return The PIDL to selected folder. * *--*/ - LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) - { - CComHeapPtr<ITEMIDLIST> pidlRoot; +LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) +{ + CComHeapPtr<ITEMIDLIST> pidlRoot; - WCHAR path[MAX_PATH]; + WCHAR path[MAX_PATH]; - if (nCSIDL) - { - SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); - } + if (nCSIDL) + { + SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); + } - BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; - LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); + BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; + LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); - return pidlSelected; - } + return pidlSelected; +} // CQuickLaunchBand - CQuickLaunchBand::CQuickLaunchBand() {} +CQuickLaunchBand::CQuickLaunchBand() {} - CQuickLaunchBand::~CQuickLaunchBand() {} +CQuickLaunchBand::~CQuickLaunchBand() {} /*****************************************************************************/ // ATL Construct @@ -112,260 +111,259 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 * @return The error code. * *--*/ - HRESULT CQuickLaunchBand::FinalConstruct() - { - HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; +HRESULT CQuickLaunchBand::FinalConstruct() +{ + HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComPtr<IShellFolderBand> pISFB; - hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + CComPtr<IShellFolderBand> pISFB; + hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComPtr<IShellFolder> pISF; - hr = SHGetDesktopFolder(&pISF); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + CComPtr<IShellFolder> pISF; + hr = SHGetDesktopFolder(&pISF); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); - if (pidl == NULL) - return E_FAIL; - pISFB->InitializeSFB(pISF, pidl); + CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); + if (pidl == NULL) + return E_FAIL; + pISFB->InitializeSFB(pISF, pidl); - return hr; - } + return hr; +} // IObjectWithSite - STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) - { - // Internal CISFBand Calls - CComPtr<IObjectWithSite> pIOWS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) +{ + // Internal CISFBand Calls + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr; - return pIOWS->SetSite(pUnkSite); - } + return pIOWS->SetSite(pUnkSite); +} - STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) - { - CComPtr<IObjectWithSite> pIOWS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) +{ + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr; - return pIOWS->GetSite(riid, ppvSite); - } + return pIOWS->GetSite(riid, ppvSite); +} /*****************************************************************************/ // IDeskBand - STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->GetWindow(phwnd); - } + return pIDB->GetWindow(phwnd); +} - STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->ContextSensitiveHelp(fEnterMode); - } + return pIDB->ContextSensitiveHelp(fEnterMode); +} - STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->ShowDW(bShow); - } + return pIDB->ShowDW(bShow); +} - STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->CloseDW(dwReserved); - } + return pIDB->CloseDW(dwReserved); +} - STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); - } + return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); +} - STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; - return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); - } + return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); +} /*****************************************************************************/ // IPersistStream - STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; - - return pIPS->GetClassID(pClassID); - } +STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::IsDirty() - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->GetClassID(pClassID); +} - return pIPS->IsDirty(); - } +STDMETHODIMP CQuickLaunchBand::IsDirty() +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) - { - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->IsDirty(); +} - return pIPS->Load(pStm); - } +STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) +{ + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->Load(pStm); +} - return pIPS->Save(pStm, fClearDirty); - } +STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) - { - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->Save(pStm, fClearDirty); +} - return pIPS->GetSizeMax(pcbSize); - } +STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) +{ + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + return pIPS->GetSizeMax(pcbSize); +} /*****************************************************************************/ // IWinEventHandler - STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) - { - return E_NOTIMPL; - } - - STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) - { - // Internal CISFBand Calls - CComPtr<IWinEventHandler> pWEH; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) - return hr; - - return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); - } +STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) +{ + return E_NOTIMPL; +} + +STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; + + return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); +} + +STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) +{ + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; - STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) - { - // Internal CISFBand Calls - CComPtr<IWinEventHandler> pWEH; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) - return hr; - - return pWEH->IsWindowOwner(hWnd); - } + return pWEH->IsWindowOwner(hWnd); +} /*****************************************************************************/ // *** IOleCommandTarget methods *** - STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) - { - // Internal CISFBand Calls - CComPtr<IOleCommandTarget> pOCT; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr; - return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); - } + return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); +} - STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) - { - // Internal CISFBand Calls - CComPtr<IOleCommandTarget> pOCT; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr; - return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - } + return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); +} /*****************************************************************************/ // *** IContextMenu *** - STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; - return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); - } + return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); +} - STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; - return pICM->InvokeCommand(pici); - } + return pICM->InvokeCommand(pici); +} - STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; - - return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - } \ No newline at end of file +STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; + + return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); +} diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h index 01a194ac6e4..09edd433c30 100644 --- a/base/shell/rshell/CQuickLaunchBand.h +++ b/base/shell/rshell/CQuickLaunchBand.h @@ -27,8 +27,7 @@ class CQuickLaunchBand : HWND m_hWndBro; CComPtr<IUnknown> m_punkISFB; - public: - +public: CQuickLaunchBand(); virtual ~CQuickLaunchBand(); diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index ee9fb672aa1..075daefdbe4 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -56,13 +56,13 @@ extern "C" { -extern HINSTANCE shell32_hInstance; + extern HINSTANCE shell32_hInstance; -HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); -HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); -HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); -HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); -HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); + HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); } DWORD WINAPI WinList_Init(void) @@ -263,9 +263,9 @@ public: STDAPI DllGetClassObject( -REFCLSID rclsid, -REFIID riid, -LPVOID *ppv) + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) { if (!ppv) return E_INVALIDARG; @@ -281,4 +281,3 @@ VOID WINAPI ShowFolderOptionsDialog(UINT Page, BOOL Async) wsprintfA(buf, "rundll32.exe shell32.dll,Options_RunDLL %u", Page); WinExec(buf, SW_SHOW); } -

4 months, 2 weeks

[reactos] 01/01: [NTUSER] Fix popup menu placement when part way off right edge of screen (#7220)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ee30c57fdcda9788fc83… commit 9ee30c57fdcda9788fc83f4193c6755282524e41 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Aug 10 16:00:44 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 16:00:44 2024 -0500 [NTUSER] Fix popup menu placement when part way off right edge of screen (#7220) * Move the popup menu to the right edge of the screen when it is past the screen edge on the right. CORE-19706 --- win32ss/user/ntuser/menu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 47cd4fc42b7..6c454ae4d87 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2992,16 +2992,14 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl /* We are off the right side of the screen */ if (x + width > monitor->rcMonitor.right) { - if ((x - width) < monitor->rcMonitor.left || x >= monitor->rcMonitor.right) - x = monitor->rcMonitor.right - width; - else - x -= width; + /* Position menu at right edge of the screen */ + x = monitor->rcMonitor.right - width; } /* We are off the left side of the screen */ if (x < monitor->rcMonitor.left) { - /* Position menu at left edge of screen */ + /* Position menu at left edge of the screen */ x = 0; if (x < monitor->rcMonitor.left || x >= monitor->rcMonitor.right || bIsPopup)

4 months, 2 weeks

[reactos] 01/01: [NOTEPAD] Don't leave junk behind when opening smaller file (#7227)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e546525eacc7deab3ee36… commit e546525eacc7deab3ee36a61d9821cfd5ec0e0a1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Aug 10 17:08:00 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 17:08:00 2024 +0200 [NOTEPAD] Don't leave junk behind when opening smaller file (#7227) --- base/applications/notepad/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 17939fbd16d..6f61df4b899 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -343,6 +343,7 @@ VOID DoOpenFile(LPCTSTR szFileName) return; WaitCursor(TRUE); + SetWindowText(Globals.hEdit, NULL); hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

4 months, 2 weeks

[reactos] 01/01: [BROWSEUI] Add checkmark for Explorer bar menu items (#7229)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81ec0569637a2ff78a2ad… commit 81ec0569637a2ff78a2adfe35486eb949176b415 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 10 22:15:23 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 10 22:15:23 2024 +0900 [BROWSEUI] Add checkmark for Explorer bar menu items (#7229) Improve UI/UX. JIRA issue: CORE-19689 - In the CShellBrowser::OnInitMenuPopup method, check/uncheck menu items depending on fCurrentVertBar. --- dll/win32/browseui/shellbrowser.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index c86ef25bc5f..00fbb06e07b 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -1823,6 +1823,19 @@ void CShellBrowser::UpdateViewMenu(HMENU theMenu) SetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); } SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, m_settings.fStatusBarVisible ? TRUE : FALSE); + + // Check the menu items for Explorer bar + BOOL bSearchBand = (IsEqualCLSID(CLSID_SH_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_IE_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_FileSearchBand, fCurrentVertBar)); + BOOL bHistory = IsEqualCLSID(CLSID_SH_HistBand, fCurrentVertBar); + BOOL bFavorites = IsEqualCLSID(CLSID_SH_FavBand, fCurrentVertBar); + BOOL bFolders = IsEqualCLSID(CLSID_ExplorerBand, fCurrentVertBar); + SHCheckMenuItem(theMenu, IDM_EXPLORERBAR_SEARCH, bSearchBand); + SHCheckMenuItem(theMenu, IDM_EXPLORERBAR_HISTORY, bHistory); + SHCheckMenuItem(theMenu, IDM_EXPLORERBAR_FAVORITES, bFavorites); + SHCheckMenuItem(theMenu, IDM_EXPLORERBAR_FOLDERS, bFolders); } HRESULT CShellBrowser::BuildExplorerBandMenu()

4 months, 2 weeks

[reactos] 01/01: [SYSDM] Fix for Italian (it-IT) translation (#7216)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73bed3136351bf4995b6f… commit 73bed3136351bf4995b6f200c1d775b1072a625c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 5 15:38:54 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 9 22:42:50 2024 +0200 [SYSDM] Fix for Italian (it-IT) translation (#7216) Addendum to commit 04b2d35f5b (PR #4844), translation proposed by Carlo Bramini. Co-authored-by: Carlo Bramini <carlo.bramix(a)libero.it> --- dll/cpl/sysdm/lang/it-IT.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 4cfcf099f12..af6fcf7796f 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -356,8 +356,8 @@ BEGIN IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." - IDS_WARNINITIALRANGE "The initial paging file size must be between 2 MB and %lu MB on the selected drive." - IDS_WARNMAXIMUMRANGE "The maximum paging file size must be larger than or equal to its initial size, and less than %lu MB on the selected drive." + IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging deve essere compresa tra 2 MB e %lu MB nell'unità selezionata." + IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging deve essere superiore a quella iniziale e minore di %lu MB nell'unità selezionata." IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "None" IDS_PAGEFILE_SYSTEM "System Managed"

4 months, 2 weeks

[reactos] 01/01: [MMEBUDDY][MMENT4][SNDBLST] Add missing \n to SND_*() calls (#7224)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea291af409ddcc2a16ae8… commit ea291af409ddcc2a16ae830916683d0ea587d317 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Aug 9 20:50:51 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 9 20:50:51 2024 +0200 [MMEBUDDY][MMENT4][SNDBLST] Add missing \n to SND_*() calls (#7224) --- dll/win32/sndblst/sndblst.c | 2 +- sdk/lib/drivers/sound/mmebuddy/devicelist.c | 2 +- sdk/lib/drivers/sound/mmebuddy/mmewrap.c | 2 +- sdk/lib/drivers/sound/mment4/control.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/sndblst/sndblst.c b/dll/win32/sndblst/sndblst.c index 40ea7d1b669..8cc05ba1c47 100644 --- a/dll/win32/sndblst/sndblst.c +++ b/dll/win32/sndblst/sndblst.c @@ -224,7 +224,7 @@ DriverProc( case DRV_QUERYCONFIGURE : { - SND_TRACE(L"DRV_QUERYCONFIGURE"); + SND_TRACE(L"DRV_QUERYCONFIGURE\n"); return 0L; } case DRV_CONFIGURE : diff --git a/sdk/lib/drivers/sound/mmebuddy/devicelist.c b/sdk/lib/drivers/sound/mmebuddy/devicelist.c index c2003927320..d023872238b 100644 --- a/sdk/lib/drivers/sound/mmebuddy/devicelist.c +++ b/sdk/lib/drivers/sound/mmebuddy/devicelist.c @@ -51,7 +51,7 @@ FreeSoundDevice( { SND_ASSERT( SoundDevice ); - SND_TRACE(L"Freeing a SOUND_DEVICE structure"); + SND_TRACE(L"Freeing a SOUND_DEVICE structure\n"); /* For safety the whole struct gets zeroed */ ZeroMemory(SoundDevice, sizeof(SOUND_DEVICE)); diff --git a/sdk/lib/drivers/sound/mmebuddy/mmewrap.c b/sdk/lib/drivers/sound/mmebuddy/mmewrap.c index 6a2df3343c6..bec633e638a 100644 --- a/sdk/lib/drivers/sound/mmebuddy/mmewrap.c +++ b/sdk/lib/drivers/sound/mmebuddy/mmewrap.c @@ -142,7 +142,7 @@ MmeOpenDevice( PSOUND_DEVICE_INSTANCE SoundDeviceInstance; LPWAVEFORMATEX Format = NULL; - SND_TRACE(L"Opening device"); + SND_TRACE(L"Opening device\n"); VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) || IS_MIXER_DEVICE_TYPE(DeviceType) || IS_MIDI_DEVICE_TYPE(DeviceType) ); /* FIXME? wave in too? */ VALIDATE_MMSYS_PARAMETER( OpenParameters ); diff --git a/sdk/lib/drivers/sound/mment4/control.c b/sdk/lib/drivers/sound/mment4/control.c index 4dd1b6a97e6..31f94b3f7a6 100644 --- a/sdk/lib/drivers/sound/mment4/control.c +++ b/sdk/lib/drivers/sound/mment4/control.c @@ -33,7 +33,7 @@ OpenNt4KernelSoundDevice( Result = GetSoundDeviceIdentifier(SoundDevice, (PVOID*) &Path); if ( ! MMSUCCESS(Result) ) { - SND_ERR(L"Unable to get sound device path"); + SND_ERR(L"Unable to get sound device path\n"); return TranslateInternalMmResult(Result); } @@ -122,7 +122,7 @@ GetNt4SoundDeviceCapabilities( if ( ! MMSUCCESS(Result) ) { - SND_ERR(L"Failed to open device"); + SND_ERR(L"Failed to open device\n"); return TranslateInternalMmResult(Result); }

4 months, 2 weeks

[reactos] 01/01: [NETSHELL][SHELL32] Make NetShell PIDL format more Windows compatible (#7183)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea60890961dcdda7356a3… commit ea60890961dcdda7356a3c6cfed919fd20905f88 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 8 22:00:03 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 22:00:03 2024 +0200 [NETSHELL][SHELL32] Make NetShell PIDL format more Windows compatible (#7183) - The PIDL format needs to be Windows compatible so that wlanwiz can get the connection GUID. - SHELL32::ILIsEqual cannot deem PIDL formats it does not understand as invalid. - DefView must ask the folder when comparing PIDLs. --- dll/shellext/netshell/enumlist.cpp | 20 +++++++--- dll/shellext/netshell/precomp.h | 20 +++++++--- dll/shellext/netshell/shfldr_netconnect.cpp | 41 +++++++++++++++----- dll/win32/shell32/CDefView.cpp | 24 +++++++++--- dll/win32/shell32/debughlp.cpp | 1 - dll/win32/shell32/wine/pidl.c | 6 +++ sdk/include/reactos/shellfolderutils.h | 58 +++++++++++++++++++++++++++++ 7 files changed, 144 insertions(+), 26 deletions(-) diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp index 5f4b0fbef11..1cc62e79044 100644 --- a/dll/shellext/netshell/enumlist.cpp +++ b/dll/shellext/netshell/enumlist.cpp @@ -9,9 +9,13 @@ PNETCONIDSTRUCT ILGetConnData(PCITEMID_CHILD pidl) { - if (!pidl || !pidl->mkid.cb || pidl->mkid.abID[0] != 0x99) - return NULL; - return (PNETCONIDSTRUCT)(&pidl->mkid.abID[0]); + if (pidl && pidl->mkid.cb >= 2 + sizeof(NETCONIDSTRUCT)) + { + PNETCONIDSTRUCT pData = (PNETCONIDSTRUCT)pidl->mkid.abID; + if (pData->Signature == NETCONIDSTRUCT_SIG) + return pData; + } + return NULL; } PWCHAR ILGetConnName(PCITEMID_CHILD pidl) @@ -48,17 +52,21 @@ PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem) /* Allocate enough memory for the trailing id which will indicate that this is a simple id */ pidl = static_cast<LPITEMIDLIST>(SHAlloc(size + sizeof(SHITEMID))); + if (!pidl) + goto end; pidl->mkid.cb = (WORD)size; - pidl->mkid.abID[0] = 0x99; + ((PNETCONIDSTRUCT)(pidl->mkid.abID))->Signature = NETCONIDSTRUCT_SIG; /* Copy the connection properties */ pnetid = ILGetConnData(pidl); + memset(pnetid->Unknown, 0, sizeof(pnetid->Unknown)); + pnetid->clsidThisObject = pProperties->clsidThisObject; pnetid->guidId = pProperties->guidId; pnetid->Status = pProperties->Status; pnetid->MediaType = pProperties->MediaType; pnetid->dwCharacter = pProperties->dwCharacter; pnetid->uNameOffset = sizeof(NETCONIDSTRUCT); - pnetid->uDeviceNameOffset = pnetid->uNameOffset + (wcslen(pProperties->pszwName) + 1) * sizeof(WCHAR); + pnetid->uDeviceNameOffset = ULONG(pnetid->uNameOffset + (wcslen(pProperties->pszwName) + 1) * sizeof(WCHAR)); pwchName = ILGetConnName(pidl); wcscpy(pwchName, pProperties->pszwName); @@ -68,7 +76,7 @@ PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem) /* Set the trailing id to null */ memset((void*)((ULONG_PTR)pidl + size), 0, sizeof(SHITEMID)); - +end: NcFreeNetconProperties(pProperties); return pidl; diff --git a/dll/shellext/netshell/precomp.h b/dll/shellext/netshell/precomp.h index 7dc020ca442..1f6497c3862 100644 --- a/dll/shellext/netshell/precomp.h +++ b/dll/shellext/netshell/precomp.h @@ -55,16 +55,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern HINSTANCE netshell_hInstance; /* enumlist.c */ +#include <pshpack1.h> +#define NETCONIDSTRUCT_SIG 0x4EFF typedef struct tagNETCONIDSTRUCT { - BYTE type; + WORD Signature; + BYTE Unknown[8]; + CLSID clsidThisObject; GUID guidId; - NETCON_STATUS Status; - NETCON_MEDIATYPE MediaType; DWORD dwCharacter; - ULONG_PTR uNameOffset; - ULONG_PTR uDeviceNameOffset; + NETCON_MEDIATYPE MediaType; + NETCON_STATUS Status; + ULONG uNameOffset; + ULONG uDeviceNameOffset; } NETCONIDSTRUCT, *PNETCONIDSTRUCT; +#include <poppack.h> + +C_ASSERT(2 + FIELD_OFFSET(NETCONIDSTRUCT, clsidThisObject) == 2 + (2 + 8)); +C_ASSERT(2 + FIELD_OFFSET(NETCONIDSTRUCT, guidId) == 2 + (2 + 8 + 16)); +C_ASSERT(2 + FIELD_OFFSET(NETCONIDSTRUCT, dwCharacter) == 2 + (2 + 8 + 32)); +C_ASSERT(2 + FIELD_OFFSET(NETCONIDSTRUCT, MediaType) == 2 + (2 + 8 + 36)); PNETCONIDSTRUCT ILGetConnData(PCITEMID_CHILD pidl); PWCHAR ILGetConnName(PCITEMID_CHILD pidl); diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 588f2c063e8..dca42527e7a 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -6,6 +6,7 @@ */ #include "precomp.h" +#include <shellfolderutils.h> #define MAX_PROPERTY_SHEET_PAGE (10) @@ -99,11 +100,26 @@ HRESULT WINAPI CNetworkConnections::BindToStorage( /************************************************************************** * ISF_NetConnect_fnCompareIDs */ - HRESULT WINAPI CNetworkConnections::CompareIDs( LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - return E_NOTIMPL; + const UINT colcount = NETCONNECTSHELLVIEWCOLUMNS; + + if (ILGetNext(pidl1) || ILGetNext(pidl2)) + return E_NOTIMPL; // FIXME: Can the connection folder have subfolders? + + if (lParam & SHCIDS_CANONICALONLY) + { + PNETCONIDSTRUCT p1 = ILGetConnData(pidl1); + PNETCONIDSTRUCT p2 = ILGetConnData(pidl2); + if (p1 && p2) + { + int res = memcmp(&p1->guidId, &p2->guidId, sizeof(GUID)); + return MAKE_COMPARE_HRESULT(res); + } + } + IShellFolder2 *psf = static_cast<IShellFolder2*>(this); + return ShellFolderImpl_CompareItemIDs<colcount, -1>(psf, lParam, (PCUITEMID_CHILD)pidl1, (PCUITEMID_CHILD)pidl2); } /************************************************************************** @@ -140,6 +156,7 @@ HRESULT WINAPI CNetworkConnections::GetAttributesOf( UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { //IGenericSFImpl *This = (IGenericSFImpl *)iface; + // FIXME: Why are these reporting SFGAO_FILESYSTEM and SFGAO_FILESYSANCESTOR? HRESULT hr = S_OK; static const DWORD dwNetConnectAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; @@ -156,6 +173,9 @@ HRESULT WINAPI CNetworkConnections::GetAttributesOf( if (*rgfInOut == 0) *rgfInOut = ~0; + if (cidl > 1) + *rgfInOut &= ~SFGAO_HASPROPSHEET; + if (cidl == 0) { *rgfInOut = dwNetConnectAttributes; @@ -610,20 +630,23 @@ ShowNetConnectionProperties( */ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { - UINT CmdId; + UINT CmdId = LOWORD(lpcmi->lpVerb) + IDS_NET_ACTIVATE; /* We should get this when F2 is pressed in explorer */ - if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, "rename")) - lpcmi->lpVerb = MAKEINTRESOURCEA(IDS_NET_RENAME); - - if (HIWORD(lpcmi->lpVerb) || LOWORD(lpcmi->lpVerb) > 7) + if (!IS_INTRESOURCE(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, "rename")) + { + CmdId = IDS_NET_RENAME; + } + else if (!IS_INTRESOURCE(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, "properties")) + { + CmdId = IDS_NET_PROPERTIES; + } + else if (!IS_INTRESOURCE(lpcmi->lpVerb) || LOWORD(lpcmi->lpVerb) > 7) { FIXME("Got invalid command\n"); return E_NOTIMPL; } - CmdId = LOWORD(lpcmi->lpVerb) + IDS_NET_ACTIVATE; - switch(CmdId) { case IDS_NET_RENAME: diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index eb4a85de725..ad9317d0a39 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1290,15 +1290,29 @@ PCUITEMID_CHILD CDefView::_PidlByItem(LVITEM& lvItem) int CDefView::LV_FindItemByPidl(PCUITEMID_CHILD pidl) { - ASSERT(m_ListView); + ASSERT(m_ListView && m_pSFParent); int cItems = m_ListView.GetItemCount(); - - for (int i = 0; i<cItems; i++) + LPARAM lParam = m_pSF2Parent ? SHCIDS_CANONICALONLY : 0; + for (int i = 0; i < cItems; i++) { PCUITEMID_CHILD currentpidl = _PidlByItem(i); - if (ILIsEqual(pidl, currentpidl)) - return i; + HRESULT hr = m_pSFParent->CompareIDs(lParam, pidl, currentpidl); + if (SUCCEEDED(hr)) + { + if (hr == S_EQUAL) + return i; + } + else + { + for (i = 0; i < cItems; i++) + { + currentpidl = _PidlByItem(i); + if (ILIsEqual(pidl, currentpidl)) + return i; + } + break; + } } return -1; } diff --git a/dll/win32/shell32/debughlp.cpp b/dll/win32/shell32/debughlp.cpp index 388349c70a6..6778418c7a8 100644 --- a/dll/win32/shell32/debughlp.cpp +++ b/dll/win32/shell32/debughlp.cpp @@ -379,7 +379,6 @@ BOOL pcheck( LPCITEMIDLIST pidl ) case PT_YAGUID: case PT_IESPECIAL2: case PT_SHARE: - case 0x99: /* Network Connection pidl type */ break; default: ERR("unknown IDLIST %p [%p] size=%u type=%x\n", diff --git a/dll/win32/shell32/wine/pidl.c b/dll/win32/shell32/wine/pidl.c index e749d05125c..09b09112adb 100644 --- a/dll/win32/shell32/wine/pidl.c +++ b/dll/win32/shell32/wine/pidl.c @@ -557,7 +557,13 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) * so we can only check here */ if (!pcheck(pidl1) || !pcheck (pidl2)) +#ifdef __REACTOS__ + { + /* We don't understand the PIDL content but that does not mean it's invalid */ + } +#else return FALSE; +#endif pdump (pidl1); pdump (pidl2); diff --git a/sdk/include/reactos/shellfolderutils.h b/sdk/include/reactos/shellfolderutils.h new file mode 100644 index 00000000000..b3baa88f1f3 --- /dev/null +++ b/sdk/include/reactos/shellfolderutils.h @@ -0,0 +1,58 @@ +/* + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Utility functions for IShellFolder implementations + * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#pragma once + +#include "shellutils.h" + +#ifdef __cplusplus + +template <BOOL LOGICALCMP = TRUE> +static HRESULT ShellFolderImpl_CompareItemColumn(IShellFolder2 *psf, UINT column, PCUITEMID_CHILD pidl1, PCUITEMID_CHILD pidl2) +{ + SHELLDETAILS details1, details2; + LPWSTR str1, str2; + HRESULT hr; + if (SUCCEEDED(hr = psf->GetDetailsOf(pidl1, column, &details1)) && + SUCCEEDED(hr = StrRetToStrW(&details1.str, pidl1, &str1))) + { + if (SUCCEEDED(hr = psf->GetDetailsOf(pidl2, column, &details2)) && + SUCCEEDED(hr = StrRetToStrW(&details2.str, pidl2, &str2))) + { + int res = LOGICALCMP ? StrCmpLogicalW(str1, str2) : lstrcmpiW(str1, str2); + hr = MAKE_COMPARE_HRESULT(res); + SHFree(str2); + } + SHFree(str1); + } + return hr; +} + +template <UINT COLCOUNT, int CANONICAL, BOOL LOGICALCMP = TRUE> +static HRESULT ShellFolderImpl_CompareItemIDs(IShellFolder2 *psf, LPARAM lParam, PCUITEMID_CHILD pidl1, PCUITEMID_CHILD pidl2) +{ + HRESULT hr; + if (CANONICAL >= 0 && (lParam & SHCIDS_CANONICALONLY)) + { + hr = ShellFolderImpl_CompareItemColumn<LOGICALCMP>(psf, CANONICAL, pidl1, pidl2); + if (hr == S_EQUAL || !(lParam & SHCIDS_ALLFIELDS) || FAILED(hr)) + return hr; + } + if (lParam & SHCIDS_ALLFIELDS) + { + for (UINT i = 0; i < COLCOUNT; ++i) + { + hr = ShellFolderImpl_CompareItemColumn<LOGICALCMP>(psf, i, pidl1, pidl2); + if (hr && SUCCEEDED(hr)) // Only stop if we successfully found a difference + break; + } + return hr; + } + const UINT column = (UINT)(lParam & SHCIDS_COLUMNMASK); + return ShellFolderImpl_CompareItemColumn<LOGICALCMP>(psf, column, pidl1, pidl2); +} + +#endif // __cplusplus

4 months, 2 weeks

[reactos] 01/01: [NTOS:MM] Implement MmProbeAndLockProcessPages (#7221)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d96ba9217416e955641b… commit 5d96ba9217416e955641b7282acc62a0ed9ca277 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Thu Aug 8 21:02:35 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 21:02:35 2024 +0200 [NTOS:MM] Implement MmProbeAndLockProcessPages (#7221) Implement undocumented MmProbeAndLockProcessPages routine. Based on mm-implement-mappingaddress.patch by Thomas Faber from CORE-10147, with some improvements from me. It's badly required by FltMgr.sys driver from Windows XP/Server 2003 and closely used by a lot of apps those are depending on this driver (e. g., Avast Free Antivirus several versions, Avira Antivir Personal 8.2 etc. etc.). Fixes several asserts from MDL support routines when the 3rd-party minifilter drivers are loading FltMgr. CORE-14157 --- ntoskrnl/mm/ARM3/mdlsup.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index cc6d2ffb4ec..76b06f0c72e 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -1671,19 +1671,59 @@ MmProtectMdlSystemAddress(IN PMDL MemoryDescriptorList, return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented +/** + * @brief + * Probes and locks virtual pages in memory for the specified process. + * + * @param[in,out] MemoryDescriptorList + * Memory Descriptor List (MDL) containing the buffer to be probed and locked. + * + * @param[in] Process + * The process for which the buffer should be probed and locked. + * + * @param[in] AccessMode + * Access mode for probing the pages. Can be KernelMode or UserMode. + * + * @param[in] LockOperation + * The type of the probing and locking operation. Can be IoReadAccess, IoWriteAccess or IoModifyAccess. + * + * @return + * Nothing. + * + * @see MmProbeAndLockPages + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_IRQL_requires_max_(APC_LEVEL) VOID NTAPI -MmProbeAndLockProcessPages(IN OUT PMDL MemoryDescriptorList, - IN PEPROCESS Process, - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation) +MmProbeAndLockProcessPages( + _Inout_ PMDL MemoryDescriptorList, + _In_ PEPROCESS Process, + _In_ KPROCESSOR_MODE AccessMode, + _In_ LOCK_OPERATION Operation) { - UNIMPLEMENTED; -} + KAPC_STATE ApcState; + BOOLEAN IsAttached = FALSE; + + if (Process != PsGetCurrentProcess()) + { + KeStackAttachProcess(&Process->Pcb, &ApcState); + IsAttached = TRUE; + } + /* Protect in try/finally to ensure we detach even if MmProbeAndLockPages() throws an exception */ + _SEH2_TRY + { + MmProbeAndLockPages(MemoryDescriptorList, AccessMode, Operation); + } + _SEH2_FINALLY + { + if (IsAttached) + KeUnstackDetachProcess(&ApcState); + } + _SEH2_END; +} /* * @unimplemented

4 months, 2 weeks

[reactos] 01/01: [SHELL32] Don't add the file to the parameters if the registry command did not ask for a file (#7139)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=724b20d41453a9d55b921… commit 724b20d41453a9d55b9213149893f4d9bd41a29e Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Aug 8 19:30:14 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 19:30:14 2024 +0200 [SHELL32] Don't add the file to the parameters if the registry command did not ask for a file (#7139) Bugs fixed: - fDefault detection of default verb is flawed because it checks the ici struct after conversion instead of the source sei struct. - The command to execute should not have the filename appended just because %1 nor %L did not appear in the registry command template. --- dll/win32/shell32/CDefaultContextMenu.cpp | 32 ++++++++++++++++++------------- dll/win32/shell32/CShellLink.cpp | 3 +-- dll/win32/shell32/precomp.h | 9 +++++++++ dll/win32/shell32/shlexec.cpp | 22 +++++++++++---------- sdk/include/reactos/shellutils.h | 21 +++++++++++++++++++- 5 files changed, 61 insertions(+), 26 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index b7dd4eedf40..f55ed72dc3c 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -1302,8 +1302,7 @@ CDefaultContextMenu::TryToBrowse( HRESULT CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) { - BOOL unicode = lpcmi->cbSize >= FIELD_OFFSET(CMINVOKECOMMANDINFOEX, ptInvoke) && - (lpcmi->fMask & CMIC_MASK_UNICODE); + const BOOL unicode = IsUnicode(*lpcmi); LPITEMIDLIST pidlFull = ILCombine(m_pidlFolder, pidl); if (pidlFull == NULL) @@ -1315,7 +1314,23 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pid BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath); WCHAR wszDir[MAX_PATH]; - if (bHasPath) + + SHELLEXECUTEINFOW sei = { sizeof(sei) }; + sei.fMask = SEE_MASK_CLASSKEY | SEE_MASK_IDLIST | (CmicFlagsToSeeFlags(lpcmi->fMask) & ~SEE_MASK_INVOKEIDLIST); + sei.hwnd = lpcmi->hwnd; + sei.nShow = lpcmi->nShow; + sei.lpVerb = pEntry->Verb; + sei.lpIDList = pidlFull; + sei.hkeyClass = pEntry->hkClass; + sei.dwHotKey = lpcmi->dwHotKey; + sei.hIcon = lpcmi->hIcon; + sei.lpDirectory = wszDir; + + if (unicode && !StrIsNullOrEmpty(lpcmi->lpDirectoryW)) + { + sei.lpDirectory = lpcmi->lpDirectoryW; + } + else if (bHasPath) { wcscpy(wszDir, wszPath); PathRemoveFileSpec(wszDir); @@ -1326,25 +1341,16 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFOEX lpcmi, LPCITEMIDLIST pid *wszDir = UNICODE_NULL; } - CComHeapPtr<WCHAR> pszParamsW; - SHELLEXECUTEINFOW sei = { sizeof(sei) }; - sei.hwnd = lpcmi->hwnd; - sei.nShow = SW_SHOWNORMAL; - sei.lpVerb = pEntry->Verb; - sei.lpDirectory = wszDir; - sei.lpIDList = pidlFull; - sei.hkeyClass = pEntry->hkClass; - sei.fMask = SEE_MASK_CLASSKEY | SEE_MASK_IDLIST; if (bHasPath) sei.lpFile = wszPath; + CComHeapPtr<WCHAR> pszParamsW; if (unicode && !StrIsNullOrEmpty(lpcmi->lpParametersW)) sei.lpParameters = lpcmi->lpParametersW; else if (!StrIsNullOrEmpty(lpcmi->lpParameters) && __SHCloneStrAtoW(&pszParamsW, lpcmi->lpParameters)) sei.lpParameters = pszParamsW; ShellExecuteExW(&sei); - ILFree(pidlFull); return S_OK; diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 218fa2a8825..5a73cb3fe49 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2592,8 +2592,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT CShellLink::DoOpen(LPCMINVOKECOMMANDINFO lpici) { - BOOL unicode = lpici->cbSize >= FIELD_OFFSET(CMINVOKECOMMANDINFOEX, ptInvoke) && - (lpici->fMask & CMIC_MASK_UNICODE); + const BOOL unicode = IsUnicode(*lpici); CStringW args; if (m_sArgs) diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 5b319322af6..8389048af63 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -155,6 +155,15 @@ UINT GetDfmCmd(_In_ IContextMenu *pCM, _In_ LPCSTR verba); #define SHELL_ExecuteControlPanelCPL(hwnd, cpl) SHRunControlPanel((cpl), (hwnd)) +#define CmicFlagsToSeeFlags(flags) ((flags) & SEE_CMIC_COMMON_FLAGS) +static inline UINT SeeFlagsToCmicFlags(UINT flags) +{ + if (flags & SEE_MASK_CLASSNAME) + flags &= ~(SEE_MASK_HASLINKNAME | SEE_MASK_HASTITLE); + return flags & SEE_CMIC_COMMON_FLAGS; +} + + // CStubWindow32 --- The owner window of file property sheets. // This window hides taskbar button of property sheet. class CStubWindow32 : public CWindowImpl<CStubWindow32> diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index a74e1ff0f44..00b29dc27b7 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -491,7 +491,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, /* make sure we don't fail the CreateProcess if the calling app passes in * a bad working directory */ - if (psei->lpDirectory && psei->lpDirectory[0]) + if (!StrIsNullOrEmpty(psei->lpDirectory)) { DWORD attr = GetFileAttributesW(psei->lpDirectory); if (attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) @@ -1559,9 +1559,9 @@ static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei) __SHCloneStrWtoA(&verb, sei->lpVerb); __SHCloneStrWtoA(&parameters, sei->lpParameters); - BOOL fDefault = !sei->lpVerb || !sei->lpVerb[0]; + BOOL fDefault = StrIsNullOrEmpty(sei->lpVerb); CMINVOKECOMMANDINFOEX ici = { sizeof(ici) }; - ici.fMask = (sei->fMask & (SEE_MASK_NO_CONSOLE | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)) | CMIC_MASK_UNICODE; + ici.fMask = SeeFlagsToCmicFlags(sei->fMask) | CMIC_MASK_UNICODE; ici.nShow = sei->nShow; if (!fDefault) { @@ -1571,20 +1571,20 @@ static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei) ici.hwnd = sei->hwnd; ici.lpParameters = parameters; ici.lpParametersW = sei->lpParameters; - if ((sei->fMask & (SEE_MASK_HASLINKNAME | SEE_MASK_CLASSNAME)) == SEE_MASK_HASLINKNAME) - { - ici.fMask |= CMIC_MASK_HASLINKNAME; + ici.dwHotKey = sei->dwHotKey; + ici.hIcon = sei->hIcon; + if (ici.fMask & (CMIC_MASK_HASLINKNAME | CMIC_MASK_HASTITLE)) ici.lpTitleW = sei->lpClass; - } + enum { idFirst = 1, idLast = 0x7fff }; HMENU hMenu = CreatePopupMenu(); - hr = cm->QueryContextMenu(hMenu, 0, 1, 0x7fff, fDefault ? CMF_DEFAULTONLY : 0); + hr = cm->QueryContextMenu(hMenu, 0, idFirst, idLast, fDefault ? CMF_DEFAULTONLY : 0); if (!FAILED_UNEXPECTEDLY(hr)) { if (fDefault) { INT uDefault = GetMenuDefaultItem(hMenu, FALSE, 0); - uDefault = (uDefault != -1) ? uDefault - 1 : 0; + uDefault = (uDefault != -1) ? uDefault - idFirst : 0; ici.lpVerb = MAKEINTRESOURCEA(uDefault); ici.lpVerbW = MAKEINTRESOURCEW(uDefault); } @@ -1600,7 +1600,6 @@ static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei) } - /************************************************************************* * ShellExecute_FromContextMenu [Internal] */ @@ -1676,6 +1675,8 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN &resultLen, (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL); if (!done && wszApplicationName[0]) { +#if 0 // Given HKCR\.test=SZ:"test" and HKCR\test\shell\open\command=SZ:"cmd.exe /K echo.Hello", no filename is + // appended on Windows when there is no %1 nor %L when executed with: shlextdbg.exe /shellexec=c:\file.test /INVOKE strcatW(wcmd, L" "); if (*wszApplicationName != '"') { @@ -1685,6 +1686,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN } else strcatW(wcmd, wszApplicationName); +#endif } if (resultLen > ARRAY_SIZE(wcmd)) ERR("Argify buffer not large enough... truncating\n"); diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 7487288cee1..17d7e0e74e7 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -609,6 +609,12 @@ struct CCoInit #define S_GREATERTHAN S_FALSE #define MAKE_COMPARE_HRESULT(x) ((x)>0 ? S_GREATERTHAN : ((x)<0 ? S_LESSTHAN : S_EQUAL)) +#define SEE_CMIC_COMMON_BASICFLAGS (SEE_MASK_NOASYNC | SEE_MASK_ASYNCOK | SEE_MASK_UNICODE | \ + SEE_MASK_NO_CONSOLE | SEE_MASK_FLAG_NO_UI | SEE_MASK_FLAG_SEPVDM | \ + SEE_MASK_FLAG_LOG_USAGE | SEE_MASK_NOZONECHECKS) +#define SEE_CMIC_COMMON_FLAGS (SEE_CMIC_COMMON_BASICFLAGS | SEE_MASK_HOTKEY | SEE_MASK_ICON | \ + SEE_MASK_HASLINKNAME | SEE_MASK_HASTITLE) + static inline BOOL ILIsSingle(LPCITEMIDLIST pidl) { return pidl == ILFindLastID(pidl); @@ -627,6 +633,19 @@ static inline PCUIDLIST_RELATIVE HIDA_GetPIDLItem(CIDA const* pida, SIZE_T i) #ifdef __cplusplus +#if defined(CMIC_MASK_UNICODE) && defined(SEE_MASK_UNICODE) +static inline bool IsUnicode(const CMINVOKECOMMANDINFOEX &ici) +{ + const UINT minsize = FIELD_OFFSET(CMINVOKECOMMANDINFOEX, ptInvoke); + return (ici.fMask & CMIC_MASK_UNICODE) && ici.cbSize >= minsize; +} + +static inline bool IsUnicode(const CMINVOKECOMMANDINFO &ici) +{ + return IsUnicode(*(CMINVOKECOMMANDINFOEX*)&ici); +} +#endif // CMIC_MASK_UNICODE + DECLSPEC_SELECTANY CLIPFORMAT g_cfHIDA = NULL; DECLSPEC_SELECTANY CLIPFORMAT g_cfShellIdListOffsets = NULL; @@ -784,7 +803,7 @@ DataObject_SetOffset(IDataObject* pDataObject, POINT* point) return DataObject_SetData(pDataObject, g_cfShellIdListOffsets, point, sizeof(point[0])); } -#endif +#endif // __cplusplus #ifdef __cplusplus struct SHELL_GetSettingImpl

4 months, 2 weeks

[reactos] 01/01: [COMDLG32] *.rc Tweak AUTORADIOBUTTONS (#7178)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f483a76a60024ea40382… commit 8f483a76a60024ea403823e4970f69ca19bae3c4 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Aug 8 00:28:07 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 00:28:07 2024 +0200 [COMDLG32] *.rc Tweak AUTORADIOBUTTONS (#7178) - Tweak AUTORADIOBUTTONS (AUTORADIOBUTTON implies BS_AUTORADIOBUTTON). This saves a bit of source-file-size and binary size. - and use the backspace key for improving alignment to column 39 for the controls names in PRINT32_SETUP DIALOG & PRINT32 DIALOG - and fix 3 accel collisions for upper chinese translation &OA &A &R - and add a few FIXMEs for existing accel collisions in other languages - fix a few strings in cdlg_Sr.rc JIRA issue: none Note1: I intentionally used only the backspace-key and not the space key to improve the alignment in PRINT32_SETUP DIALOG & PRINT32 DIALOG, so please refrain from any review-suggestions of the form "oh you could add another space here, or another space there". I will not do that in this PR. I just aligned some strings to column 39 (same as it is used within the Wine-master-rc-file) Note2: I will only accept accelerator suggestions as replacement for the added accel-FIXMEs that have been double-checked by a native translator from the native 2k3sp2, but no guesses. --- dll/win32/comdlg32/lang/cdlg_Bg.rc | 32 +++++++++++------------ dll/win32/comdlg32/lang/cdlg_Ca.rc | 26 +++++++++---------- dll/win32/comdlg32/lang/cdlg_Cs.rc | 40 ++++++++++++++--------------- dll/win32/comdlg32/lang/cdlg_Da.rc | 30 +++++++++++----------- dll/win32/comdlg32/lang/cdlg_De.rc | 42 +++++++++++++++--------------- dll/win32/comdlg32/lang/cdlg_El.rc | 38 ++++++++++++++-------------- dll/win32/comdlg32/lang/cdlg_En.rc | 18 ++++++------- dll/win32/comdlg32/lang/cdlg_Eo.rc | 36 +++++++++++++------------- dll/win32/comdlg32/lang/cdlg_Es.rc | 42 +++++++++++++++--------------- dll/win32/comdlg32/lang/cdlg_Et.rc | 38 ++++++++++++++-------------- dll/win32/comdlg32/lang/cdlg_Fi.rc | 48 +++++++++++++++++------------------ dll/win32/comdlg32/lang/cdlg_Fr.rc | 48 +++++++++++++++++------------------ dll/win32/comdlg32/lang/cdlg_He.rc | 18 ++++++------- dll/win32/comdlg32/lang/cdlg_Hi.rc | 26 +++++++++---------- dll/win32/comdlg32/lang/cdlg_Hu.rc | 48 +++++++++++++++++------------------ dll/win32/comdlg32/lang/cdlg_Id.rc | 18 ++++++------- dll/win32/comdlg32/lang/cdlg_It.rc | 36 +++++++++++++------------- dll/win32/comdlg32/lang/cdlg_Ja.rc | 30 +++++++++++----------- dll/win32/comdlg32/lang/cdlg_Ko.rc | 26 +++++++++---------- dll/win32/comdlg32/lang/cdlg_Lt.rc | 44 ++++++++++++++++---------------- dll/win32/comdlg32/lang/cdlg_Nl.rc | 36 +++++++++++++------------- dll/win32/comdlg32/lang/cdlg_No.rc | 28 ++++++++++---------- dll/win32/comdlg32/lang/cdlg_Pl.rc | 40 ++++++++++++++--------------- dll/win32/comdlg32/lang/cdlg_Pt.rc | 18 ++++++------- dll/win32/comdlg32/lang/cdlg_Ro.rc | 38 ++++++++++++++-------------- dll/win32/comdlg32/lang/cdlg_Ru.rc | 36 +++++++++++++------------- dll/win32/comdlg32/lang/cdlg_Si.rc | 40 ++++++++++++++--------------- dll/win32/comdlg32/lang/cdlg_Sk.rc | 38 ++++++++++++++-------------- dll/win32/comdlg32/lang/cdlg_Sq.rc | 30 +++++++++++----------- dll/win32/comdlg32/lang/cdlg_Sr.rc | 50 ++++++++++++++++++------------------ dll/win32/comdlg32/lang/cdlg_Sv.rc | 32 +++++++++++------------ dll/win32/comdlg32/lang/cdlg_Th.rc | 22 ++++++++-------- dll/win32/comdlg32/lang/cdlg_Tr.rc | 36 +++++++++++++------------- dll/win32/comdlg32/lang/cdlg_Uk.rc | 30 +++++++++++----------- dll/win32/comdlg32/lang/cdlg_Zh.rc | 52 +++++++++++++++++++------------------- 35 files changed, 605 insertions(+), 605 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Bg.rc b/dll/win32/comdlg32/lang/cdlg_Bg.rc index 0c2ebe551f7..3121a6d51c6 100644 --- a/dll/win32/comdlg32/lang/cdlg_Bg.rc +++ b/dll/win32/comdlg32/lang/cdlg_Bg.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Само цели думи", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Чувствителен регистър", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Посока", grp1, 147, 21, 58, 38 - CONTROL "На&горе", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "На&долу", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "На&горе", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "На&долу", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Намери следващ", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Отмени", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -358,25 +358,25 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Сво&йства", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Име:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Състояние:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Състояние:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Тип:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Място:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Коментар:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Коментар:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Копия", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Брой &копия:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "Под&реждане", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "Под&реждане", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Разпечатай", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Всичко", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Страници", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Избраното", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&Всичко", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Страници", rad3,16,122,36,12 + AUTORADIOBUTTON "&Избраното", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&от:", stc2, 52,124, 20,8 @@ -396,25 +396,25 @@ BEGIN PUSHBUTTON "Сво&йства", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Име:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Състояние:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Състояние:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Тип:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Място:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Коментар:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Коментар:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Хартия", grp2, 8, 92, 164,56, WS_GROUP + GROUPBOX "Хартия", grp2, 8, 92, 164,56, WS_GROUP LTEXT "Size:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Източник:", stc3, 16,128, 36, 8 + LTEXT "&Източник:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Ориентация", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "Пор&трет", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "Пейза&ж", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "Пор&трет", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Пейза&ж", rad2,224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Контейнер:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Ориентация", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "Пор&трет", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "Пейза&ж", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Пор&трет", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "Пейза&ж", rad2, 16, 190, 52, 12 GROUPBOX "Рамки", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Лява:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Ca.rc b/dll/win32/comdlg32/lang/cdlg_Ca.rc index c81873ecbbe..e5e64070eac 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ca.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ca.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Troba només paraules &completes", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Distingir majúscules de minúscules", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direcció", grp1, 147, 21, 58, 38 - CONTROL "A&munt", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "A &Baix", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "A&munt", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "A &Baix", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Continuació", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel·la", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,30 +353,30 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel·la", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "A&juda", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Impressora:", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Impressora:", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Imprimeix a &fitxer", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Propietats", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nom:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Estat:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tipus:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Tipus:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "On:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comentari:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Comentari:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombre de &copies:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "C&ompagina", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "C&ompagina", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Interval d'impressi", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Tot", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Selecci", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&Tot", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Pa&ges", rad3,16,122,36,12 + AUTORADIOBUTTON "&Selecci", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&de:", stc2, 52,124, 20,8 @@ -413,8 +413,8 @@ BEGIN GROUPBOX "Orientació", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Vertical", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Horizontal", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Vertical", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Horizontal", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Safata:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientació", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Vertical", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Horizontal", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Vertical", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Horizontal", rad2, 16, 190, 52, 12 GROUPBOX "Vores", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Esquerra:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Cs.rc b/dll/win32/comdlg32/lang/cdlg_Cs.rc index d1c6fe6cd15..65de84ade43 100644 --- a/dll/win32/comdlg32/lang/cdlg_Cs.rc +++ b/dll/win32/comdlg32/lang/cdlg_Cs.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Pouze &celá slova", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Rozlišovat velikost", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Směr", grp1, 147, 21, 58, 38 - CONTROL "Nahor&u", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Dolů", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "Nahor&u", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Dolů", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Najít d&alší", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Storno", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,30 +353,30 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Storno", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Nápověda", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Tiskárna", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Tiskárna", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Tisk do so&uboru", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Vlastnosti", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Název:", stc6, 16, 20, 36,8 + LTEXT "&Název:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Typ:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Umístění:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Umístění:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentář:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentář:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Počet &kopií:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "K&ompletovat", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "K&ompletovat", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Rozsah tisku", grp1, 8,92, 144,64, WS_GROUP - CONTROL "Vš&e", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "St&ránky", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Vý&běr", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Rozsah tisku", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "Vš&e", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "St&ránky", rad3,16,122,36,12 + AUTORADIOBUTTON "Vý&běr", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&od:", stc2, 52,124, 20,8 @@ -392,29 +392,29 @@ BEGIN PUSHBUTTON "Storno",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Tiskárna", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Tiskárna", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Vlastnosti", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Název:", stc6, 16, 20, 36,8 + LTEXT "&Název:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Typ:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Umístění:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Umístění:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentář:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentář:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papír", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Velikost:", stc2, 16,108, 36, 8 + LTEXT "Velikost:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Z&droj:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientace", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "Na výšk&u", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "N&a šířku", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "Na výšk&u", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "N&a šířku", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientace", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Na výšku", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "N&a šířku", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Na výšku", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "N&a šířku", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&evý:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Da.rc b/dll/win32/comdlg32/lang/cdlg_Da.rc index fdd440f0ba4..4994ffae4b6 100644 --- a/dll/win32/comdlg32/lang/cdlg_Da.rc +++ b/dll/win32/comdlg32/lang/cdlg_Da.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Kun hele ord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Forskel på store/små &bogstaver", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Retning", grp1, 147, 21, 58, 38 - CONTROL "&Op", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "Ne&d", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Op", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Ne&d", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Find næste", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuller", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -364,23 +364,23 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Hvor:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopier", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Antal &kopier:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "&hold sammen", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "&hold sammen", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Udskriv område", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alt", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Si&der", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Markeret", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Udskriv område", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Alt", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Si&der", rad3,16,122,36,12 + AUTORADIOBUTTON "&Markeret", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&fra:", stc2, 52,124, 20,8 - RTEXT "&til:", stc3, 99,124, 20,8 + RTEXT "&til:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -402,19 +402,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Hvor:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papir", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "S&tørrelse:", stc2, 16,108, 36, 8 + LTEXT "S&tørrelse:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Kilde:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Retning", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortræt", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&andskab", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&ortræt", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andskab", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Bakke:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Retning", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portræt", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landskab", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portræt", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Landskab", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Venstre:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_De.rc b/dll/win32/comdlg32/lang/cdlg_De.rc index 1349b082ec1..f3fc6962440 100644 --- a/dll/win32/comdlg32/lang/cdlg_De.rc +++ b/dll/win32/comdlg32/lang/cdlg_De.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Nu&r ganzes Wort suchen", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Groß-/Klein&schreibung", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Suchrichtung", grp1, 147, 21, 58, 38 - CONTROL "&Oben", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Unten", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Oben", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Unten", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Weitersuchen", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -355,7 +355,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Drucker", grp4, 8, 4, 272,84, WS_GROUP CONTROL "In Da&tei drucken", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Eigenschaften", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Eigenschaften", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Name:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -364,23 +364,23 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Ort:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopien", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Anzahl &Kopien:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "S&ortieren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "S&ortieren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Druck Bereich", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alles", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Seiten", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Aus&wahl", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Druck Bereich", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Alles", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Seiten", rad3,16,122,36,12 + AUTORADIOBUTTON "Aus&wahl", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&von:", stc2, 52,124, 20,8 - RTEXT "&bis:", stc3, 99,124, 20,8 + RTEXT "&von:", stc2, 52,124, 20,8 + RTEXT "&bis:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -393,28 +393,28 @@ BEGIN /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ GROUPBOX "Drucker", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Eigenschaften", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Eigenschaften", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Name:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Typ:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Typ:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Ort:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Ort:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "G&röße:", stc2, 16,108, 36, 8 + GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "G&röße:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Zufuhr:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Ausrichtung", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Hochformat", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Querformat", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Hochformat", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Querformat", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Zufuhr:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Ausrichtung", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Hochformat", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Hochformat", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Links:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_El.rc b/dll/win32/comdlg32/lang/cdlg_El.rc index 8e0a7ddcbe7..2953edbc6e9 100644 --- a/dll/win32/comdlg32/lang/cdlg_El.rc +++ b/dll/win32/comdlg32/lang/cdlg_El.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Ταίριασμα &Ολόκληρης Λέξης Μόνο", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Ταίριασμα &Κεφαλαίων", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Κατεύθυνση", grp1, 147, 21, 58, 38 - CONTROL "&Πάνω", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Κάτω", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Πάνω", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Κάτω", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Εύρεση Επόμενου", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Άκυρο", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,30 +353,30 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Άκυρο", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Βοήθεια", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "PΕκτυπωτής", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "PΕκτυπωτής", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Εκτύπωση σε Αρ&χείο", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Ιδιότητες", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Όνομα:", stc6, 16, 20, 36,8 + LTEXT "&Όνομα:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Κατάσταση:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Κατάσταση:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Τύπος:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Τύπος:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Που:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Σχόλιο:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Αντίγραφα", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Αντίγραφα", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Αριθμός &Αντιγράφων:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Όλα", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Σε&λίδες", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Επιλογή", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&Όλα", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Σε&λίδες", rad3,16,122,36,12 + AUTORADIOBUTTON "&Επιλογή", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&από:", stc2, 52,124, 20,8 @@ -392,13 +392,13 @@ BEGIN PUSHBUTTON "Άκυρο",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "PΕκτυπωτής", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "PΕκτυπωτής", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Ιδιότητες", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Όνομα:", stc6, 16, 20, 36,8 + LTEXT "&Όνομα:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Κατάσταση:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Κατάσταση:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Τύπος:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Τύπος:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Που:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -406,15 +406,15 @@ BEGIN LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Χαρτί", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Μέγε&θος:", stc2, 16,108, 36, 8 + LTEXT "Μέγε&θος:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Πηγή:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&ortrait", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andscape", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "Α&ριστερά:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_En.rc b/dll/win32/comdlg32/lang/cdlg_En.rc index f6a0a2cea1d..fc72afd9fb8 100644 --- a/dll/win32/comdlg32/lang/cdlg_En.rc +++ b/dll/win32/comdlg32/lang/cdlg_En.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Match &Case", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direction", grp1, 147, 21, 58, 38 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Up", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Down", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -374,9 +374,9 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Selection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&All", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Pa&ges", rad3,16,122,36,12 + AUTORADIOBUTTON "&Selection", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&from:", stc2, 52,124, 20,8 @@ -413,8 +413,8 @@ BEGIN GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&ortrait", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andscape", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&eft:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Eo.rc b/dll/win32/comdlg32/lang/cdlg_Eo.rc index bb16d1fc9ea..54fe4f686a3 100644 --- a/dll/win32/comdlg32/lang/cdlg_Eo.rc +++ b/dll/win32/comdlg32/lang/cdlg_Eo.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Nur tutan &vorton", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Atentu &Usklecon", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direkto", grp1, 147, 21, 58, 38 - CONTROL "&Supre", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Sube", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Supre", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Sube", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Pluserĉu", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Rezigni", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -349,34 +349,34 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Presu" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "Bone", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "Bone", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "Rezigni", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Helpo", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Printilo", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Printilo", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Prezu kiel &dosiero", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Ecoj", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nomo:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stato:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Speco:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Speco:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kie:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Komento:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Ekzempleroj", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Ekzempleroj", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombro da &ekzempleroj:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "Laŭ&kajere", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "Laŭ&kajere", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Etendiĝon", grp1, 8,92, 144,64, WS_GROUP - CONTROL "ĉ&iujn", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&paĝojn", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&elekton", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "ĉ&iujn", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&paĝojn", rad3,16,122,36,12 + AUTORADIOBUTTON "&elekton", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "de:", stc2, 52,124, 20,8 @@ -392,29 +392,29 @@ BEGIN PUSHBUTTON "Rezigni",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Printilo", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Printilo", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Ecoj", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nomo:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stato:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Speco:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Speco:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kie:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Komento:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papero", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "&Dimensio:", stc2, 16,108, 36, 8 + GROUPBOX "Papero", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&Dimensio:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Fonto:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Formato", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Vertikala", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Horizontala", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Vertikala", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Horizontala", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "P&leto:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Formato", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Vertikala", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Horizontala", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Vertikala", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Horizontala", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Dekstra:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Es.rc b/dll/win32/comdlg32/lang/cdlg_Es.rc index 91ca5241205..2741c171f39 100644 --- a/dll/win32/comdlg32/lang/cdlg_Es.rc +++ b/dll/win32/comdlg32/lang/cdlg_Es.rc @@ -320,8 +320,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Sólo &palabras completas", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Coincidir &mayúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Dirección", grp1, 147, 21, 58, 38 - CONTROL "&Arriba", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "A&bajo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Arriba", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "A&bajo", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Buscar &siguiente", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -359,10 +359,10 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancelar", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "A&yuda", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Impresora:", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Impresora:", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Imprimir en a&rchivo", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Propiedades", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Nombre:", stc6, 16, 20, 36,8 + PUSHBUTTON "&Propiedades", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nombre:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Estado:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -370,23 +370,23 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Dónde:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comentario:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Comentario:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Copias", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Número de &copias:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "&Intercalar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "&Intercalar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Rango de impresión", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Todo", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pá&ginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Selección", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&Todo", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Pá&ginas", rad3,16,122,36,12 + AUTORADIOBUTTON "&Selección", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&desde:", stc2, 52,124, 20,8 - RTEXT "&hasta:", stc3, 99,124, 20,8 + RTEXT "&desde:", stc2, 52,124, 20,8 + RTEXT "&hasta:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -398,9 +398,9 @@ BEGIN PUSHBUTTON "Cancelar",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Red...", psh5, 284,156,48,14 */ - GROUPBOX "Impresora:", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Propiedades", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Nombre:", stc6, 16, 20, 36,8 + GROUPBOX "Impresora:", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Propiedades", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nombre:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Estado:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -408,19 +408,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Dónde:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comentario:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Comentario:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papel", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Tamaño:", stc2, 16,108, 36, 8 + LTEXT "Tamaño:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Origen:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientación", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Vertical", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "A&paisado", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Vertical", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "A&paisado", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -437,8 +437,8 @@ BEGIN LTEXT "&Bandeja:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientación", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Vertical", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Horizontal", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Vertical", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Horizontal", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "I&zquierdo:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Et.rc b/dll/win32/comdlg32/lang/cdlg_Et.rc index cb1c2e61ed9..0a34d48f59e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Et.rc +++ b/dll/win32/comdlg32/lang/cdlg_Et.rc @@ -3,7 +3,7 @@ * * Copyright 1999 Bertho Stultiens * Copyright 1999 Klaas van Gend - * Translated 2018 Joann Mõndresku (joannmondresku at gmail dot com) + * Translated 2018 Joann Mõndresku <joannmondresku(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -315,8 +315,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Sobita &terve sõna ainult", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Sobita &juhus", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Suund", grp1, 147, 21, 58, 38 - CONTROL "&Üles", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Alla", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Üles", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Alla", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Leia järgmine", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Loobu", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -368,20 +368,20 @@ FONT 8, "MS Shell Dlg" LTEXT "Kommentaar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Koopiad", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "&Koopiate arv:", stc5,168,105,68,8 - ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "V&õrdle", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + GROUPBOX "Koopiad", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "&Koopiate arv:", stc5,168,105,68,8 + ICON "", ico3, 210,131, 76,24, WS_GROUP + CONTROL "V&õrdle", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Printimise vahemik", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Kõik", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Lehed", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Valik", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&alates:", stc2, 52,124, 20,8 - RTEXT "&kuni:", stc3, 99,124, 20,8 + AUTORADIOBUTTON "&Kõik", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Lehed", rad3,16,122,36,12 + AUTORADIOBUTTON "&Valik", rad2,16,138,64,12 + EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER + RTEXT "&alates:", stc2, 52,124, 20,8 + RTEXT "&kuni:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -414,8 +414,8 @@ BEGIN GROUPBOX "Orientatsioon", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Portree", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Maastik", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Portree", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Maastik", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -432,8 +432,8 @@ BEGIN LTEXT "S&alv:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientatsioon", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portree", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Maastik", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portree", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Maastik", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Vasakult:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Fi.rc b/dll/win32/comdlg32/lang/cdlg_Fi.rc index 3e16fc29813..0f4aedeac29 100644 --- a/dll/win32/comdlg32/lang/cdlg_Fi.rc +++ b/dll/win32/comdlg32/lang/cdlg_Fi.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Koko sana", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Kirjaink&oko", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Suunta", grp1, 147, 21, 58, 38 - CONTROL "&Ylös", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Alas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 //FIXME: accelerator collision &A + AUTORADIOBUTTON "&Ylös", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Alas", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP//FIXME: accelerator collision &A DEFPUSHBUTTON "Etsi &seuraava", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Peruuta", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,34 +353,34 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Peruuta", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Apua", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Kirjoitin", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Kirjoitin", grp4, 8, 4, 272,84, WS_GROUP CONTROL "&Tulosta tiedostoon", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Ominaisuudet", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Ominaisuudet", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nimi:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Tila:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tyyppi:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Tyyppi:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Sijainti:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Sijainti:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentti:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentti:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Kopioita", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Kopioita", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Kopioiden &määrä:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Kokoa", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Tulosta alueelta", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Kaikki", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Sivut", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Valinta", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Tulosta alueelta", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Kaikki", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Sivut", rad3,16,122,36,12 + AUTORADIOBUTTON "&Valinta", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "M&istä:", stc2, 52,124, 20,8 - RTEXT "Mi&hin:", stc3, 99,124, 20,8 + RTEXT "M&istä:", stc2, 52,124, 20,8 + RTEXT "Mi&hin:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -392,20 +392,20 @@ BEGIN PUSHBUTTON "Peruuta",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Kirjoitin", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Ominaisuudet", psh2, 212, 17, 60,14, WS_GROUP + GROUPBOX "Kirjoitin", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Ominaisuudet", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nimi:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Tila:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tyyppi:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Tyyppi:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Sijainti:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Sijainti:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentti:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentti:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Paperi", grp2, 8, 92, 164,56, WS_GROUP + GROUPBOX "Paperi", grp2, 8, 92, 164,56, WS_GROUP LTEXT "Size:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Lähde:", stc3, 16,128, 36, 8 @@ -413,8 +413,8 @@ BEGIN GROUPBOX "Suunta", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Pysty", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "V&aaka", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Pysty", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "V&aaka", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Syöttö:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Suunta", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "P&ysty", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Vaaka", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&ysty", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Vaaka", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Vasen:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Fr.rc b/dll/win32/comdlg32/lang/cdlg_Fr.rc index 3d73a476367..7cd09043b75 100644 --- a/dll/win32/comdlg32/lang/cdlg_Fr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Fr.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Mots &entiers seulement", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Respecter la &casse", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direction", grp1, 147, 21, 58, 38 - CONTROL "&Haut", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Bas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Haut", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Bas", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Suivant", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,30 +353,30 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuler", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "Aid&e", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Imprimante", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Imprimante", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Imprimer dans un fichier", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Propriétés", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nom :", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "État :", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Type :", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Type :", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Emplacement :", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Emplacement :", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Commentaire :", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Commentaire :", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombre de copies :",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "Copies assemblées", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "Copies assemblées", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Zone d'impression", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Tout", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Pages", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Sélection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Zone d'impression", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Tout", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Pages", rad3,16,122,36,12 + AUTORADIOBUTTON "&Sélection", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&de :", stc2, 52,124, 20,8 @@ -392,29 +392,29 @@ BEGIN PUSHBUTTON "Annuler",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Imprimante", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Propriétés", psh2, 212, 17, 60,14, WS_GROUP + GROUPBOX "Imprimante", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Propriétés", psh2, 212, 17, 60,14, WS_GROUP//FIXME: accelerator collision &P LTEXT "&Nom :", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "État :", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Type :", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Type :", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Emplacement :", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Emplacement :", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Commentaire :", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Commentaire :", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Tai&lle :", stc2, 16,108, 36, 8 + GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "Tai&lle :", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Source :", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Portrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "Pa&ysage", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Portrait", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP//FIXME: accelerator collision &P + AUTORADIOBUTTON "Pa&ysage", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -428,11 +428,11 @@ BEGIN GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "T&aille :", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Bac :", stc3, 16, 132, 36, 8 + LTEXT "&Bac :", stc3, 16, 132, 36, 8//FIXME: accelerator collision &B COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "P&aysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "P&aysage", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Gauche :", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER @@ -440,7 +440,7 @@ BEGIN EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Haut :", stc17, 88, 192, 30, 8 EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Bas :", stc18, 159, 192, 30, 8 + LTEXT "&Bas :", stc18, 159, 192, 30, 8//FIXME: accelerator collision &B EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 126, 220, 50, 14 diff --git a/dll/win32/comdlg32/lang/cdlg_He.rc b/dll/win32/comdlg32/lang/cdlg_He.rc index 48fc58749d1..04038733616 100644 --- a/dll/win32/comdlg32/lang/cdlg_He.rc +++ b/dll/win32/comdlg32/lang/cdlg_He.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "התאמת מילים &שלמות בלבד", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "התאמת &רשיות", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "כיוון", grp1, 147, 21, 58, 38 - CONTROL "למ&עלה", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "למ&טה", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "למ&עלה", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "למ&טה", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "חיפוש ה&בא", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ביטול", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -374,9 +374,9 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "טווח ההדפסה", grp1, 8,92, 144,64, WS_GROUP - CONTROL "ה&כול", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&עמודים", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&בחירה", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "ה&כול", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&עמודים", rad3,16,122,36,12 + AUTORADIOBUTTON "&בחירה", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&מ־:", stc2, 52,124, 20,8 @@ -413,8 +413,8 @@ BEGIN GROUPBOX "כיווניות", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "ל&אורך", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "ל&רוחב", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "ל&אורך", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ל&רוחב", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "מ&גש:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "כיווניות", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "ל&אורך", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "ל&רוחב", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "ל&אורך", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "ל&רוחב", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&שמאליים:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Hi.rc b/dll/win32/comdlg32/lang/cdlg_Hi.rc index d266122a505..a28a2d2ff16 100644 --- a/dll/win32/comdlg32/lang/cdlg_Hi.rc +++ b/dll/win32/comdlg32/lang/cdlg_Hi.rc @@ -300,8 +300,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "केवल &पूर्ण शब्द मिलाएं", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&केस मिलाएँ", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "दिशाओं", grp1, 147, 21, 58, 38 - CONTROL "&ऊपर", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&नीचे", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&ऊपर", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&नीचे", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "अगला &ढूंढो", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "रद्द करें", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -346,23 +346,23 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "स्थिति:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "कहा:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "टिप्पणी:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "प्रतियां", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "प्रतियां", grp2, 160, 92, 120,64, WS_GROUP LTEXT "&प्रतियों की संख्या:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&कोलेट", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "प्रिंट रेंज", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&सब", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&पृष्ठों", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&चयन", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&सब", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&पृष्ठों", rad3,16,122,36,12 + AUTORADIOBUTTON "&चयन", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&से:", stc2, 52,124, 20,8 @@ -384,7 +384,7 @@ BEGIN COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "स्थिति:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "कहा:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -392,15 +392,15 @@ BEGIN LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "कागज़", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "&साइज़:", stc2, 16,108, 36, 8 + LTEXT "&साइज़:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&सॉर्स:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "उन्मुखीकरण", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&पोर्ट्रिट", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&लैंडस्केप", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&पोर्ट्रिट", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&लैंडस्केप", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -417,8 +417,8 @@ BEGIN LTEXT "&ट्रे:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "उन्मुखीकरण", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&पोर्ट्रिट", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&लैंडस्केप", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&पोर्ट्रिट", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&लैंडस्केप", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&बाएं:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Hu.rc b/dll/win32/comdlg32/lang/cdlg_Hu.rc index fec12fcabd9..9a7c3c73130 100644 --- a/dll/win32/comdlg32/lang/cdlg_Hu.rc +++ b/dll/win32/comdlg32/lang/cdlg_Hu.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Teljes &szavak keresése", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Kis/&nagybetű különb.", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Irány", grp1, 147, 21, 58, 38 - CONTROL "&Vissza", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Előre", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Vissza", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Előre", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Tovább", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Mégse", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,34 +353,34 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Mégse", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Súgó", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Nyomtató", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Nyomtató", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Nyomtatás fáj&lba", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Tulajdonságok", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Tulajdonságok", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Név:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Állapot:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Állapot:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Típus:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Típus:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Hely:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Megjegyzés:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Megjegyzés:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Másolatok", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Másolatok", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Másola&tok száma:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "Le&válogatás", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "Le&válogatás", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Nyomtatási terület", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Mind", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Oldala&k", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Kijelölés", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Nyomtatási terület", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Mind", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Oldala&k", rad3,16,122,36,12 + AUTORADIOBUTTON "&Kijelölés", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "Et&től:", stc2, 52,124, 20,8 - RTEXT "Ed&dig:", stc3, 99,124, 20,8 + RTEXT "Et&től:", stc2, 52,124, 20,8 + RTEXT "Ed&dig:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -392,17 +392,17 @@ BEGIN PUSHBUTTON "Mégse",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Hálózat...", psh5, 284,156,48,14 */ - GROUPBOX "Nyomtató", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Tulajdonságok", psh2, 212, 17, 60,14, WS_GROUP + GROUPBOX "Nyomtató", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Tulajdonságok", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Név:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Állapot:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Állapot:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Típus:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Típus:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Hely:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Megjegyzés:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Megjegyzés:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papír", grp2, 8, 92, 164,56, WS_GROUP @@ -413,8 +413,8 @@ BEGIN GROUPBOX "Írásirány", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Álló", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "Fe&kvő", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Álló", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Fe&kvő", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Forrás:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Írásirány", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Függőleges", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Vízszintes", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Függőleges", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Vízszintes", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Bal:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Id.rc b/dll/win32/comdlg32/lang/cdlg_Id.rc index bbcf5e50172..44b56f8df38 100644 --- a/dll/win32/comdlg32/lang/cdlg_Id.rc +++ b/dll/win32/comdlg32/lang/cdlg_Id.rc @@ -315,8 +315,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Cocokkan &seluruh kata", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Cocokkan jenis &huruf", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Arah", grp1, 147, 21, 58, 38 - CONTROL "N&aik", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "Turu&n", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "N&aik", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Turu&n", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Cari &Berikutnya", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Batal", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -375,9 +375,9 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 240, 103, 32, 12, WS_GROUP | ES_NUMBER GROUPBOX "Rentang Halaman", grp1, 8, 92, 144, 64, WS_GROUP - CONTROL "&Semua", rad1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 16, 106, 64, 12 - CONTROL "&Halaman", rad3, "Button", BS_AUTORADIOBUTTON, 16, 122, 36, 12 - CONTROL "Ter&pilih", rad2,"Button", BS_AUTORADIOBUTTON, 16, 138, 64, 12 + AUTORADIOBUTTON "&Semua", rad1, 16, 106, 64, 12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Halaman", rad3, 16, 122, 36, 12 + AUTORADIOBUTTON "Ter&pilih", rad2, 16, 138, 64, 12 EDITTEXT edt1, 73, 122, 26, 12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120, 122, 26, 12, WS_GROUP | ES_NUMBER RTEXT "&dari:", stc2, 52,124, 20, 8 @@ -414,8 +414,8 @@ BEGIN GROUPBOX "Orientasi", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Tegak", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Bentang", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Tegak", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Bentang", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -432,8 +432,8 @@ BEGIN LTEXT "&Sumber:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL GROUPBOX "Orientasi", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Tegak", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Bentang", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Tegak", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Bentang", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Kiri:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_It.rc b/dll/win32/comdlg32/lang/cdlg_It.rc index 9d41d109690..5a0b9ca4a90 100644 --- a/dll/win32/comdlg32/lang/cdlg_It.rc +++ b/dll/win32/comdlg32/lang/cdlg_It.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Solo parole &intere", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Maiuscole/Minuscole", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direzione", grp1, 147, 21, 58, 38 - CONTROL "A&lto", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Basso", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "A&lto", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Basso", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Trova &successivo", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -364,19 +364,19 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Dove:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Commento:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Commento:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Copie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Numero di &copie:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "&Fascicola", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "&Fascicola", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Pagine da stampare", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Tutti", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pa&gine", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Selezione", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Pagine da stampare", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Tutti", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Pa&gine", rad3,16,122,36,12 + AUTORADIOBUTTON "&Selezione", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&da:", stc2, 52,124, 20,8 @@ -392,7 +392,7 @@ BEGIN PUSHBUTTON "Annulla",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Stampante", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Stampante", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Proprietà", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nome:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -402,19 +402,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Dove:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Commento:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Commento:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Foglio", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "&Dimensione:", stc2, 16,108, 36, 8 + GROUPBOX "Foglio", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&Dimensione:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Origine:", stc3, 16,128, 36, 8 + LTEXT "&Origine:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "Orientamento", grp1, 180, 92, 100,56, WS_GROUP + GROUPBOX "Orientamento", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Ritratto", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "P&aesaggio", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Ritratto", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "P&aesaggio", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Vassoio:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientamento", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Ritratto", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Paesaggio", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Ritratto", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Paesaggio", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "Si&nistra:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Ja.rc b/dll/win32/comdlg32/lang/cdlg_Ja.rc index 9bef640cdda..6b0dcd20e7a 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ja.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ja.rc @@ -314,8 +314,8 @@ FONT 9, "MS UI Gothic" CHECKBOX "単語単位で検索(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "大文字と小文字を区別する(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "検索する方向", grp1, 147, 21, 58, 38 - CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "上(&U)", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "下(&D)", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "次を検索(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "キャンセル", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -356,7 +356,7 @@ FONT 9, "MS UI Gothic" GROUPBOX "プリンタの選択", grp4, 8, 4, 272,84, WS_GROUP CONTROL "ファイルへ出力(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "プロパティ(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "名前(&N):", stc6, 16, 20, 36,8 + LTEXT "名前(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "状態:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -370,17 +370,17 @@ FONT 9, "MS UI Gothic" GROUPBOX "印刷部数", grp2, 160, 92, 120,64, WS_GROUP LTEXT "部数(&C):",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "部単位で印刷(&O)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "部単位で印刷(&O)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "印刷範囲", grp1, 8,92, 144,64, WS_GROUP - CONTROL "すべて(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "ページ指定(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "選択した部分(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "すべて(&A)", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ページ指定(&G)", rad3,16,122,36,12 + AUTORADIOBUTTON "選択した部分(&S)", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "ページから(&F):", stc2, 52,124, 20,8 - RTEXT "ページまで(&T):", stc3, 99,124, 20,8 + RTEXT "ページから(&F):", stc2, 52,124, 20,8 + RTEXT "ページまで(&T):", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -394,7 +394,7 @@ BEGIN GROUPBOX "プリンタの選択", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "プロパティ(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "名前(&N):", stc6, 16, 20, 36,8 + LTEXT "名前(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "状態:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -406,15 +406,15 @@ BEGIN LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "用紙", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "サイズ(&Z):", stc2, 16,108, 36, 8 + LTEXT "サイズ(&Z):", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "ソース(&S):", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "方向", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "縦(&O)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "横(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "縦(&O)", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "横(&A)", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "給紙方法(&T):", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "方向", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "縦(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "横(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "縦(&P)", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "横(&L)", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "左(&E):", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Ko.rc b/dll/win32/comdlg32/lang/cdlg_Ko.rc index 6559e3bb3a5..acfc617c87d 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ko.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ko.rc @@ -314,8 +314,8 @@ FONT 9, "MS Shell Dlg" CHECKBOX "단어 단위로(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "대/소문자 구분(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "방향", grp1, 147, 21, 58, 38 - CONTROL "위(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "아래(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "위(&U)", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "아래(&D)", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "다음 찾기(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "취소", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -374,13 +374,13 @@ FONT 9, "MS Shell Dlg" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "인쇄 범위", grp1, 8,92, 144,64, WS_GROUP - CONTROL "모두(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "페이지(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "선택 영역(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "모두(&A)", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "페이지(&G)", rad3,16,122,36,12 + AUTORADIOBUTTON "선택 영역(&S)", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "시작(&F):", stc2, 52,124, 20,8 - RTEXT "끝(&T):", stc3, 99,124, 20,8 + RTEXT "시작(&F):", stc2, 52,124, 20,8 + RTEXT "끝(&T):", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -394,7 +394,7 @@ BEGIN GROUPBOX "프린터", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "등록 정보(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "이름(&N):", stc6, 16, 20, 36,8 + LTEXT "이름(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "상태:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -406,15 +406,15 @@ BEGIN LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "종이", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "크기(&Z):", stc2, 16,108, 36, 8 + LTEXT "크기(&Z):", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "원본(&S):", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "방향", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "세로(&O)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "가로(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "세로(&O)", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "가로(&A)", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "트레이(&T):", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "방향", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "세로(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "가로(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "세로(&P)", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "가로(&L)", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "왼쪽(&E):", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Lt.rc b/dll/win32/comdlg32/lang/cdlg_Lt.rc index 87cb5755c5c..53c1dda5fb0 100644 --- a/dll/win32/comdlg32/lang/cdlg_Lt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Lt.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Tenkina tik &visas žodis", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Skirti raidžių &dydį", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Kryptis", grp1, 147, 21, 58, 38 - CONTROL "&Žemyn", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 //FIXME: accelerator collision &Z - CONTROL "&Aukštyn", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Žemyn", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP//FIXME: accelerator collision &Z + AUTORADIOBUTTON "&Aukštyn", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Ieškoti &kito", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Atsisakyti", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,30 +353,30 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Atsisakyti", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Žinynas", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Spausdintuvas", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Spausdintuvas", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Spausdinti į fai&lą", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Savybės", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Vardas:", stc6, 16, 20, 36,8 + LTEXT "&Vardas:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Būsena:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tipas:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Tipas:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Vieta:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentaras:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentaras:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Kopijos", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Kopijos", grp2, 160, 92, 120,64, WS_GROUP LTEXT "&Kopijų skaičius:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "Su&dėst.", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Spausdinimo rėžiai", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Visą", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pu&slapiai", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Pažymėtas &tekstas", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Spausdinimo rėžiai", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Visą", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Pu&slapiai", rad3,16,122,36,12 + AUTORADIOBUTTON "Pažymėtas &tekstas", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "nuo:", stc2, 52,124, 20,8 @@ -392,29 +392,29 @@ BEGIN PUSHBUTTON "Atsisakyti",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Spausdintuvas", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Spausdintuvas", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Savybės", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Vardas:", stc6, 16, 20, 36,8 + LTEXT "&Vardas:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Būsena:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Tipas:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Tipas:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Vieta:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentaras:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentaras:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Popierius", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "D&ydis:", stc2, 16,108, 36, 8 + GROUPBOX "Popierius", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "D&ydis:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Šaltinis:", stc3, 16,128, 36, 8 + LTEXT "&Šaltinis:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Padėtis", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Stačias", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Gulsčias", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Stačias", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Gulsčias", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "Dėk&las:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Padėtis", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Stačias", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Gulsčias", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Stačias", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Gulsčias", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Kairėje:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Nl.rc b/dll/win32/comdlg32/lang/cdlg_Nl.rc index ac99d179224..a0890e5edc2 100644 --- a/dll/win32/comdlg32/lang/cdlg_Nl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Nl.rc @@ -313,8 +313,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Heel &woord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Gelijke &hoofd-/kleine letters", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Zoekrichting", grp1, 147, 21, 58, 38 - CONTROL "&Omhoog", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "O&mlaag", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Omhoog", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "O&mlaag", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Volgende zoeken", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuleren", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -354,7 +354,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Naar &bestand", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Eigenschappen", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Eigenschappen", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Naam:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -363,23 +363,23 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Waar:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Opmerking:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Opmerking:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Aantal", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Aantal e&xemplaren:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "&Sorteren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "&Sorteren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Afdrukbereik", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alles", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Pagina's", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Sele&ctie", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Afdrukbereik", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Alles", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Pagina's", rad3,16,122,36,12 + AUTORADIOBUTTON "Sele&ctie", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&van:", stc2, 52,124, 20,8 - RTEXT "&t/m:", stc3, 99,124, 20,8 + RTEXT "&t/m:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -392,7 +392,7 @@ BEGIN /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Eigenschappen", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Eigenschappen", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Naam:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -401,19 +401,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Waar:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Opmerking:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Opmerking:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Grootte:", stc2, 16,108, 36, 8 + GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "Grootte:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Bron:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Oriëntatie", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "S&taand", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&iggend", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "S&taand", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&iggend", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -430,8 +430,8 @@ BEGIN LTEXT "La&de:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Oriëntatie", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Staand", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Staand", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&inks:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_No.rc b/dll/win32/comdlg32/lang/cdlg_No.rc index 281b160b053..01f5fe724bd 100644 --- a/dll/win32/comdlg32/lang/cdlg_No.rc +++ b/dll/win32/comdlg32/lang/cdlg_No.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Skill &mellom store og små bokstaver", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Retning", grp1, 147, 21, 58, 38 - CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "Ne&d", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Opp", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Ne&d", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Finn neste", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -364,7 +364,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Hvor:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopier", grp2, 160, 92, 120,64, WS_GROUP @@ -373,14 +373,14 @@ FONT 8, "MS Shell Dlg" CONTROL "S&orter", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Utskriftsområde", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alt", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Sider", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Merket område", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Utskriftsområde", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Alt", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Sider", rad3,16,122,36,12 + AUTORADIOBUTTON "&Merket område", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&Fra:", stc2, 52,124, 20,8 - RTEXT "&Til:", stc3, 99,124, 20,8 + RTEXT "&Til:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -402,19 +402,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Hvor:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papir", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Størrelse:", stc2, 16,108, 36, 8 + LTEXT "Størrelse:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Kilde:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Retning", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "S&tående", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Liggende", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "S&tående", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Liggende", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "Sku&ff:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Retning", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Stående", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Liggende", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Stående", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Liggende", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "V&enstre:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Pl.rc b/dll/win32/comdlg32/lang/cdlg_Pl.rc index eeb5ce80fe4..a1ed548b37e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pl.rc @@ -315,8 +315,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Uwzględnij tylko całe wyrazy", chx1, 4, 26, 107, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Uwzględnij wielkość liter", chx2, 4, 42, 92, 10, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Kierunek", grp1, 118, 26, 87, 28 - CONTROL "W &górę", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 122, 38, 39, 10 - CONTROL "W &dół", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 38, 36, 10 + AUTORADIOBUTTON "W &górę", rad1, 122, 38, 39, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "W &dół", rad2, 166, 38, 36, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Znajdź następny", IDOK, 211, 5, 70, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL , 211, 23, 70, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Pomo&c", pshHelp , 211, 45, 70, 14, WS_GROUP | WS_TABSTOP @@ -351,10 +351,10 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "Pomo&c", pshHelp, 8, 164, 48,14, WS_GROUP - GROUPBOX "Drukarka", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Drukarka", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Drukuj do pli&ku", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,72,64,12 - PUSHBUTTON "Właś&ciwości", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Nazwa:", stc6, 16, 20, 36,8 + PUSHBUTTON "Właś&ciwości", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nazwa:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stan:", stc8, 16, 36, 36,10, SS_NOPREFIX LTEXT "", stc12, 55, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -362,17 +362,17 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 55, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Gdzie:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "", stc14, 55, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentarz:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Komentarz:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "", stc13, 55, 72, 153,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Lczba &kopii:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP CONTROL "&Sortuj", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Zakres wydruku", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Wszystko", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Strony", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Zaznaczenie", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Zakres wydruku", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Wszystko", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Strony", rad3,16,122,36,12 + AUTORADIOBUTTON "&Zaznaczenie", rad2,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&od:", stc2, 52,124, 16,8 @@ -387,9 +387,9 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,176,156,50,14,WS_GROUP PUSHBUTTON "Anuluj",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Drukarka", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "Właś&ciwości", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Nazwa:", stc6, 16, 20, 36,8 + GROUPBOX "Drukarka", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "Właś&ciwości", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nazwa:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stan:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -397,17 +397,17 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Gdzie:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentarz:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentarz:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Wielkość:", stc2, 16,108, 36, 8 + GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "Wielkość:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Źró&dło:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientacja", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ionowa", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "P&ozioma", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&ionowa", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "P&ozioma", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -424,8 +424,8 @@ BEGIN LTEXT "Źródł&o:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientacja", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "P&ionowa", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "Po&zioma", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&ionowa", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "Po&zioma", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Lewy:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Pt.rc b/dll/win32/comdlg32/lang/cdlg_Pt.rc index a3cb4c68859..7cbead92601 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pt.rc @@ -306,8 +306,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Palavra &inteira", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Maiúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direcção", grp1, 147, 21, 58, 38 - CONTROL "&Acima", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 //FIXME: accelerator collision &A - CONTROL "A&baixo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Acima", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP//FIXME: accelerator collision &A + AUTORADIOBUTTON "A&baixo", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON //FIXME: accelerator collision &P PUSHBUTTON "Cancelar", IDCANCEL, 212, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Ajuda", pshHelp, 212, 42, 60, 14, WS_GROUP | WS_TABSTOP //FIXME: accelerator collision &A @@ -358,9 +358,9 @@ FONT 8, "MS Shell Dlg" CONTROL "&Agrupar", chx2, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 168, 118, 100, 12 //FIXME: accelerator collision &A EDITTEXT edt3, 240, 103, 32, 12, WS_GROUP | ES_NUMBER GROUPBOX "Faixa de impressão", grp1, 8, 92, 144, 64, WS_GROUP - CONTROL "&Todos", rad1,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 16, 106, 64, 12 - CONTROL "Páginas", rad3,"Button", BS_AUTORADIOBUTTON, 16, 122, 36, 12 - CONTROL "Selecção", rad2,"Button", BS_AUTORADIOBUTTON, 16, 138, 64, 12 + AUTORADIOBUTTON "&Todos", rad1, 16, 106, 64, 12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Páginas", rad3, 16, 122, 36, 12 + AUTORADIOBUTTON "Selecção", rad2, 16, 138, 64, 12 EDITTEXT edt1, 73, 122, 26, 12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120, 122, 26, 12, WS_GROUP | ES_NUMBER RTEXT "&de:", stc2, 52, 124, 20, 8 @@ -394,8 +394,8 @@ BEGIN COMBOBOX cmb3, 52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP ICON "", ico1, 195, 112, 18, 20, WS_GROUP - CONTROL "&Retrato", rad1,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12 - CONTROL "&Paisagem", rad2,"Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12 //FIXME: accelerator collision &P + AUTORADIOBUTTON "&Retrato", rad1, 224, 106, 52, 12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Paisagem", rad2, 224, 126, 52, 12//FIXME: accelerator collision &P END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -412,8 +412,8 @@ BEGIN LTEXT "&Bandeja:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Esquerda:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP | WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Ro.rc b/dll/win32/comdlg32/lang/cdlg_Ro.rc index 27d48de92df..e366c1bf43d 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ro.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ro.rc @@ -317,8 +317,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "D&oar cuvintele întregi", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Distinge MAJ/min", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direcție:", grp1, 147, 21, 58, 38 - CONTROL "În s&us", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "În j&os", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "În s&us", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "În j&os", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Caută", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "A&nulează", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -356,7 +356,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "A&nulează", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Manual…", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Imprimantă", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Imprimantă", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Imp&rimă în fișier", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "Opți&uni…", psh2, 212, 17, 60,14, WS_GROUP LTEXT "N&ume:", stc6, 16, 20, 36,8 @@ -367,22 +367,22 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Loc:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comentariu:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Comentariu:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Cópii", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Numă&r de cópii:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "&Colaționate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "&Colaționate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Volumul de imprimare", grp1, 8,92, 144,64, WS_GROUP - CONTROL "T&ot", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Paginile", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "S&elecția", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Volumul de imprimare", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "T&ot", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Paginile", rad3,16,122,36,12 + AUTORADIOBUTTON "S&elecția", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&De la:", stc2, 52,124, 20,8 + RTEXT "&De la:", stc2, 52,124, 20,8 RTEXT "&La:", stc3, 99,124, 20,8 } @@ -395,8 +395,8 @@ BEGIN PUSHBUTTON "A&nulează",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network…", psh5, 284,156,48,14 */ - GROUPBOX "Imprimantă", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "Pr&oprietăți", psh2, 212, 17, 60,14, WS_GROUP + GROUPBOX "Imprimantă", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "Pr&oprietăți", psh2, 212, 17, 60,14, WS_GROUP LTEXT "N&ume:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stare:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -405,19 +405,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Loc:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comentariu:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Comentariu:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Hârtie", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "&Mărime:", stc2, 16,108, 36, 8 + GROUPBOX "Hârtie", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&Mărime:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "S&ursă:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientare", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Portret", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "P&eisaj", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Portret", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "P&eisaj", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -434,8 +434,8 @@ BEGIN LTEXT "Se&rtar:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientare", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portret", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Peisaj", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portret", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Peisaj", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "Stâng&a:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Ru.rc b/dll/win32/comdlg32/lang/cdlg_Ru.rc index 09d7cc7d081..861fdfe61b5 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ru.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ru.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Только слово целиком", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "C &учетом регистра", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Направление", grp1, 147, 21, 58, 38 - CONTROL "В&верх", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "В&низ", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + AUTORADIOBUTTON "В&верх", rad1, 131, 38, 35, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "В&низ", rad2, 163, 38, 35, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Найти далее", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Отмена", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -355,28 +355,28 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Принтер", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Пе&чать в файл", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "Сво&йства...", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "Сво&йства...", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Имя:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Состояние:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Состояние:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Тип:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Место:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Комментарий:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Комментарий:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Копии", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Число &копий:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "&Разобрать по копиям", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "&Разобрать по копиям", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Диапазон печати", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Все", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "С&траницы", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "В&ыделенный фрагмент", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Диапазон печати", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Все", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "С&траницы", rad3,16,122,36,12 + AUTORADIOBUTTON "В&ыделенный фрагмент", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&с:", stc2, 52,124, 20,8 @@ -396,25 +396,25 @@ BEGIN PUSHBUTTON "&Свойства", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Имя:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Состояние:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Состояние:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Тип:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Место:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Комментарий:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Комментарий:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Бумага", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Ра&змер:", stc2, 16,108, 36, 8 + GROUPBOX "Бумага", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "Ра&змер:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Пода&ча:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Ориентация", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Книжная", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Альбомная", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Книжная", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Альбомная", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "Пода&ча:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Ориентация", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Книжная", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Альбомная", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Книжная", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Альбомная", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Левое:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Si.rc b/dll/win32/comdlg32/lang/cdlg_Si.rc index fdd8e0a5be4..2758da97fda 100644 --- a/dll/win32/comdlg32/lang/cdlg_Si.rc +++ b/dll/win32/comdlg32/lang/cdlg_Si.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Samo cele besede", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Razlikuj velikost črk", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Smer iskanja", grp1, 147, 21, 58, 38 - CONTROL "Navz&gor", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "Navz&dol", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "Navz&gor", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Navz&dol", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Najdi naslednje", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Prekliči", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,30 +353,30 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Prekliči", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "Pomo&č", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Tiskalnik", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Tiskalnik", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Na&tisni v datoteko", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Lastnosti", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Ime:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stanje:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Vrsta:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Vrsta:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kje:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopije", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Število &kopij:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "Z&biranje", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "Z&biranje", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Obseg tiskanja", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Vse", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "St&rani", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "I&zbor", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Obseg tiskanja", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Vse", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "St&rani", rad3,16,122,36,12 + AUTORADIOBUTTON "I&zbor", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&od:", stc2, 52,124, 20,8 @@ -392,29 +392,29 @@ BEGIN PUSHBUTTON "Prekliči",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Tiskalnik", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Tiskalnik", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Lastnosti", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Ime:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stanje:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Vrsta:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "Vrsta:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kje:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papir", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "V&elikost:", stc2, 16,108, 36, 8 + LTEXT "V&elikost:", stc2, 16,108, 36, 8//FIXME: accelerator collision &E COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Vir:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Usmerjenost", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&okončno", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&ežeče", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&okončno", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&ežeče", rad2, 224,126,52,12//FIXME: accelerator collision &E END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -426,13 +426,13 @@ BEGIN CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 GROUPBOX "Papir", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Velikost:", stc2, 16, 112, 36, 8 + LTEXT "&Velikost:", stc2, 16, 112, 36, 8//FIXME: accelerator collision &V COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Vir:", stc3, 16, 132, 36, 8 + LTEXT "&Vir:", stc3, 16, 132, 36, 8//FIXME: accelerator collision &V COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Usmerjenost", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "P&okončna", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "L&ežeča", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&okončna", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "L&ežeča", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Levo:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Sk.rc b/dll/win32/comdlg32/lang/cdlg_Sk.rc index 541b3e59e47..ff5b7500441 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sk.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Len &celé slová", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Rozlišovať malé a veľké písmená", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Smer", grp1, 147, 21, 58, 38 - CONTROL "H&ore", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Dole", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "H&ore", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Dole", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Nájsť ď&alšie", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Zrušiť", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,10 +353,10 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Zrušiť", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Pomoc", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Tlačiareň", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Tlačiareň", grp4, 8, 4, 272,84, WS_GROUP CONTROL "tlačiť do &súboru", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "&Vlastnosti", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Názov:", stc6, 16, 20, 36,8 + PUSHBUTTON "&Vlastnosti", psh2, 212, 17, 60,14, WS_GROUP//FIXME: accelerator collision &V + LTEXT "&Názov:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stav:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -364,7 +364,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kam:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentár:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentár:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kópie", grp2, 160, 92, 120,64, WS_GROUP @@ -374,9 +374,9 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Rozsah tlače", grp1, 8,92, 144,64, WS_GROUP - CONTROL "Vytlačiť &všetko", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "St&rany", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Vý&ber", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "Vytlačiť &všetko", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP//FIXME: accelerator collision &V + AUTORADIOBUTTON "St&rany", rad3,16,122,36,12 + AUTORADIOBUTTON "Vý&ber", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&od:", stc2, 52,124, 20,8 @@ -392,9 +392,9 @@ BEGIN PUSHBUTTON "Zrušiť",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Tlačiareň", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Vlastnosti", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Názov:", stc6, 16, 20, 36,8 + GROUPBOX "Tlačiareň", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Vlastnosti", psh2, 212, 17, 60,14, WS_GROUP//FIXME: accelerator collision &V + LTEXT "&Názov:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stav:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -402,19 +402,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Kam:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentár:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentár:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "&Veľkosť:", stc2, 16,108, 36, 8 + GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&Veľkosť:", stc2, 16,108, 36, 8//FIXME: accelerator collision &V COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Zdroj:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientácia", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Na výšku", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "Na ší&rku", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Na výšku", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Na ší&rku", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientácia", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "Na výš&ku", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Na šírku", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Na výš&ku", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Na šírku", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&eft:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Sq.rc b/dll/win32/comdlg32/lang/cdlg_Sq.rc index 04a794579b9..98d6b713add 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sq.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sq.rc @@ -315,8 +315,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Përshtat Vetem fjalet e plota", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Përshtat rast", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Drejtim", grp1, 147, 21, 58, 38 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Up", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Down", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Gjej tjetrin", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Anulo", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -354,12 +354,12 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Anulo", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "Ndihmë", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Printeri", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Printeri", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Printo dookumentin", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "Tiparet", psh2, 212, 17, 60,14, WS_GROUP LTEXT "Emri:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Statusi:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Statusi:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipi:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -374,10 +374,10 @@ FONT 8, "MS Shell Dlg" CONTROL "Mbledh", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Printo gamen", grp1, 8,92, 144,64, WS_GROUP - CONTROL "Te gjith", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Faqet", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "Përzgjedhur", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Printo gamen", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "Te gjith", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Faqet", rad3,16,122,36,12 + AUTORADIOBUTTON "Përzgjedhur", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "Nga:", stc2, 52,124, 20,8 @@ -393,17 +393,17 @@ BEGIN PUSHBUTTON "Anulo",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Printeri", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Printeri", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "Tipre", psh2, 212, 17, 60,14, WS_GROUP LTEXT "Emii:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Statusi:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "Statusi:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "ipi:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Ku:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommennt:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommennt:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Lter", grp2, 8, 92, 164,56, WS_GROUP @@ -414,8 +414,8 @@ BEGIN GROUPBOX "Orientimi", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&ortrait", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andscape", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -432,8 +432,8 @@ BEGIN LTEXT "Kosh:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientimi", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "Majtas:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Sr.rc b/dll/win32/comdlg32/lang/cdlg_Sr.rc index 2055f811502..b719161367e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sr.rc @@ -214,7 +214,7 @@ FONT 8, "MS Shell Dlg" PRINT_SETUP DIALOG 36, 24, 264, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Postavke &štampe..." +CAPTION "Postavke &štampe" FONT 8, "MS Shell Dlg" { GROUPBOX "Štampanje", grp1, 6, 6, 180, 72, BS_GROUPBOX @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Match &Case", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Opis", grp1, 147, 21, 58, 38 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Up", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Down", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Otkaži", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -353,18 +353,18 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Otkaži", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Pomoć", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Štampanje", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Štampanje", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Štampanje na datoteku", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Svojstva", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Naziv:", stc6, 16, 20, 36,8 + LTEXT "&Naziv:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stanje", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "&Ukucaj:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "&Ukucaj:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentari:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentari:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP @@ -373,10 +373,10 @@ FONT 8, "MS Shell Dlg" CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "&Štampaj objekat", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Izaberi", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "&Štampaj objekat", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&All", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Pa&ges", rad3,16,122,36,12 + AUTORADIOBUTTON "&Izaberi", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&from:", stc2, 52,124, 20,8 @@ -385,36 +385,36 @@ FONT 8, "MS Shell Dlg" PRINT32_SETUP DIALOG 32, 32, 288, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP -CAPTION "Postavke &štampe..." +CAPTION "Postavke &štampe" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "U redu",IDOK,176,156,50,14,WS_GROUP PUSHBUTTON "Otkaži",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Štampanje", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Štampanje", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Svojstva", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&Naziv:", stc6, 16, 20, 36,8 + LTEXT "&Naziv:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stanje", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "&Ukucaj:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "&Ukucaj:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentari:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Komentari:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Ulaz za papir; ", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Veli&čina:", stc2, 16,108, 36, 8 + GROUPBOX "Ulaz za papir; ", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "Veli&čina:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Izvor:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "Beleške...", grp1, 180, 92, 100,56, WS_GROUP + GROUPBOX "Beleške", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "P&ortrait", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andscape", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -425,14 +425,14 @@ BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Ulaz za papir; ", grp2, 8, 96, 224, 56, BS_GROUPBOX + GROUPBOX "Ulaz za papir", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Veličina:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Beleške...", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Beleške", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Levo:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Sv.rc b/dll/win32/comdlg32/lang/cdlg_Sv.rc index 74d697dc326..38c6645b1b0 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sv.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sv.rc @@ -313,8 +313,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Bara hela ord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Skillnad på stora/små bokstäver", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP //FIXME: accelerator collision &S GROUPBOX "Riktning", grp1, 147, 21, 58, 38 - CONTROL "&Upp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Ner", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "&Upp", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Ner", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&Sök efter nästa", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON //FIXME: accelerator collision &S PUSHBUTTON "Avbryt", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -352,7 +352,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Avbryt", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&Hjälp", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "Skrivare", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Skrivare", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Skr&iv till fil", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Egenskaper", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Namn:", stc6, 16, 20, 36,8 @@ -363,7 +363,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Plats:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopior", grp2, 160, 92, 120,64, WS_GROUP @@ -373,13 +373,13 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Skriv ut", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Allt", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Si&dor", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Markering", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&Allt", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Si&dor", rad3,16,122,36,12 + AUTORADIOBUTTON "&Markering", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&från:", stc2, 52,124, 20,8 - RTEXT "&till:", stc3, 99,124, 20,8 + RTEXT "&till:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -391,7 +391,7 @@ BEGIN PUSHBUTTON "Avbryt",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Skrivare", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Skrivare", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Egenskaper", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Namn:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -401,19 +401,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Plats:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Papper", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "St&orlek:", stc2, 16,108, 36, 8 + GROUPBOX "Papper", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "St&orlek:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Källa:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Orientering", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "St&ående", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "L&iggande", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "St&ående", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&iggande", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -430,8 +430,8 @@ BEGIN LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientering", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Stående", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Liggande", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Stående", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Liggande", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Vänster:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Th.rc b/dll/win32/comdlg32/lang/cdlg_Th.rc index a6d3095c0f9..d4d68c96ae9 100644 --- a/dll/win32/comdlg32/lang/cdlg_Th.rc +++ b/dll/win32/comdlg32/lang/cdlg_Th.rc @@ -313,8 +313,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "ตรงกันทุกตัวอักษร", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "พิจารณาตัวเล็ก-ใหญ่", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "ทาง", grp1, 147, 21, 58, 38 - CONTROL "ขึ้น", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "ลง", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "ขึ้น", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ลง", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "ค้นหาต่อไป", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ยกเลิก", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -357,7 +357,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "ปรับแต่งนาฬิกา", psh2, 212, 17, 60,14, WS_GROUP LTEXT "ชื่อ:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "อาการเครื่อง:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "อาการเครื่อง:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "แบบ:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -369,13 +369,13 @@ FONT 8, "MS Shell Dlg" GROUPBOX "สําเนา", grp2, 160, 92, 120,64, WS_GROUP LTEXT "กี่สําเนา:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "จัดเรียงตามลําดับ", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "จัดเรียงตามลําดับ", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "ย่อ", grp1, 8,92, 144,64, WS_GROUP - CONTROL "ทั้งหมด", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "หนา", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "ย่อส่วนทีใช้", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "ทั้งหมด", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "หนา", rad3,16,122,36,12 + AUTORADIOBUTTON "ย่อส่วนทีใช้", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "จาก:", stc2, 52,124, 20,8 @@ -412,8 +412,8 @@ BEGIN GROUPBOX "ทีศทางการวาง", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "การตั้ง", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "แนวนอน", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "การตั้ง", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "แนวนอน", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -430,8 +430,8 @@ BEGIN LTEXT "ถาด:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "ทีศทางการวาง", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "การตั้ง", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "แนวนอน", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "การตั้ง", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "แนวนอน", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "ซ้าย:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Tr.rc b/dll/win32/comdlg32/lang/cdlg_Tr.rc index 8a9392b6925..c9145a650b4 100644 --- a/dll/win32/comdlg32/lang/cdlg_Tr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Tr.rc @@ -1,7 +1,7 @@ /* * Resources for Common Dialogs * - * Copyrights: 2006 Fatih Aşıcı, 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) + * Copyrights: 2006 Fatih Aşıcı, 2013-2016 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -313,8 +313,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Ya&lnızca Tüm Kelimeyi Eşleştir", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Büyük-Küçük Harfleri Eşleştir", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Yön", grp1, 147, 21, 58, 38 - CONTROL "Y&ukarı", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "&Aşağı", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "Y&ukarı", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Aşağı", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Sonrakini Bul", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "İptal", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -363,23 +363,23 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Konum:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Açıklama:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Açıklama:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Kopyalar", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Kopyalar", grp2, 160, 92, 120,64, WS_GROUP LTEXT "K&opya Sayısı:",stc5,168,105,68,8 ICON "", ico3, 210,131, 76,24, WS_GROUP - CONTROL "Ha&rmanla", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "Ha&rmanla", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Aralığı Yazdır", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Tümü", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Sayfalar", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "S&eçim", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Aralığı Yazdır", grp1, 8,92, 144,64, WS_GROUP + AUTORADIOBUTTON "&Tümü", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Sayfalar", rad3,16,122,36,12 + AUTORADIOBUTTON "S&eçim", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&Şuradan:", stc2, 52,124, 20,8 - RTEXT "Ş&uraya:", stc3, 99,124, 20,8 + RTEXT "&Şuradan:", stc2, 52,124, 20,8 + RTEXT "Ş&uraya:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -401,19 +401,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Konum:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Açıklama:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Açıklama:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kağıt", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "B&oyutlar:", stc2, 16,108, 36, 8 + LTEXT "B&oyutlar:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Ka&ynak:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Yön", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Portre", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Manzara", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Portre", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Manzara", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -430,8 +430,8 @@ BEGIN LTEXT "Ka&ynak:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Yön", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portre", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Manzara", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portre", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Manzara", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "So&l:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Uk.rc b/dll/win32/comdlg32/lang/cdlg_Uk.rc index 3fa698d2527..be7cff59bb0 100644 --- a/dll/win32/comdlg32/lang/cdlg_Uk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Uk.rc @@ -314,8 +314,8 @@ FONT 8, "MS Shell Dlg" CHECKBOX "&Лише слово цілком", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Враховувати &реґістр", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Напрям", grp1, 147, 21, 58, 38 - CONTROL "В&верх", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "В&низ", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + AUTORADIOBUTTON "В&верх", rad1, 131, 38, 35, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "В&низ", rad2, 163, 38, 35, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "З&найти далі", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Скасувати", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -355,7 +355,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Принтер", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Друк у фай&л", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "В&ластивості", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "В&ластивості", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Ім'я:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Статус:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -364,7 +364,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Місце:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Примітка:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Примітка:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Копії", grp2, 160, 92, 120,64, WS_GROUP @@ -374,9 +374,9 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Друкувати", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Все", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Сторінки", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "&Виділення", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "&Все", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Сторінки", rad3,16,122,36,12 + AUTORADIOBUTTON "&Виділення", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&від:", stc2, 52,124, 20,8 @@ -393,7 +393,7 @@ BEGIN /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ GROUPBOX "Принтер", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "В&ластивості", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "В&ластивості", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Ім'я:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Статус:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -402,19 +402,19 @@ BEGIN LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Місце:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Примітка:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "Примітка:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Папір", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Ро&змір:", stc2, 16,108, 36, 8 + LTEXT "Ро&змір:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&Джерело:", stc3, 16,128, 36, 8 + LTEXT "&Джерело:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "Орієнтація", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&Книжкова", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "&Альбомна", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "&Книжкова", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Альбомна", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -431,8 +431,8 @@ BEGIN LTEXT "Ло&ток:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Орієнтація", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Книжкова", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Альбомна", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Книжкова", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "&Альбомна", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Ліве:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER diff --git a/dll/win32/comdlg32/lang/cdlg_Zh.rc b/dll/win32/comdlg32/lang/cdlg_Zh.rc index c2de764de0d..37260e61f03 100644 --- a/dll/win32/comdlg32/lang/cdlg_Zh.rc +++ b/dll/win32/comdlg32/lang/cdlg_Zh.rc @@ -318,8 +318,8 @@ FONT 9, "宋体" CHECKBOX "全字匹配(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "区分大小写(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "方向", grp1, 147, 21, 58, 38 - CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "上(&U)", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "下(&D)", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "找下一个(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -360,7 +360,7 @@ FONT 9, "宋体" GROUPBOX "打印机", grp4, 8, 4, 272,84, WS_GROUP CONTROL "打印到文件(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "属性(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "名称(&N):", stc6, 16, 20, 36,8 + LTEXT "名称(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "状态：", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -378,13 +378,13 @@ FONT 9, "宋体" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "打印范围", grp1, 8,92, 144,64, WS_GROUP - CONTROL "全部(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "页数(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "选中的范围(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "全部(&A)", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "页数(&G)", rad3,16,122,36,12 + AUTORADIOBUTTON "选中的范围(&S)", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "从(&F)：", stc2, 52,124, 20,8 - RTEXT "到(&T)：", stc3, 99,124, 20,8 + RTEXT "到(&T)：", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -398,7 +398,7 @@ BEGIN GROUPBOX "打印机", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "属性(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "名称(&N):", stc6, 16, 20, 36,8 + LTEXT "名称(&N):", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "状态：", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -410,15 +410,15 @@ BEGIN LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "纸张", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "大小(&Z):", stc2, 16,108, 36, 8 + LTEXT "大小(&Z):", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "纸张来源(&S)：", stc3, 16,128, 36, 8 + LTEXT "纸张来源(&S)：", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP GROUPBOX "方向", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "纵向(&P)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "横向(&L)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "纵向(&O)", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "横向(&A)", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -435,8 +435,8 @@ BEGIN LTEXT "托盘(&T)：", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "方向", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "纵向(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "横向(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "纵向(&P)", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "横向(&L)", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "左(&E)：", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER @@ -448,7 +448,7 @@ BEGIN EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "确定", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "打印机(&P)...", psh3, 182, 220, 50, 14 + PUSHBUTTON "打印机(&R)...", psh3, 182, 220, 50, 14 END NEWFILEOPENORD DIALOG 0, 0, 280, 164 @@ -820,8 +820,8 @@ FONT 9, "新細明體" CHECKBOX "符合全字拼寫(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "符合大小寫(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "搜尋方向", grp1, 147, 21, 58, 38 - CONTROL "向上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "向下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + AUTORADIOBUTTON "向上(&U)", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "向下(&D)", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "找下一個(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -862,7 +862,7 @@ FONT 9, "新細明體" GROUPBOX "印表機", grp4, 8, 4, 272,84, WS_GROUP CONTROL "列印到檔案(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "內容(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "名稱(&N)：", stc6, 16, 20, 36,8 + LTEXT "名稱(&N)：", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "狀態：", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -880,13 +880,13 @@ FONT 9, "新細明體" EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "列印範圍", grp1, 8,92, 144,64, WS_GROUP - CONTROL "全部(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "頁(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "選取範圍(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + AUTORADIOBUTTON "全部(&A)", rad1,16,106,64,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "頁(&G)", rad3,16,122,36,12 + AUTORADIOBUTTON "選取範圍(&S)", rad2,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "從(&F)：", stc2, 52,124, 20,8 - RTEXT "到(&T)：", stc3, 99,124, 20,8 + RTEXT "到(&T)：", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -919,8 +919,8 @@ BEGIN GROUPBOX "列印方向", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "縱向(&O)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "橫向(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + AUTORADIOBUTTON "縱向(&O)", rad1, 224,106,52,12, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "橫向(&A)", rad2, 224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -937,8 +937,8 @@ BEGIN LTEXT "紙匣(&T)：", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "列印方向", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "縱向(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "橫向(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "縱向(&P)", rad1, 16, 170, 52, 12 + AUTORADIOBUTTON "橫向(&L)", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "左(&E)：", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER

4 months, 2 weeks

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2024