Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 01/01: [TRANSLATION][SHELL32] Update Polish translation of the "MoveToFolder" dialog (#3072)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d373689fe2fcf474fb4b… commit 7d373689fe2fcf474fb4b478d9d3deb93bbb017e Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Tue Aug 18 12:53:50 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 18 12:53:50 2020 +0200 [TRANSLATION][SHELL32] Update Polish translation of the "MoveToFolder" dialog (#3072) --- dll/win32/shell32/lang/pl-PL.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 3f544061d55..f469cd7863c 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1008,8 +1008,8 @@ BEGIN IDS_COPYTOTITLE "Zaznacz miejsce, w które chcesz skopiować '%s', a następnie kliknij przycisk Kopiuj." IDS_COPYITEMS "Kopiowanie elementów" IDS_COPYBUTTON "Kopiuj" - IDS_MOVETOMENU "Mo&ve to folder..." - IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." - IDS_MOVEITEMS "Move Items" - IDS_MOVEBUTTON "Move" + IDS_MOVETOMENU "P&rzenieś do folderu..." + IDS_MOVETOTITLE "Zaznacz miejsce, w które chcesz przenieść '%s', a następnie kliknij przycisk Przenieś." + IDS_MOVEITEMS "Przenoszenie elementów" + IDS_MOVEBUTTON "Przenieś" END

4 years, 4 months

[reactos] 01/01: [SHELL32] Update Japanese translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fde7a3b7641405015df79… commit fde7a3b7641405015df792b7f6e539ba26d729cc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 18 09:27:10 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Aug 18 09:27:10 2020 +0900 [SHELL32] Update Japanese translation --- dll/win32/shell32/lang/ja-JP.rc | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 4d49baf9bf2..27fbd7a3d9b 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -11,7 +11,7 @@ BEGIN BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "アイコンの自動整列(&A)", FCIDM_SHVIEW_AUTOARRANGE - MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID + MENUITEM "アイコンを等間隔に整列(&G)", FCIDM_SHVIEW_ALIGNTOGRID END END @@ -32,7 +32,7 @@ BEGIN BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "アイコンの自動整列(&A)", FCIDM_SHVIEW_AUTOARRANGE - MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID + MENUITEM "アイコンを等間隔に整列(&G)", FCIDM_SHVIEW_ALIGNTOGRID END MENUITEM "最新の情報に更新", FCIDM_SHVIEW_REFRESH MENUITEM "", -1, MFT_SEPARATOR @@ -707,17 +707,17 @@ BEGIN END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 -CAPTION "Problem with Shortcut" +CAPTION "ショートカットに問題があります" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 - LTEXT "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 - LTEXT "Nearest match based on name, type, size, and date:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 - LTEXT "Do you want to fix this shortcut to point to this target or do you just want to delete it?", -1, 35, 85, 210, 30 - DEFPUSHBUTTON "&Fix it", IDOK, 55, 120, 60, 15, WS_DISABLED - PUSHBUTTON "&Delete it", IDYES, 120, 120, 60, 15 - PUSHBUTTON "Cancel", IDCANCEL, 185, 120, 60, 15 + LTEXT "このショートカットが参照する項目 '%s' は、変更されたか移動したので、このショートカットはもう正常に動作しません。", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 + LTEXT "名前、種類、サイズ、日時から最も近いのは:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 + LTEXT "このターゲットへショートカットを修正しますか、それとも削除しますか？", -1, 35, 85, 210, 30 + DEFPUSHBUTTON "修正(&F)", IDOK, 55, 120, 60, 15, WS_DISABLED + PUSHBUTTON "削除(&D)", IDYES, 120, 120, 60, 15 + PUSHBUTTON "キャンセル", IDCANCEL, 185, 120, 60, 15 END STRINGTABLE @@ -994,13 +994,13 @@ BEGIN IDS_EDITING_ACTION "種類に対するアクションの編集: " IDS_NO_ICONS "ファイル '%s' にはアイコンデータがありません。.\n\nリストからアイコンを選ぶか、別のファイルを指定して下さい。" IDS_FILE_NOT_FOUND "ファイル '%s' は見つかりませんでした。" - IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." - IDS_COPYTOMENU "Copy to &folder..." - IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." - IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" - IDS_MOVETOMENU "Mo&ve to folder..." - IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." - IDS_MOVEITEMS "Move Items" - IDS_MOVEBUTTON "Move" + IDS_LINK_INVALID "このショートカットが参照する項目 '%s' は、変更されたか移動したので、このショートカットはもう正常に動作しません。" + IDS_COPYTOMENU "フォルダにコピー(&F)..." + IDS_COPYTOTITLE "'%s' のコピー先を選択して「コピー」ボタンをクリックして下さい。" + IDS_COPYITEMS "項目のコピー先" + IDS_COPYBUTTON "コピー" + IDS_MOVETOMENU "フォルダに移動(&V)..." + IDS_MOVETOTITLE "'%s' の移動先を選択して「移動」ボタンをクリックして下さい。" + IDS_MOVEITEMS "項目の移動先" + IDS_MOVEBUTTON "移動" END

4 years, 4 months

[reactos] 01/01: [NTUSER] Set ERROR_INVALID_WINDOW_HANDLE when PostMessage failed (#3059)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81f28d454a3f7f094065b… commit 81f28d454a3f7f094065b42509ef51b899ba8801 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 18 05:32:44 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 18 05:32:44 2020 +0900 [NTUSER] Set ERROR_INVALID_WINDOW_HANDLE when PostMessage failed (#3059) Set the last error code ERROR_INVALID_WINDOW_HANDLE when user32!PostMessage failed with destroyed window. CORE-12124 --- win32ss/user/ntuser/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 79d68a184ea..ae0c0733ebe 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -1423,7 +1423,7 @@ UserPostMessage( HWND Wnd, if ( Window->state & WNDS_DESTROYED ) { ERR("Attempted to post message to window %p that is being destroyed!\n", Wnd); - /* FIXME: Last error code? */ + EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); return FALSE; }

4 years, 4 months

[reactos] 01/01: [SHELL32] Implement Move To Folder (#3056)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46ff964e22a969377ec31… commit 46ff964e22a969377ec312cbe6b7731a7f50942b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 18 05:30:54 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 18 05:30:54 2020 +0900 [SHELL32] Implement Move To Folder (#3056) - Add context menu item "Mo&ve to folder..." and implement the action. - Implement the "Mo&ve to folder..." menu item of "Edit" menu of Explorer. CORE-11132 --- dll/win32/shell32/CCopyToMenu.cpp | 3 +- .../shell32/{CCopyToMenu.h => CCopyToMoveToMenu.h} | 55 +++++++++- dll/win32/shell32/CDefView.cpp | 1 + dll/win32/shell32/CDefaultContextMenu.cpp | 22 +++- dll/win32/shell32/CMakeLists.txt | 1 + .../shell32/{CCopyToMenu.cpp => CMoveToMenu.cpp} | 111 ++++++++------------- dll/win32/shell32/lang/bg-BG.rc | 4 + dll/win32/shell32/lang/ca-ES.rc | 4 + dll/win32/shell32/lang/cs-CZ.rc | 4 + dll/win32/shell32/lang/da-DK.rc | 4 + dll/win32/shell32/lang/de-DE.rc | 4 + dll/win32/shell32/lang/el-GR.rc | 4 + dll/win32/shell32/lang/en-GB.rc | 4 + dll/win32/shell32/lang/en-US.rc | 4 + dll/win32/shell32/lang/es-ES.rc | 4 + dll/win32/shell32/lang/et-EE.rc | 4 + dll/win32/shell32/lang/fi-FI.rc | 4 + dll/win32/shell32/lang/fr-FR.rc | 4 + dll/win32/shell32/lang/he-IL.rc | 4 + dll/win32/shell32/lang/hi-IN.rc | 4 + dll/win32/shell32/lang/hu-HU.rc | 4 + dll/win32/shell32/lang/id-ID.rc | 4 + dll/win32/shell32/lang/it-IT.rc | 4 + dll/win32/shell32/lang/ja-JP.rc | 4 + dll/win32/shell32/lang/ko-KR.rc | 4 + dll/win32/shell32/lang/nl-NL.rc | 4 + dll/win32/shell32/lang/no-NO.rc | 4 + dll/win32/shell32/lang/pl-PL.rc | 4 + dll/win32/shell32/lang/pt-BR.rc | 4 + dll/win32/shell32/lang/pt-PT.rc | 4 + dll/win32/shell32/lang/ro-RO.rc | 4 + dll/win32/shell32/lang/ru-RU.rc | 4 + dll/win32/shell32/lang/sk-SK.rc | 4 + dll/win32/shell32/lang/sl-SI.rc | 4 + dll/win32/shell32/lang/sq-AL.rc | 4 + dll/win32/shell32/lang/sv-SE.rc | 4 + dll/win32/shell32/lang/tr-TR.rc | 4 + dll/win32/shell32/lang/uk-UA.rc | 4 + dll/win32/shell32/lang/zh-CN.rc | 4 + dll/win32/shell32/lang/zh-TW.rc | 4 + dll/win32/shell32/precomp.h | 2 +- dll/win32/shell32/res/rgs/movetomenu.rgs | 26 +++++ dll/win32/shell32/rgs_res.rc | 1 + dll/win32/shell32/shell32.cpp | 1 + dll/win32/shell32/shresdef.h | 6 ++ 45 files changed, 286 insertions(+), 79 deletions(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index bc1325bb86d..a20ed449abe 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -9,8 +9,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -static HRESULT -_GetCidlFromDataObject(IDataObject *pDataObject, CIDA** ppcida) +HRESULT _GetCidlFromDataObject(IDataObject *pDataObject, CIDA** ppcida) { static CLIPFORMAT s_cfHIDA = 0; if (s_cfHIDA == 0) diff --git a/dll/win32/shell32/CCopyToMenu.h b/dll/win32/shell32/CCopyToMoveToMenu.h similarity index 51% rename from dll/win32/shell32/CCopyToMenu.h rename to dll/win32/shell32/CCopyToMoveToMenu.h index a56cba111de..da61ca14284 100644 --- a/dll/win32/shell32/CCopyToMenu.h +++ b/dll/win32/shell32/CCopyToMoveToMenu.h @@ -1,11 +1,13 @@ /* * PROJECT: shell32 * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: CopyTo implementation + * PURPOSE: CopyTo and MoveTo implementation * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #pragma once +HRESULT _GetCidlFromDataObject(IDataObject *pDataObject, CIDA** ppcida); + class CCopyToMenu : public CComCoClass<CCopyToMenu, &CLSID_CopyToMenu>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -56,3 +58,54 @@ public: COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() }; + +class CMoveToMenu : + public CComCoClass<CMoveToMenu, &CLSID_MoveToMenu>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu2, + public IObjectWithSite, + public IShellExtInit +{ +protected: + UINT m_idCmdFirst, m_idCmdLast, m_idCmdMoveTo; + CComPtr<IDataObject> m_pDataObject; + CComPtr<IUnknown> m_pSite; + + HRESULT DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT DoRealMove(LPCMINVOKECOMMANDINFO lpici, PCUIDLIST_ABSOLUTE pidl); + CStringW DoGetFileTitle(); + +public: + CComHeapPtr<ITEMIDLIST> m_pidlFolder; + WNDPROC m_fnOldWndProc; + + CMoveToMenu(); + ~CMoveToMenu(); + + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + + // IContextMenu2 + virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + + // IShellExtInit + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + + // IObjectWithSite + virtual HRESULT WINAPI SetSite(IUnknown *pUnkSite); + virtual HRESULT WINAPI GetSite(REFIID riid, void **ppvSite); + + DECLARE_REGISTRY_RESOURCEID(IDR_MOVETOMENU) + DECLARE_NOT_AGGREGATABLE(CMoveToMenu) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CMoveToMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + END_COM_MAP() +}; diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index a42d4d495cb..6948e572958 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1823,6 +1823,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand case FCIDM_SHVIEW_RENAME: case FCIDM_SHVIEW_PROPERTIES: case FCIDM_SHVIEW_COPYTO: + case FCIDM_SHVIEW_MOVETO: return OnExplorerCommand(dwCmdID, TRUE); case FCIDM_SHVIEW_INSERT: diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index a717078f70b..30d1433df65 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -49,6 +49,7 @@ struct _StaticInvokeCommandMap_ { "properties", FCIDM_SHVIEW_PROPERTIES}, { "rename", FCIDM_SHVIEW_RENAME}, { "copyto", FCIDM_SHVIEW_COPYTO }, + { "moveto", FCIDM_SHVIEW_MOVETO }, }; class CDefaultContextMenu : @@ -95,7 +96,7 @@ class CDefaultContextMenu : HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); - HRESULT DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy); HRESULT InvokeShellExt(LPCMINVOKECOMMANDINFO lpcmi); HRESULT InvokeRegVerb(LPCMINVOKECOMMANDINFO lpcmi); DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry); @@ -895,7 +896,7 @@ CDefaultContextMenu::DoProperties( } HRESULT -CDefaultContextMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) +CDefaultContextMenu::DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy) { HRESULT hr = E_FAIL; if (!m_pDataObj) @@ -905,7 +906,12 @@ CDefaultContextMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) } CComPtr<IContextMenu> pContextMenu; - hr = SHCoCreateInstance(NULL, &CLSID_CopyToMenu, NULL, IID_PPV_ARG(IContextMenu, &pContextMenu)); + if (bCopy) + hr = SHCoCreateInstance(NULL, &CLSID_CopyToMenu, NULL, + IID_PPV_ARG(IContextMenu, &pContextMenu)); + else + hr = SHCoCreateInstance(NULL, &CLSID_MoveToMenu, NULL, + IID_PPV_ARG(IContextMenu, &pContextMenu)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -918,7 +924,10 @@ CDefaultContextMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) if (FAILED_UNEXPECTEDLY(hr)) return hr; - lpici->lpVerb = "copyto"; + if (bCopy) + lpici->lpVerb = "copyto"; + else + lpici->lpVerb = "moveto"; return pContextMenu->InvokeCommand(lpici); } @@ -1279,7 +1288,10 @@ CDefaultContextMenu::InvokeCommand( Result = DoCreateNewFolder(&LocalInvokeInfo); break; case FCIDM_SHVIEW_COPYTO: - Result = DoCopyToFolder(&LocalInvokeInfo); + Result = DoCopyToMoveToFolder(&LocalInvokeInfo, TRUE); + break; + case FCIDM_SHVIEW_MOVETO: + Result = DoCopyToMoveToFolder(&LocalInvokeInfo, FALSE); break; default: Result = E_INVALIDARG; diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index aa51a47fe43..5c812e953e4 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -84,6 +84,7 @@ list(APPEND SOURCE CNewMenu.cpp CSendToMenu.cpp CCopyToMenu.cpp + CMoveToMenu.cpp CShellDispatch.cpp CFolder.cpp CFolderItems.cpp diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp similarity index 73% copy from dll/win32/shell32/CCopyToMenu.cpp copy to dll/win32/shell32/CMoveToMenu.cpp index bc1325bb86d..020a8e70b8a 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -1,7 +1,7 @@ /* * PROJECT: shell32 * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: CopyTo implementation + * PURPOSE: MoveTo implementation * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ @@ -9,48 +9,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -static HRESULT -_GetCidlFromDataObject(IDataObject *pDataObject, CIDA** ppcida) -{ - static CLIPFORMAT s_cfHIDA = 0; - if (s_cfHIDA == 0) - { - s_cfHIDA = static_cast<CLIPFORMAT>(RegisterClipboardFormatW(CFSTR_SHELLIDLIST)); - } - - FORMATETC fmt = { s_cfHIDA, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; - STGMEDIUM medium; - - HRESULT hr = pDataObject->GetData(&fmt, &medium); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - LPVOID lpSrc = GlobalLock(medium.hGlobal); - SIZE_T cbSize = GlobalSize(medium.hGlobal); - - *ppcida = reinterpret_cast<CIDA *>(::CoTaskMemAlloc(cbSize)); - if (*ppcida) - { - memcpy(*ppcida, lpSrc, cbSize); - hr = S_OK; - } - else - { - ERR("Out of memory\n"); - hr = E_FAIL; - } - ReleaseStgMedium(&medium); - return hr; -} - -CCopyToMenu::CCopyToMenu() : +CMoveToMenu::CMoveToMenu() : m_idCmdFirst(0), m_idCmdLast(0), - m_idCmdCopyTo(-1) + m_idCmdMoveTo(-1) { } -CCopyToMenu::~CCopyToMenu() +CMoveToMenu::~CMoveToMenu() { } @@ -59,8 +25,8 @@ CCopyToMenu::~CCopyToMenu() static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CCopyToMenu *this_ = - reinterpret_cast<CCopyToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + CMoveToMenu *this_ = + reinterpret_cast<CMoveToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); switch (uMsg) { @@ -74,27 +40,27 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) { - CCopyToMenu *this_ = - reinterpret_cast<CCopyToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + CMoveToMenu *this_ = + reinterpret_cast<CMoveToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); switch (uMsg) { case BFFM_INITIALIZED: { SetWindowLongPtr(hwnd, GWLP_USERDATA, lpData); - this_ = reinterpret_cast<CCopyToMenu *>(lpData); + this_ = reinterpret_cast<CMoveToMenu *>(lpData); // Select initial directory SendMessageW(hwnd, BFFM_SETSELECTION, FALSE, reinterpret_cast<LPARAM>(static_cast<LPCITEMIDLIST>(this_->m_pidlFolder))); // Set caption - CString strCaption(MAKEINTRESOURCEW(IDS_COPYITEMS)); + CString strCaption(MAKEINTRESOURCEW(IDS_MOVEITEMS)); SetWindowTextW(hwnd, strCaption); // Set OK button text - CString strCopy(MAKEINTRESOURCEW(IDS_COPYBUTTON)); - SetDlgItemText(hwnd, IDOK, strCopy); + CString strMove(MAKEINTRESOURCEW(IDS_MOVEBUTTON)); + SetDlgItemText(hwnd, IDOK, strMove); // Subclassing this_->m_fnOldWndProc = @@ -126,7 +92,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) return FALSE; } -HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) +HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) { CComHeapPtr<CIDA> pCIDA; HRESULT hr = _GetCidlFromDataObject(m_pDataObject, &pCIDA); @@ -178,14 +144,14 @@ HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) } SHFILEOPSTRUCTW op = { lpici->hwnd }; - op.wFunc = FO_COPY; + op.wFunc = FO_MOVE; op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); } -CStringW CCopyToMenu::DoGetFileTitle() +CStringW CMoveToMenu::DoGetFileTitle() { CStringW ret = L"(file)"; @@ -222,12 +188,12 @@ CStringW CCopyToMenu::DoGetFileTitle() return ret; } -HRESULT CCopyToMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) +HRESULT CMoveToMenu::DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici) { WCHAR wszPath[MAX_PATH]; HRESULT hr = E_FAIL; - TRACE("DoCopyToFolder(%p)\n", lpici); + TRACE("DoMoveToFolder(%p)\n", lpici); if (!SHGetPathFromIDListW(m_pidlFolder, wszPath)) { @@ -237,7 +203,7 @@ HRESULT CCopyToMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) CStringW strFileTitle = DoGetFileTitle(); CStringW strTitle; - strTitle.Format(IDS_COPYTOTITLE, static_cast<LPCWSTR>(strFileTitle)); + strTitle.Format(IDS_MOVETOTITLE, static_cast<LPCWSTR>(strFileTitle)); BROWSEINFOW info = { lpici->hwnd }; info.pidlRoot = NULL; @@ -248,14 +214,14 @@ HRESULT CCopyToMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) CComHeapPtr<ITEMIDLIST> pidl(SHBrowseForFolder(&info)); if (pidl) { - hr = DoRealCopy(lpici, pidl); + hr = DoRealMove(lpici, pidl); } return hr; } HRESULT WINAPI -CCopyToMenu::QueryContextMenu(HMENU hMenu, +CMoveToMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, @@ -264,17 +230,22 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, MENUITEMINFOW mii; UINT Count = 0; - TRACE("CCopyToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", + TRACE("CMoveToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); m_idCmdFirst = m_idCmdLast = idCmdFirst; // insert separator if necessary + CStringW strCopyTo(MAKEINTRESOURCEW(IDS_COPYTOMENU)); + WCHAR szBuff[128]; ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE; + mii.dwTypeData = szBuff; + mii.cch = _countof(szBuff); if (GetMenuItemInfoW(hMenu, indexMenu - 1, TRUE, &mii) && - mii.fType != MFT_SEPARATOR) + mii.fType != MFT_SEPARATOR && + !(mii.fType == MFT_STRING && CStringW(szBuff) == strCopyTo)) { ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -287,8 +258,8 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, } } - // insert "Copy to folder..." - CStringW strText(MAKEINTRESOURCEW(IDS_COPYTOMENU)); + // insert "Move to folder..." + CStringW strText(MAKEINTRESOURCEW(IDS_MOVETOMENU)); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; @@ -298,7 +269,7 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, mii.wID = m_idCmdLast; if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) { - m_idCmdCopyTo = m_idCmdLast++; + m_idCmdMoveTo = m_idCmdLast++; ++indexMenu; ++Count; } @@ -307,23 +278,23 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, } HRESULT WINAPI -CCopyToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) +CMoveToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { HRESULT hr = E_FAIL; - TRACE("CCopyToMenu::InvokeCommand(%p)\n", lpici); + TRACE("CMoveToMenu::InvokeCommand(%p)\n", lpici); if (HIWORD(lpici->lpVerb) == 0) { - if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdCopyTo) + if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdMoveTo) { - hr = DoCopyToFolder(lpici); + hr = DoMoveToFolder(lpici); } } else { - if (::lstrcmpiA(lpici->lpVerb, "copyto") == 0) + if (::lstrcmpiA(lpici->lpVerb, "moveto") == 0) { - hr = DoCopyToFolder(lpici); + hr = DoMoveToFolder(lpici); } } @@ -331,7 +302,7 @@ CCopyToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) } HRESULT WINAPI -CCopyToMenu::GetCommandString(UINT_PTR idCmd, +CMoveToMenu::GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, @@ -344,14 +315,14 @@ CCopyToMenu::GetCommandString(UINT_PTR idCmd, } HRESULT WINAPI -CCopyToMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) +CMoveToMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACE("This %p uMsg %x\n", this, uMsg); return E_NOTIMPL; } HRESULT WINAPI -CCopyToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, +CMoveToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { m_pidlFolder.Attach(ILClone(pidlFolder)); @@ -359,13 +330,13 @@ CCopyToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, return S_OK; } -HRESULT WINAPI CCopyToMenu::SetSite(IUnknown *pUnkSite) +HRESULT WINAPI CMoveToMenu::SetSite(IUnknown *pUnkSite) { m_pSite = pUnkSite; return S_OK; } -HRESULT WINAPI CCopyToMenu::GetSite(REFIID riid, void **ppvSite) +HRESULT WINAPI CMoveToMenu::GetSite(REFIID riid, void **ppvSite) { if (!m_pSite) return E_FAIL; diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 56ca1049511..bbd769dbfe9 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1003,4 +1003,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 8e920649408..5384ca39295 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 4c86a7c5869..c5bcb89937c 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1008,4 +1008,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 6bf29e180b5..f7b56f0c689 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1008,4 +1008,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 42e29f229e3..54ea2e4af95 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -1003,4 +1003,8 @@ BEGIN IDS_COPYTOTITLE "Wählen Sie den Ort, in den '%s' kopiert werden soll. Klicken Sie anschließend auf Kopieren." IDS_COPYITEMS "Elemente kopieren" IDS_COPYBUTTON "Kopieren" + IDS_MOVETOMENU "In Ordner &verschieben..." + IDS_MOVETOTITLE "Wählen Sie den Ort, in den '%s' verschoben werden soll. Klicken Sie anschließend auf Verschieben." + IDS_MOVEITEMS "Elemente verschieben" + IDS_MOVEBUTTON "Verschieben" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index fd2bb3cfc42..897ce7ce517 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 4d1f9e55495..ccbbe8e1f09 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 21f06a42d42..b7b8d80b273 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index bdf04fd74a4..4cad05f2368 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1011,4 +1011,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 8585ad68b08..aa53f7bd374 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -1009,4 +1009,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 80356afb3d5..e33bf0b7a1b 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index d209b586591..f032d9311d0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 8d469bf407e..4d5690c40e1 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1004,4 +1004,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 59be1fd3cbf..ac380f56403 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -997,4 +997,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index ea91a553c1f..7fa873b907b 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -1001,4 +1001,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 09571a9f2a6..d8b5a0d482f 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -998,4 +998,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index ed3dac4bfc8..c7961cecae8 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 3593c981ce7..4d49baf9bf2 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -999,4 +999,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 3c46406aab7..1c58188d4e9 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 26b311387a5..c5b82b3b260 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 1831921be23..4e5a739ff65 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 44e4bde14f7..3f544061d55 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1008,4 +1008,8 @@ BEGIN IDS_COPYTOTITLE "Zaznacz miejsce, w które chcesz skopiować '%s', a następnie kliknij przycisk Kopiuj." IDS_COPYITEMS "Kopiowanie elementów" IDS_COPYBUTTON "Kopiuj" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 9610e4e0fb6..1052bfe9250 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index f64de677bc9..8c027f41871 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index b4f0e6059aa..eb0f8eb660a 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1004,4 +1004,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 406a0937b34..9080370a56f 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1009,4 +1009,8 @@ BEGIN IDS_COPYTOTITLE "Выберите расположение, куда вы хотите скопировать '%s', затем нажмите кнопку 'Копировать'." IDS_COPYITEMS "Копирование элементов" IDS_COPYBUTTON "Копировать" + IDS_MOVETOMENU "Переместить в папку..." + IDS_MOVETOTITLE "Выберите место, куда Вы хотите переместить '%s'. Затем нажмите кнопку 'Переместить.'" + IDS_MOVEITEMS "Перемещение предметов" + IDS_MOVEBUTTON "Переместить" END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 93e87e85cad..1c50c821e27 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index eca49866975..720ebe4bf81 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index fa69346d878..8834bd41517 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1006,4 +1006,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index a81f73f5c6a..df2a3b42eaa 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 519103301b3..f31eef1ddb8 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -1004,4 +1004,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 62d8787ec23..d27d60b5808 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index a07f3cfdaf6..44e03161cd2 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -1012,4 +1012,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index c634e81d2f4..7077460b6a5 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -1013,4 +1013,8 @@ BEGIN IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items" IDS_COPYBUTTON "Copy" + IDS_MOVETOMENU "Mo&ve to folder..." + IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." + IDS_MOVEITEMS "Move Items" + IDS_MOVEBUTTON "Move" END diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 2703b42e817..84bb7e49dc5 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -81,7 +81,7 @@ #include "COpenWithMenu.h" #include "CNewMenu.h" #include "CSendToMenu.h" -#include "CCopyToMenu.h" +#include "CCopyToMoveToMenu.h" #include "dialogs/filedefext.h" #include "dialogs/drvdefext.h" #include "CQueryAssociations.h" diff --git a/dll/win32/shell32/res/rgs/movetomenu.rgs b/dll/win32/shell32/res/rgs/movetomenu.rgs new file mode 100644 index 00000000000..5d72d749faa --- /dev/null +++ b/dll/win32/shell32/res/rgs/movetomenu.rgs @@ -0,0 +1,26 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {C2FBB631-2971-11D1-A18C-00C04FD75D13} = s 'ReactOS MoveTo Object Service' + { + val flags = d '1' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } + NoRemove AllFilesystemObjects + { + NoRemove shellex + { + NoRemove ContextMenuHandlers + { + ForceRemove MoveTo = s '{C2FBB631-2971-11D1-A18C-00C04FD75D13}' + { + } + } + } + } +} diff --git a/dll/win32/shell32/rgs_res.rc b/dll/win32/shell32/rgs_res.rc index 9435241aaaa..9c5aacd0c48 100644 --- a/dll/win32/shell32/rgs_res.rc +++ b/dll/win32/shell32/rgs_res.rc @@ -31,3 +31,4 @@ IDR_SHELL REGISTRY "res/rgs/shell.rgs" IDR_ACTIVEDESKTOP REGISTRY "res/rgs/activedesktop.rgs" IDR_SENDTOMENU REGISTRY "res/rgs/sendtomenu.rgs" IDR_COPYTOMENU REGISTRY "res/rgs/copytomenu.rgs" +IDR_MOVETOMENU REGISTRY "res/rgs/movetomenu.rgs" diff --git a/dll/win32/shell32/shell32.cpp b/dll/win32/shell32/shell32.cpp index 527cbd29342..011d5b2980b 100644 --- a/dll/win32/shell32/shell32.cpp +++ b/dll/win32/shell32/shell32.cpp @@ -291,6 +291,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_NewMenu, CNewMenu) OBJECT_ENTRY(CLSID_SendToMenu, CSendToMenu) OBJECT_ENTRY(CLSID_CopyToMenu, CCopyToMenu) + OBJECT_ENTRY(CLSID_MoveToMenu, CMoveToMenu) OBJECT_ENTRY(CLSID_StartMenu, CStartMenuDummy) OBJECT_ENTRY(CLSID_MenuBandSite, CMenuSite) OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 81f22f97530..e3be5f4f255 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -301,6 +301,10 @@ #define IDS_COPYTOTITLE 30533 #define IDS_COPYITEMS 30534 #define IDS_COPYBUTTON 30535 +#define IDS_MOVETOMENU 30536 +#define IDS_MOVETOTITLE 30537 +#define IDS_MOVEITEMS 30538 +#define IDS_MOVEBUTTON 30539 /* Dialogs */ @@ -801,6 +805,7 @@ #define IDM_RENAME (FCIDM_SHVIEW_RENAME - 0x7000) #define IDM_PROPERTIES (FCIDM_SHVIEW_PROPERTIES - 0x7000) #define IDM_COPYTO (FCIDM_SHVIEW_COPYTO - 0x7000) +#define IDM_MOVETO (FCIDM_SHVIEW_MOVETO - 0x7000) #define IDM_DRAGFILE 0xce #define IDM_COPYHERE 0x7 @@ -842,3 +847,4 @@ #define IDR_ACTIVEDESKTOP 157 #define IDR_SENDTOMENU 158 #define IDR_COPYTOMENU 159 +#define IDR_MOVETOMENU 160

4 years, 4 months

[reactos] 01/01: [SHELL32] Fix sorting on size for big files CORE-17205

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=679c95597ca0a83c7779c… commit 679c95597ca0a83c7779c288af96cce6c41c96ae Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Aug 17 18:17:24 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 17 18:17:24 2020 +0200 [SHELL32] Fix sorting on size for big files CORE-17205 --- dll/win32/shell32/folders/CFSFolder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 918ba8f5ff2..9aa8281daa4 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -968,7 +968,12 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, result = wcsicmp(pExtension1, pExtension2); break; case 3: /* Size */ - result = pData1->u.file.dwFileSize - pData2->u.file.dwFileSize; + if (pData1->u.file.dwFileSize > pData2->u.file.dwFileSize) + result = 1; + else if (pData1->u.file.dwFileSize < pData2->u.file.dwFileSize) + result = -1; + else + result = 0; break; case 4: /* Modified */ result = pData1->u.file.uFileDate - pData2->u.file.uFileDate;

4 years, 4 months

[reactos] 01/01: [MOUNTMGR] Fix pool memory disclosure in QueryPointsFromMemory (#3022)

by Nguyen Trung Khanh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9adcacdbc82c243219d89… commit 9adcacdbc82c243219d89165c3e03ed8c05b852f Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Mon Aug 17 21:45:35 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 17 16:45:35 2020 +0200 [MOUNTMGR] Fix pool memory disclosure in QueryPointsFromMemory (#3022) --- drivers/filters/mountmgr/point.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index 38260a57c2a..051f8305ece 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -335,6 +335,7 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, /* Now, ensure output buffer can hold everything */ Stack = IoGetCurrentIrpStackLocation(Irp); MountPoints = (PMOUNTMGR_MOUNT_POINTS)Irp->AssociatedIrp.SystemBuffer; + RtlZeroMemory(MountPoints, Stack->Parameters.DeviceIoControl.OutputBufferLength); /* Ensure we set output to let user reallocate! */ MountPoints->Size = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSymLinks * sizeof(MOUNTMGR_MOUNT_POINT) + TotalSize;

4 years, 4 months

[reactos] 01/01: [SHELL32] French translation for "Problem with Shortcut" dialog (#3047)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61d89dec8e08dcab33cdf… commit 61d89dec8e08dcab33cdf34f288d4a0e7de39a97 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Aug 17 16:41:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 17 17:41:59 2020 +0300 [SHELL32] French translation for "Problem with Shortcut" dialog (#3047) --- dll/win32/shell32/lang/fr-FR.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 019fed4cc69..d209b586591 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -710,17 +710,17 @@ BEGIN END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 -CAPTION "Problem with Shortcut" +CAPTION "Problème avec le raccourci" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 - LTEXT "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 - LTEXT "Nearest match based on name, type, size, and date:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 - LTEXT "Do you want to fix this shortcut to point to this target or do you just want to delete it?", -1, 35, 85, 210, 30 - DEFPUSHBUTTON "&Fix it", IDOK, 55, 120, 60, 15, WS_DISABLED - PUSHBUTTON "&Delete it", IDYES, 120, 120, 60, 15 - PUSHBUTTON "Cancel", IDCANCEL, 185, 120, 60, 15 + LTEXT "L'élément '%s' auquel ce raccourci fait référence a été modifié ou déplacé et ce raccourci ne fonctionne plus correctement.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 + LTEXT "Elément correspondant le plus proche basé sur le nom, type, taille et date :", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 + LTEXT "Voulez-vous corriger ce raccourcis en pointant vers cette cible ou voulez-vous le supprimer ?", -1, 35, 85, 210, 30 + DEFPUSHBUTTON "&Corriger", IDOK, 55, 120, 60, 15, WS_DISABLED + PUSHBUTTON "&Supprimer", IDYES, 120, 120, 60, 15 + PUSHBUTTON "Annuler", IDCANCEL, 185, 120, 60, 15 END STRINGTABLE @@ -997,7 +997,7 @@ BEGIN IDS_EDITING_ACTION "Editer l'action : " IDS_NO_ICONS "Le fichier '%s' ne contient pas d'icônes.\n\nVeuillez choisir une icône dans la liste ou sélectionner un fichier différent." IDS_FILE_NOT_FOUND "Le fichier '%s' ne peut être trouvé." - IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_LINK_INVALID "L'élément '%s' auquel ce raccourci fait référence a été modifié ou déplacé et ce raccourci ne fonctionne plus correctement." IDS_COPYTOMENU "Copy to &folder..." IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." IDS_COPYITEMS "Copy Items"

4 years, 4 months

[reactos] 01/01: [TRANSLATION][SHELL32] Update Polish translation ("copy to folder" dialog) (#3064)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=569a3d63f539abfe99a3c… commit 569a3d63f539abfe99a3c0e28ea6a1126d475014 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Mon Aug 17 16:41:31 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 17 16:41:31 2020 +0200 [TRANSLATION][SHELL32] Update Polish translation ("copy to folder" dialog) (#3064) --- dll/win32/shell32/lang/pl-PL.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index b125105cb29..44e4bde14f7 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1,7 +1,7 @@ /* * Updated by Saibamen (July, 2015) * Updated by BlackDragonDv (January, 2018) - * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (May, 2020) + * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (August, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -1004,8 +1004,8 @@ BEGIN IDS_NO_ICONS "Plik '%s' nie zawiera ikon.\n\nWybierz ikonę z listy lub określ inny plik." IDS_FILE_NOT_FOUND "Nie odnaleziono pliku '%s'." IDS_LINK_INVALID "Element '%s', do którego odwołuje się ten skrót, został zmieniony lub przeniesiony i dlatego skrót ten nie będzie działał poprawnie." - IDS_COPYTOMENU "Copy To &Folder..." - IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." - IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" + IDS_COPYTOMENU "Kopiuj &do folderu..." + IDS_COPYTOTITLE "Zaznacz miejsce, w które chcesz skopiować '%s', a następnie kliknij przycisk Kopiuj." + IDS_COPYITEMS "Kopiowanie elementów" + IDS_COPYBUTTON "Kopiuj" END

4 years, 4 months

[reactos] 01/01: [TRANSLATION] Update Portuguese (Portugal) translation for CPL files (#3062)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4180592654a2a5d782d9a… commit 4180592654a2a5d782d9aec71a20f360ed7dbd98 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Mon Aug 17 15:28:09 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 17 17:28:09 2020 +0300 [TRANSLATION] Update Portuguese (Portugal) translation for CPL files (#3062) --- dll/cpl/appwiz/lang/pt-PT.rc | 2 +- dll/cpl/intl/lang/pt-PT.rc | 2 +- dll/cpl/liccpa/lang/pt-PT.rc | 2 +- dll/cpl/powercfg/lang/pt-PT.rc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index 715daa40991..cac74180974 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -87,5 +87,5 @@ BEGIN IDS_NO_MEMORY "A memória não pode ser alocada!" IDS_NO_DIRECTORY "Sem directoria!" IDS_INVALID_PATH "O caminho é invalido!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_INVALID_NAME "O nome do atalho contém caracteres inválidos para nomes de arquivo ou é muito longo." END diff --git a/dll/cpl/intl/lang/pt-PT.rc b/dll/cpl/intl/lang/pt-PT.rc index 67fad91b9e5..c934a071dd0 100644 --- a/dll/cpl/intl/lang/pt-PT.rc +++ b/dll/cpl/intl/lang/pt-PT.rc @@ -210,5 +210,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Erro ao abrir a chave: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Erro ao abrir a chave: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Não foi possível iniciar input.dll" - IDS_ERROR_UNICODE "Unable to install a new language for programs that don't support Unicode!" + IDS_ERROR_UNICODE "Não foi possível instalar um novo idioma para programas que não suportam Unicode!" END diff --git a/dll/cpl/liccpa/lang/pt-PT.rc b/dll/cpl/liccpa/lang/pt-PT.rc index 219600a5156..6f98180c800 100644 --- a/dll/cpl/liccpa/lang/pt-PT.rc +++ b/dll/cpl/liccpa/lang/pt-PT.rc @@ -23,5 +23,5 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Gerenciador de Licenças" IDS_CPLDESCRIPTION_1 "Gerenciador de Licenças" - IDS_REACTOS "ReactOS - FreeSoftware" + IDS_REACTOS "ReactOS - Software Livre" END diff --git a/dll/cpl/powercfg/lang/pt-PT.rc b/dll/cpl/powercfg/lang/pt-PT.rc index 35498b058f6..c35323abba9 100644 --- a/dll/cpl/powercfg/lang/pt-PT.rc +++ b/dll/cpl/powercfg/lang/pt-PT.rc @@ -171,5 +171,5 @@ BEGIN IDS_TIMEOUT16 "Nunca" IDS_DEL_SCHEME "Tem certeza de que deseja excluir o esquema de energia: ""%s""?" IDS_DEL_SCHEME_TITLE "Excluir esquema" - IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" + IDS_DEL_SCHEME_ERROR "Não é possível excluir o esquema de energia" END

4 years, 4 months

[reactos] 01/01: [ZIPFLDR] Fix several dialog layout problems

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1197c905923055dc6cd81… commit 1197c905923055dc6cd81860b1a0584ad21ade56 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Aug 17 16:12:10 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Aug 17 16:12:10 2020 +0300 [ZIPFLDR] Fix several dialog layout problems Addendum to a1108f6. CORE-17209 Co-authored-by: Doug Lyons <douglyons(a)douglyons.com> --- dll/shellext/zipfldr/lang/de-DE.rc | 8 ++++---- dll/shellext/zipfldr/lang/en-US.rc | 4 ++-- dll/shellext/zipfldr/lang/et-EE.rc | 4 ++-- dll/shellext/zipfldr/lang/fr-FR.rc | 2 +- dll/shellext/zipfldr/lang/hi-IN.rc | 2 +- dll/shellext/zipfldr/lang/it-IT.rc | 6 +++--- dll/shellext/zipfldr/lang/ja-JP.rc | 2 +- dll/shellext/zipfldr/lang/pl-PL.rc | 6 +++--- dll/shellext/zipfldr/lang/pt-PT.rc | 38 ++++++++++++++++++++------------------ dll/shellext/zipfldr/lang/ro-RO.rc | 6 +++--- dll/shellext/zipfldr/lang/ru-RU.rc | 2 +- dll/shellext/zipfldr/lang/sv-SE.rc | 2 +- dll/shellext/zipfldr/lang/zh-CN.rc | 2 +- 13 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index b5b6f0be9bc..44587bdc045 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -12,10 +12,10 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ziel auswählen" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Wählen Sie ein Ziel zum Extahieren der Dateien.",IDC_STATIC,86,12,157,8 + LTEXT "Wählen Sie ein Ziel zum Extahieren der Dateien",IDC_STATIC,86,12,157,8 EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL - PUSHBUTTON "Durchsuchen...",IDC_BROWSE,189,42,54,14 - PUSHBUTTON "Kennwort",IDC_PASSWORD,189,66,54,14 + PUSHBUTTON "Durchsuchen...",IDC_BROWSE,186,42,57,14 + PUSHBUTTON "Kennwort",IDC_PASSWORD,186,66,57,14 LTEXT "Klicken Sie auf 'Weiter' um zu extrahieren",IDC_STATUSTEXT,86,114,150,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 @@ -27,7 +27,7 @@ CAPTION "Extrahieren abgeschlossen" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Die Dateien wurden in das folgende Verzeichnis extrahiert:",IDC_STATIC,86,12,157,18 - LTEXT "Zielverzeichnis",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,105,10 LTEXT "Klicken Sie auf 'Fertig' um fortzufahren.",IDC_STATIC,86,84,134,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index 7de141c771f..18713a6e39e 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -13,7 +13,7 @@ CAPTION "Select a Destination" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Select the destination directory",IDC_STATIC,86,12,189,8 - EDITTEXT IDC_DIRECTORY,6,24,157,12,ES_AUTOHSCROLL + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL PUSHBUTTON "Browse...",IDC_BROWSE,189,42,54,14 PUSHBUTTON "Password",IDC_PASSWORD,189,66,54,14 LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 @@ -27,7 +27,7 @@ CAPTION "Extraction Complete" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "The files have been extracted to the following directory:",IDC_STATIC,86,12,157,18 - LTEXT "Target dir",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Show extracted files",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 LTEXT "Press finish to continue.",IDC_STATIC,86,84,89,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index aad04a0f6e2..b828f152c32 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -27,8 +27,8 @@ CAPTION "Ekstraktimine valmis" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Failid on ekstraktitud kausta:",IDC_STATIC,86,12,157,18 - LTEXT "Sihtkoha kataloog",IDC_DESTDIR,86,36,157,8 - CONTROL "Näita ekstraktitud faile",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 + CONTROL "Näita ekstraktitud faile",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,85,10 LTEXT "Vajuta lõpeta jätkamiseks.",IDC_STATIC,86,84,94,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index a96579efa80..6b69c26a7d8 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -27,7 +27,7 @@ CAPTION "Extraction complète" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Les fichiers ont été extraits dans le répertoire :",IDC_STATIC,86,12,157,18 - LTEXT "Répertoire cible",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Montrer les fichiers extraits",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,154,10 LTEXT "Cliquer sur Terminer pour continuer.",IDC_STATIC,86,84,154,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index 0abba87c418..ddf53be90a2 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -27,7 +27,7 @@ CAPTION "Extraction Complete" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "फाइलें निम्न निर्देशिका में निकाली गई हैं:",IDC_STATIC,86,12,157,23 - LTEXT "लक्ष्य दिर",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "निकाले गए फ़ाइल दिखाएं",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 LTEXT "जारी रखने के लिए समाप्त दबाएं।",IDC_STATIC,86,84,169,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 7c684273275..d8ac0036708 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -14,8 +14,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Seleziona la cartella di destinazione",IDC_STATIC,86,12,154,8 EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL - PUSHBUTTON "Sfoglia...",IDC_BROWSE,154,42,54,14 - PUSHBUTTON "Password",IDC_PASSWORD,154,66,54,14 + PUSHBUTTON "Sfoglia...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Password",IDC_PASSWORD,189,66,54,14 LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 @@ -27,7 +27,7 @@ CAPTION "Estrazione Completa" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "I file sono stati estratti nella seguente cartella:",IDC_STATIC,86,12,157,18 - LTEXT "Cartella destinazione",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Mostra i file estratti",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 LTEXT "Premi Fine per continuare.",IDC_STATIC,86,84,84,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 9e6008f6f6f..aaa0f3d9bd0 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -27,7 +27,7 @@ CAPTION "展開完了" FONT 9, "MS UI Gothic", 400, 0, 0x0 BEGIN LTEXT "ファイルは次のディレクトリに展開されました:",IDC_STATIC,86,12,157,18 - LTEXT "ターゲット",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "展開したファイルを表示",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 LTEXT "完了をクリックして下さい。",IDC_STATIC,86,84,84,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index c8278a18cb1..a9f2ae9d2a6 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -13,11 +13,11 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wybierz miejsce docelowe" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Wybierz katalog docelowy:",IDC_STATIC,86,12,154,8 + LTEXT "Wybierz katalog docelowy",IDC_STATIC,86,12,154,8 EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...",IDC_BROWSE,189,42,54,14 PUSHBUTTON "Hasło",IDC_PASSWORD,189,66,54,14 - LTEXT "Kliknij przycisk Dalej, aby wypakować.",IDC_STATUSTEXT,86,114,124,8 + LTEXT "Kliknij przycisk Dalej, aby wypakować",IDC_STATUSTEXT,86,114,124,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END @@ -28,7 +28,7 @@ CAPTION "Wyodrębnianie zakończone" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Pliki zostały pomyślnie wyodrębnione do następującego katalogu:",IDC_STATIC,86,12,157,18 - LTEXT "Ścieżka docelowa",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Pokaż wyodrębnione pliki",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,101,10 LTEXT "Aby kontynuować, kliknij przycisk Zakończ.",IDC_STATIC,86,84,154,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/pt-PT.rc b/dll/shellext/zipfldr/lang/pt-PT.rc index 1b8a15e118c..c85215248ff 100644 --- a/dll/shellext/zipfldr/lang/pt-PT.rc +++ b/dll/shellext/zipfldr/lang/pt-PT.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Seleccione um destino" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Seleccione o directório de destino",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "&Procurar...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Palavra-passe",IDC_PASSWORD,174,66,54,14 - LTEXT "Clique em ""Seguinte"" para extrair",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Seleccione o directório de destino",IDC_STATIC,86,12,174,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "&Procurar...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Palavra-passe",IDC_PASSWORD,189,66,54,14 + LTEXT "Clique em ""Seguinte"" para extrair",IDC_STATUSTEXT,86,114,100,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extracção Completa" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Os arquivos foram extraídos para o seguinte diretório:",IDC_STATIC,6,12,222,18 - LTEXT "Directório de destino",IDC_DESTDIR,6,36,222,8 - CONTROL "Mostrar ficheiros extraidos",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Clique em ""Concluir"" para continuar.",IDC_STATIC,6,84,174,8 + LTEXT "Os arquivos foram extraídos para o seguinte diretório:",IDC_STATIC,86,12,157,18 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 + CONTROL "Mostrar ficheiros extraidos",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,98,10 + LTEXT "Clique em ""Concluir"" para continuar.",IDC_STATIC,86,84,116,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 @@ -44,17 +46,17 @@ BEGIN LTEXT "",IDC_MESSAGE,36,6,228,24 END -IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +IDD_PASSWORD DIALOGEX 0, 0, 247, 62 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Palavra-passe" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,186,6,50,14 - PUSHBUTTON "Saltar Ficheiro",IDSKIP,186,24,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,186,42,50,14 + EDITTEXT IDC_PASSWORD,74,42,106,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,54,14 + PUSHBUTTON "Saltar Ficheiro",IDSKIP,186,24,54,14 + PUSHBUTTON "Cancelar",IDCANCEL,186,42,54,14 LTEXT "Estático",IDC_MESSAGE,24,6,156,30 - LTEXT "Palavra-passe:",IDC_STATIC,24,44,44,8 + LTEXT "Palavra-passe:",IDC_STATIC,24,44,50,8 END STRINGTABLE diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index a363e2eadcf..28730e57fc8 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL PUSHBUTTON "Răsfoiți...",IDC_BROWSE,189,42,54,14 PUSHBUTTON "Parolă",IDC_PASSWORD,189,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,84,100,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END @@ -27,8 +27,8 @@ CAPTION "Extragere Completă" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Fișierele au fost extrase în folderul respectiv:",IDC_STATIC,86,12,157,18 - LTEXT "Ținta folder",IDC_DESTDIR,86,36,157,8 - CONTROL "Afișează fișierele extrase",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 + CONTROL "Afișează fișierele extrase",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,95,10 LTEXT "Apăsați Termină pentru a continua.",IDC_STATIC,86,84,124,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 7dd47924b20..1cdd7e70d4d 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -27,7 +27,7 @@ CAPTION "Извлечение завершено" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Все файлы были извлечены в следующую директорию:",IDC_STATIC,86,12,157,18 - LTEXT "Целевой путь",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Показать извлечённые файлы",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,118,10 LTEXT "Нажмите ""Готово"" чтобы продолжить.",IDC_STATIC,86,84,144,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index ff7706da85a..85fb4ed9006 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -27,7 +27,7 @@ CAPTION "Extraheringen är slutförd" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN LTEXT "Filerna har extraherats till följande katalog:",IDC_STATIC,86,12,157,18 - LTEXT "Målkatalog",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "Visa extraherade filer",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 LTEXT "Tryck på slutför för att fortsätta.",IDC_STATIC,86,84,109,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index 710f3acef62..8f8d947fd21 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -27,7 +27,7 @@ CAPTION "解压完成" FONT 9, "宋体", 400, 0, 0x0 BEGIN LTEXT "文件已经被解压至下列目录：",IDC_STATIC,86,12,157,18 - LTEXT "目标文件夹",IDC_DESTDIR,86,36,157,8 + LTEXT "%s",IDC_DESTDIR,86,36,157,8 CONTROL "显示被解压文件",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 LTEXT "点击完成以继续。",IDC_STATIC,86,84,84,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138

4 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
19
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 2020