Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[gadamopoulos] 68745: [SHELL32] - CControlPanelFolder: Fix showing the description in control panel. Patch with improvements by me. CORE-8827

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 17:10:03 2015 New Revision: 68745 URL: http://svn.reactos.org/svn/reactos?rev=68745&view=rev Log: [SHELL32] - CControlPanelFolder: Fix showing the description in control panel. Patch with improvements by me. CORE-8827 Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Mon Aug 17 17:10:03 2015 @@ -55,8 +55,8 @@ */ static const shvheader ControlPanelSFHeader[] = { - {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},/*FIXME*/ - {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 200},/*FIXME*/ + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15},/*FIXME*/ + {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 80},/*FIXME*/ }; #define CONROLPANELSHELLVIEWCOLUMNS 2 @@ -154,10 +154,10 @@ { for (i = 0; i < applet->count; ++i) { - WideCharToMultiByte(CP_ACP, 0, applet->info[i].szName, -1, displayName, MAX_PATH, 0, 0); - WideCharToMultiByte(CP_ACP, 0, applet->info[i].szInfo, -1, comment, MAX_PATH, 0, 0); - applet->proc(0, CPL_INQUIRE, i, (LPARAM)&info); + + LoadStringA(applet->hModule, info.idName, displayName, MAX_PATH); + LoadStringA(applet->hModule, info.idInfo, comment, MAX_PATH); if (info.idIcon > 0) iconIdx = -info.idIcon; /* negative icon index instead of icon number */ @@ -671,8 +671,22 @@ hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; case 1: /* comment */ - _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); + { + PIDLCPanelStruct* pCPanel = _ILGetCPanelPointer(pidl); + if (pCPanel) + lstrcpyA(psd->str.cStr, pCPanel->szName + pCPanel->offsComment); + if (_ILIsSpecialFolder(pidl)) + { + HKEY hKey; + GUID *pGuid = _ILGetGUIDPointer(pidl); + if (HCR_RegOpenClassIDKey(*pGuid, &hKey)) + { + RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); + RegCloseKey(hKey); + } + } break; + } } hr = S_OK; }

9 years, 4 months

[gadamopoulos] 68744: [SHELL32] - Use SHELL32_GetDisplayNameOfGUIDItem in CDesktopFolder

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 15:34:02 2015 New Revision: 68744 URL: http://svn.reactos.org/svn/reactos?rev=68744&view=rev Log: [SHELL32] - Use SHELL32_GetDisplayNameOfGUIDItem in CDesktopFolder Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 17 15:34:02 2015 @@ -650,6 +650,11 @@ if (!strRet) return E_INVALIDARG; + if (_ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl)) + { + return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); + } + pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); if (!pszPath) return E_OUTOFMEMORY; @@ -664,84 +669,28 @@ } else if (_ILIsPidlSimple (pidl)) { - GUID const *clsid; - - if ((clsid = _ILGetGUIDPointer (pidl))) - { - if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) - { - int bWantsForParsing; - - /* - * We can only get a filesystem path from a shellfolder if the - * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. - * - * Exception: The MyComputer folder doesn't have this key, - * but any other filesystem backed folder it needs it. - */ - if (IsEqualIID (*clsid, CLSID_MyComputer)) - { - bWantsForParsing = TRUE; - } - else - { - /* get the "WantsFORPARSING" flag from the registry */ - static const WCHAR clsidW[] = - { 'C', 'L', 'S', 'I', 'D', '\\', 0 }; - static const WCHAR shellfolderW[] = - { '\\', 's', 'h', 'e', 'l', 'l', 'f', 'o', 'l', 'd', 'e', 'r', 0 }; - static const WCHAR wantsForParsingW[] = - { 'W', 'a', 'n', 't', 's', 'F', 'o', 'r', 'P', 'a', 'r', 's', 'i', 'n', - 'g', 0 - }; - WCHAR szRegPath[100]; - LONG r; - - wcscpy (szRegPath, clsidW); - SHELL32_GUIDToStringW (*clsid, &szRegPath[6]); - wcscat (szRegPath, shellfolderW); - r = SHGetValueW(HKEY_CLASSES_ROOT, szRegPath, - wantsForParsingW, NULL, NULL, NULL); - if (r == ERROR_SUCCESS) - bWantsForParsing = TRUE; - else - bWantsForParsing = FALSE; - } - - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - bWantsForParsing) - { - /* - * we need the filesystem path to the destination folder. - * Only the folder itself can know it - */ - hr = SHELL32_GetDisplayNameOfChild (this, pidl, dwFlags, - pszPath, - MAX_PATH); - } - else - { - /* parsing name like ::{...} */ - pszPath[0] = ':'; - pszPath[1] = ':'; - SHELL32_GUIDToStringW (*clsid, &pszPath[2]); - } - } - else - { - /* user friendly name */ - HCR_GetClassNameW (*clsid, pszPath, MAX_PATH); - } - } - else - { - int cLen = 0; - - /* file system folder or file rooted at the desktop */ + int cLen = 0; + + /* file system folder or file rooted at the desktop */ + if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && + (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) + { + lstrcpynW(pszPath, sPathTarget, MAX_PATH - 1); + PathAddBackslashW(pszPath); + cLen = wcslen(pszPath); + } + + _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); + if (!_ILIsFolder(pidl)) + SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); + + if (GetFileAttributes(pszPath) == INVALID_FILE_ATTRIBUTES) + { + /* file system folder or file rooted at the AllUsers desktop */ if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) { - lstrcpynW(pszPath, sPathTarget, MAX_PATH - 1); + SHGetSpecialFolderPathW(0, pszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); PathAddBackslashW(pszPath); cLen = wcslen(pszPath); } @@ -749,22 +698,6 @@ _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); if (!_ILIsFolder(pidl)) SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); - - if (GetFileAttributes(pszPath) == INVALID_FILE_ATTRIBUTES) - { - /* file system folder or file rooted at the AllUsers desktop */ - if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && - (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) - { - SHGetSpecialFolderPathW(0, pszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); - PathAddBackslashW(pszPath); - cLen = wcslen(pszPath); - } - - _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); - if (!_ILIsFolder(pidl)) - SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); - } } } else

9 years, 4 months

[gadamopoulos] 68743: [SHELL32] - Remove CDesktopFolderDropTarget and make CDesktopFolder just get the drop target from m_DesktopFSFolder

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 15:20:04 2015 New Revision: 68743 URL: http://svn.reactos.org/svn/reactos?rev=68743&view=rev Log: [SHELL32] - Remove CDesktopFolderDropTarget and make CDesktopFolder just get the drop target from m_DesktopFSFolder Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 17 15:20:04 2015 @@ -43,37 +43,6 @@ /* Undocumented functions from shdocvw */ extern "C" HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); - -/*********************************************************************** -* Desktopfolder implementation -*/ - -class CDesktopFolderDropTarget : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDropTarget -{ - private: - CComPtr<IShellFolder> m_psf; - BOOL m_fAcceptFmt; /* flag for pending Drop */ - UINT m_cfShellIDList; /* clipboardformat for IDropTarget */ - - void SF_RegisterClipFmt(); - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); - public: - CDesktopFolderDropTarget(); - - HRESULT WINAPI Initialize(IShellFolder *psf); - - // IDropTarget - virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragLeave(); - virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - - BEGIN_COM_MAP(CDesktopFolderDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - END_COM_MAP() -}; class CDesktopFolderEnum : public CEnumIDListBase @@ -509,7 +478,7 @@ if (IsEqualIID (riid, IID_IDropTarget)) { - hr = ShellObjectCreatorInit<CDesktopFolderDropTarget>(this, IID_IDropTarget, ppvOut); + hr = m_DesktopFSFolder->CreateViewObject(hwndOwner, riid, ppvOut); } else if (IsEqualIID (riid, IID_IContextMenu)) { @@ -641,11 +610,9 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */ - if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) - { - IDropTarget * pDt = NULL; - hr = ShellObjectCreatorInit<CDesktopFolderDropTarget>(this, IID_IDropTarget, &pDt); - pObj = pDt; + if (cidl > 1) + { + hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj); } } else if ((IsEqualIID(riid, IID_IShellLinkW) || @@ -1081,184 +1048,6 @@ return psfHelper->CopyItems(pSFFrom, cidl, apidl, bCopy); } -/**************************************************************************** - * IDropTarget implementation - * - * This should allow two somewhat separate things, copying files to the users directory, - * as well as allowing icons to be moved anywhere and updating the registry to save. - * - * The first thing I think is best done using fs.cpp to prevent WET code. So we'll simulate - * a drop to the user's home directory. The second will look at the pointer location and - * set sensible places for the icons to live. - * - */ -void CDesktopFolderDropTarget::SF_RegisterClipFmt() -{ - TRACE ("(%p)\n", this); - - if (!m_cfShellIDList) - m_cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); -} - -CDesktopFolderDropTarget::CDesktopFolderDropTarget() : - m_psf(NULL), - m_fAcceptFmt(FALSE), - m_cfShellIDList(0) -{ -} - -HRESULT WINAPI CDesktopFolderDropTarget::Initialize(IShellFolder *psf) -{ - m_psf = psf; - SF_RegisterClipFmt(); - return S_OK; -} - -BOOL CDesktopFolderDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) -{ - /* TODO Windows does different drop effects if dragging across drives. - i.e., it will copy instead of move if the directories are on different disks. */ - - DWORD dwEffect = DROPEFFECT_MOVE; - - *pdwEffect = DROPEFFECT_NONE; - - if (m_fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - if (*pdwEffect == DROPEFFECT_NONE) - *pdwEffect = dwEffect; - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - -HRESULT WINAPI CDesktopFolderDropTarget::DragEnter(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); - FORMATETC fmt; - FORMATETC fmt2; - m_fAcceptFmt = FALSE; - - InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); - InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); - - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - m_fAcceptFmt = TRUE; - else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - m_fAcceptFmt = TRUE; - - QueryDrop(dwKeyState, pdwEffect); - return S_OK; -} - -HRESULT WINAPI CDesktopFolderDropTarget::DragOver(DWORD dwKeyState, POINTL pt, - DWORD *pdwEffect) -{ - TRACE("(%p)\n", this); - - if (!pdwEffect) - return E_INVALIDARG; - - QueryDrop(dwKeyState, pdwEffect); - - return S_OK; -} - -HRESULT WINAPI CDesktopFolderDropTarget::DragLeave() -{ - TRACE("(%p)\n", this); - m_fAcceptFmt = FALSE; - return S_OK; -} - -HRESULT WINAPI CDesktopFolderDropTarget::Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p) object dropped desktop\n", this); - - STGMEDIUM medium; - bool passthroughtofs = FALSE; - FORMATETC formatetc; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - - HRESULT hr = pDataObject->GetData(&formatetc, &medium); - if (SUCCEEDED(hr)) - { - /* lock the handle */ - LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the clipboard data into pidl (pointer to id list) */ - LPITEMIDLIST pidl; - LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - if (!apidl) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - passthroughtofs = !_ILIsDesktop(pidl) || (dwKeyState & MK_CONTROL); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - } - else - { - InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL); - if (SUCCEEDED(pDataObject->QueryGetData(&formatetc))) - { - passthroughtofs = TRUE; - } - } - /* We only want to really move files around if they don't already - come from the desktop, or we're linking or copying */ - if (passthroughtofs) - { - LPITEMIDLIST pidl = NULL; - - WCHAR szPath[MAX_PATH]; - STRRET strRet; - //LPWSTR pathPtr; - - /* build a complete path to create a simple pidl */ - hr = m_psf->GetDisplayNameOf(NULL, SHGDN_NORMAL | SHGDN_FORPARSING, &strRet); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strRet, NULL, szPath, MAX_PATH); - ASSERT(SUCCEEDED(hr)); - /*pathPtr = */PathAddBackslashW(szPath); - //hr = _ILCreateFromPathW(szPath, &pidl); - hr = m_psf->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); - } - - if (SUCCEEDED(hr)) - { - CComPtr<IDropTarget> pDT; - hr = m_psf->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); - CoTaskMemFree(pidl); - if (SUCCEEDED(hr)) - SHSimulateDrop(pDT, pDataObject, dwKeyState, NULL, pdwEffect); - else - ERR("Error Binding"); - } - else - ERR("Error creating from %s\n", debugstr_w(szPath)); - } - - /* Todo, rewrite the registry such that the icons are well placed. - Blocked by no bags implementation. */ - return hr; -} - HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { HRESULT hr;

9 years, 4 months

[bfreisen] 68742: [MSPAINT] rename source directory

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Mon Aug 17 15:01:53 2015 New Revision: 68742 URL: http://svn.reactos.org/svn/reactos?rev=68742&view=rev Log: [MSPAINT] rename source directory Added: trunk/reactos/base/applications/mspaint/ - copied from r68741, trunk/reactos/base/applications/mspaint_new/ Removed: trunk/reactos/base/applications/mspaint_new/ Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Mon Aug 17 15:01:53 2015 @@ -19,7 +19,7 @@ add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(mscutils) -add_subdirectory(mspaint_new) +add_subdirectory(mspaint) add_subdirectory(mstsc) add_subdirectory(network) add_subdirectory(notepad)

9 years, 4 months

[bfreisen] 68741: [MSPAINT] May thou rest in peace! (...or rather live on in MSPAINT_NEW's commit history) [MSPAINT_NEW] I hereby pronounce thee MSPAINT!

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Mon Aug 17 14:47:51 2015 New Revision: 68741 URL: http://svn.reactos.org/svn/reactos?rev=68741&view=rev Log: [MSPAINT] May thou rest in peace! (...or rather live on in MSPAINT_NEW's commit history) [MSPAINT_NEW] I hereby pronounce thee MSPAINT! Removed: trunk/reactos/base/applications/mspaint/ Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/mspaint_new/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Mon Aug 17 14:47:51 2015 @@ -19,7 +19,6 @@ add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(mscutils) -add_subdirectory(mspaint) add_subdirectory(mspaint_new) add_subdirectory(mstsc) add_subdirectory(network) Modified: trunk/reactos/base/applications/mspaint_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/CMakeLists.txt [iso-8859-1] Mon Aug 17 14:47:51 2015 @@ -1,4 +1,4 @@ -project(MSPAINT_NEW) +project(MSPAINT) set_cpp(WITH_RUNTIME) @@ -28,11 +28,11 @@ winproc.cpp precomp.h) -file(GLOB mspaint_new_rc_deps icons/*.*) -add_rc_deps(rsrc.rc ${mspaint_new_rc_deps}) -add_executable(mspaint_new ${SOURCE} rsrc.rc) -set_module_type(mspaint_new win32gui UNICODE) -target_link_libraries(mspaint_new atlnew) -add_importlibs(mspaint_new hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) -add_pch(mspaint_new precomp.h SOURCE) -add_cd_file(TARGET mspaint_new DESTINATION reactos/system32 FOR all) +file(GLOB mspaint_rc_deps icons/*.*) +add_rc_deps(rsrc.rc ${mspaint_rc_deps}) +add_executable(mspaint ${SOURCE} rsrc.rc) +set_module_type(mspaint win32gui UNICODE) +target_link_libraries(mspaint atlnew) +add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) +add_pch(mspaint precomp.h SOURCE) +add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all)

9 years, 4 months

[dreimer] 68740: [TRANSLATION] Fix Encoding to UTF8 w/o BOM by Henry Tang Ih CORE-9003 #resolve #comment Thx for notifying, committed.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 17 14:30:57 2015 New Revision: 68740 URL: http://svn.reactos.org/svn/reactos?rev=68740&view=rev Log: [TRANSLATION] Fix Encoding to UTF8 w/o BOM by Henry Tang Ih CORE-9003 #resolve #comment Thx for notifying, committed. Added: trunk/reactos/dll/win32/mycomput/lang/zh-CN.rc (with props) Modified: trunk/reactos/dll/shellext/deskadp/lang/zh-CN.rc trunk/reactos/dll/shellext/deskmon/lang/zh-CN.rc trunk/reactos/dll/shellext/ntobjshex/lang/zh-CN.rc trunk/reactos/dll/shellext/slayer/lang/zh-CN.rc trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc trunk/reactos/dll/win32/modemui/lang/zh-CN.rc trunk/reactos/dll/win32/msgina/lang/zh-CN.rc trunk/reactos/dll/win32/mycomput/mycomput.rc trunk/reactos/dll/win32/netid/lang/zh-CN.rc trunk/reactos/dll/win32/serialui/lang/zh-CN.rc trunk/reactos/dll/win32/shimgvw/lang/zh-CN.rc trunk/reactos/media/themes/lautus.msstyles/lang/zh-CN.rc Modified: trunk/reactos/dll/shellext/deskadp/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,47 +4,47 @@ IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÊÊÅäÆ÷" +CAPTION "ééå¨" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "ÊÊÅäÆ÷ÀàÐÍ", -1, 7, 3, 237, 50 + GROUPBOX "ééå¨ç±»å", -1, 7, 3, 237, 50 ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX - PUSHBUTTON "ÊôÐÔ(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 - GROUPBOX "ÊÊÅäÆ÷ÐÅÏ¢", -1, 7, 56, 237, 75 - LTEXT "Ð¾Æ¬ÀàÐÍ:", -1, 13, 68, 58, 8 + PUSHBUTTON "å±æ§(&P)", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "ééå¨ä¿¡æ¯", -1, 7, 56, 237, 75 + LTEXT "è¯çç±»å:", -1, 13, 68, 58, 8 LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "DAC ÀàÐÍ:", -1, 13, 80, 58, 8 + LTEXT "DAC ç±»å:", -1, 13, 80, 58, 8 LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "ÄÚ´æ´óÐ¡:", -1, 13, 92, 58, 8 + LTEXT "ååå¤§å°:", -1, 13, 92, 58, 8 LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "ÊÊÅäÆ÷×Ö·û´®:", -1, 13, 104, 58, 8 + LTEXT "ééå¨åç¬¦ä¸²:", -1, 13, 104, 58, 8 LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS ÐÅÏ¢:", -1, 13, 116, 58, 8 + LTEXT "BIOS ä¿¡æ¯:", -1, 13, 116, 58, 8 LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX - PUSHBUTTON "ÁÐ³öËùÓÐÄ£Ê½...(&L)", IDC_LISTALLMODES, 7, 139, 75, 14 + PUSHBUTTON "ååºæææ¨¡å¼...(&L)", IDC_LISTALLMODES, 7, 139, 75, 14 END IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "ÁÐ³öËùÓÐÄ£Ê½" +CAPTION "ååºæææ¨¡å¼" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "È·¶¨", IDOK, 112, 115, 50, 15 - PUSHBUTTON "È¡Ïû", IDCANCEL, 167, 115, 50, 15 - GROUPBOX "ÓÐÐ§Ä£Ê½ÁÐ±í", -1, 6, 7, 212, 98 + DEFPUSHBUTTON "ç¡®å®", IDOK, 112, 115, 50, 15 + PUSHBUTTON "åæ¶", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "æææ¨¡å¼åè¡¨", -1, 6, 7, 212, 98 LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL END STRINGTABLE BEGIN IDS_MODEFMT "%d by %d, %s, %s" - IDS_DEFREFRESHRATE "Default Refresh" + IDS_DEFREFRESHRATE "é»è®¤å·æ°" IDES_REFRESHRATEFMT "%d Hertz" - IDS_4BPP "16 É«" - IDS_8BPP "256 É«" - IDS_15BPP "ÔöÇ¿É« (15 Î»)" - IDS_16BPP "ÔöÇ¿É« (16 Î»)" - IDS_24BPP "Õæ²ÊÉ« (24 Î»)" - IDS_32BPP "Õæ²ÊÉ« (32 Î»)" + IDS_4BPP "16 è²" + IDS_8BPP "256 è²" + IDS_15BPP "å¢å¼ºè² (15 ä½)" + IDS_16BPP "å¢å¼ºè² (16 ä½)" + IDS_24BPP "çå½©è² (24 ä½)" + IDS_32BPP "çå½©è² (32 ä½)" END Modified: trunk/reactos/dll/shellext/deskmon/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,22 +4,22 @@ IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ó©Ä»»ú" +CAPTION "è¤å¹æº" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Ó©Ä»»úÀàÐÍ", -1, 7, 3, 237, 52 + GROUPBOX "è¤å¹æºç±»å", -1, 7, 3, 237, 52 ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL - PUSHBUTTON "ÊôÐÔ(&P)", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED - GROUPBOX "Ó©Ä»»úÉèÖÃ", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 - LTEXT "ÆÁÄ»Ë¢ÐÂÂÊ:(&S)", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + PUSHBUTTON "å±æ§(&P)", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "è¤å¹æºè®¾ç½®", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "å±å¹å·æ°ç:(&S)", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "Òþ²Ø¸ÃÓ©Ä»»úÎÞ·¨ÏÔÊ¾µÄÄ£Ê½(&H)", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "éèè¯¥è¤å¹æºæ æ³æ¾ç¤ºçæ¨¡å¼(&H)", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE BEGIN - IDS_USEDEFFRQUENCY "Ê¹ÓÃÓ²¼þÄ¬ÈÏÉèÖÃ" - IDS_FREQFMT "%u ºÕ×È(Hertz)" + IDS_USEDEFFRQUENCY "ä½¿ç¨ç¡¬ä»¶é»è®¤è®¾ç½®" + IDS_FREQFMT "%u èµ«å¹(Hertz)" END Modified: trunk/reactos/dll/shellext/ntobjshex/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,6 +4,6 @@ STRINGTABLE BEGIN - IDS_NTOBJFLD_NAME "NT ¶ÔÏóÃû³Æ¿Õ¼ä" - IDS_REGISTRY_NAME "ÏµÍ³×¢²á±í" + IDS_NTOBJFLD_NAME "NT å¯¹è±¡åç§°ç©ºé´" + IDS_REGISTRY_NAME "ç³»ç»æ³¨åè¡¨" END Modified: trunk/reactos/dll/shellext/slayer/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/z… ============================================================================== --- trunk/reactos/dll/shellext/slayer/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,36 +4,36 @@ IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "¼æÈÝÐÔ" +CAPTION "å¼å®¹æ§" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Èç¹ûÄúÓÐÎÊÌâÔÚ ReactOS ÖÐÔËÐÐ´Ë³ÌÐò£¬Ñ¡Ôñ ReactOS Ó¦±¨¸æ¸øÓ¦ÓÃ³ÌÐòµÄ²Ù×÷ÏµÍ³¡£", -1, 7, 7, 210, 31 - GROUPBOX "¼æÈÝÄ£Ê½", IDC_COMPATGROUP, 7, 41, 210, 49 - CHECKBOX "ÓÃ¼æÈÝÄ£Ê½ÔËÐÐÕâ¸ö³ÌÐò:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "å¦ææ¨æé®é¢å¨ ReactOS ä¸è¿è¡æ¤ç¨åºï¼éæ© ReactOS åºæ¥åç»åºç¨ç¨åºçæä½ç³»ç»ã", -1, 7, 7, 210, 31 + GROUPBOX "å¼å®¹æ¨¡å¼", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "ç¨å¼å®¹æ¨¡å¼è¿è¡è¿ä¸ªç¨åº:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - GROUPBOX "ÏÔÊ¾ÉèÖÃ", -1, 7, 99, 210, 61, BS_GROUPBOX | WS_DISABLED - CHECKBOX "ÒÔ 256 É«ÔËÐÐ", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - CHECKBOX "ÔÚ 640 x 480 ÆÁÄ»·Ö±æÂÊÔËÐÐ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - CHECKBOX "½ûÓÃÊÓ¾õÖ÷Ìâ", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED - PUSHBUTTON "±à¼¼æÈÝÄ£Ê½...(&D)", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + GROUPBOX "æ¾ç¤ºè®¾ç½®", -1, 7, 99, 210, 61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "ä»¥ 256 è²è¿è¡", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "å¨ 640 x 480 å±å¹åè¾¨çè¿è¡", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "ç¦ç¨è§è§ä¸»é¢", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "ç¼è¾å¼å®¹æ¨¡å¼...(&D)", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY */ END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "±à¼¼æÈÝÄ£Ê½" +CAPTION "ç¼è¾å¼å®¹æ¨¡å¼" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LISTBOX IDC_COMPATIBILITYMODE, 9, 6, 148, 108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "Ìí¼Ó...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "±à¼...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "É¾³ý(&D)", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "È·¶¨(&O)", IDOK, 95, 116, 60, 14 - PUSHBUTTON "È¡Ïû(&C)", IDCANCEL, 162, 116, 60, 14 + PUSHBUTTON "æ·»å ...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED + PUSHBUTTON "ç¼è¾...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "å é¤(&D)", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED + PUSHBUTTON "ç¡®å®(&O)", IDOK, 95, 116, 60, 14 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 162, 116, 60, 14 END STRINGTABLE BEGIN IDS_SLAYER "Slayer" - IDS_DESCRIPTION "Ó¦ÓÃ³ÌÐò¼æÈÝÐÔ²ãÍâ¿ÇÀ©Õ¹" + IDS_DESCRIPTION "åºç¨ç¨åºå¼å®¹æ§å±å¤å£³æ©å±" END Modified: trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -6,12 +6,12 @@ IDD_POWER_METER DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP -CAPTION "µçÔ´±í" +CAPTION "çµæºè¡¨" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "µçÔ´×´Ì¬", 1001, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 - CONTROL "×ÜÊÇÔÚÈÎÎñÀ¸ÉÏÏÔÊ¾Í¼±ê¡£(&A)", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 - CONTROL "ÏÔÊ¾Ã¿¸öµç³ØµÄÏêÏ¸ÐÅÏ¢¡£(&B)", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "çµæºç¶æ", 1001, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "æ»æ¯å¨ä»»å¡æ ä¸æ¾ç¤ºå¾æ ã(&A)", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "æ¾ç¤ºæ¯ä¸ªçµæ± çè¯¦ç»ä¿¡æ¯ã(&B)", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END #endif @@ -19,34 +19,34 @@ STRINGTABLE BEGIN //Power related strings - IDS_PWR_PROPERTIES "µ÷ÕûµçÔ´ÊôÐÔ(&A)" - IDS_PWR_METER "¿ª·ÅÊ½µçÔ´±í(&O)" - IDS_PWR_PERCENT_REMAINING "Ê£Óà %1!u!%%" - IDS_PWR_CHARGING " (³äµçÖÐ)" - IDS_PWR_UNKNOWN_REMAINING "Î´ÖªÊ£Óà" - IDS_PWR_AC "½»Á÷µçÔ´" - IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! Ð¡Ê± Ê£Óà (%3!u!%%) " - IDS_PWR_MINUTES_REMAINING "%1!u! ·ÖÖÓ Ê£Óà (%2!u!%%) " + IDS_PWR_PROPERTIES "è°æ´çµæºå±æ§(&A)" + IDS_PWR_METER "å¼æ¾å¼çµæºè¡¨(&O)" + IDS_PWR_PERCENT_REMAINING "å©ä½ %1!u!%%" + IDS_PWR_CHARGING " (åçµä¸)" + IDS_PWR_UNKNOWN_REMAINING "æªç¥å©ä½" + IDS_PWR_AC "äº¤æµçµæº" + IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! å°æ¶ å©ä½ (%3!u!%%) " + IDS_PWR_MINUTES_REMAINING "%1!u! åé å©ä½ (%2!u!%%) " //Hotplug related strings - IDS_HOTPLUG_REMOVE_1 "°²È«µØÉ¾³ýÓ²¼þ" - IDS_HOTPLUG_REMOVE_2 "°²È«µØÉ¾³ýÓ²¼þ(&S)" - IDS_HOTPLUG_REMOVE_3 "°²È«µØÉ¾³ý %s" + IDS_HOTPLUG_REMOVE_1 "å®å¨å°å é¤ç¡¬ä»¶" + IDS_HOTPLUG_REMOVE_2 "å®å¨å°å é¤ç¡¬ä»¶(&S)" + IDS_HOTPLUG_REMOVE_3 "å®å¨å°å é¤ %s" IDS_HOTPLUG_COMMA ", " - IDS_HOTPLUG_DRIVE " - ´ÅÅÌ(%s)" - IDS_HOTPLUG_DRIVES " - ´ÅÅÌ(%s)" + IDS_HOTPLUG_DRIVE " - ç£ç(%s)" + IDS_HOTPLUG_DRIVES " - ç£ç(%s)" IDS_HOTPLUG_A "A:" - IDS_HOTPLUG_REQUIERES "´ËÓ²¼þËùÐè""°²È«É¾³ý""" - IDS_HOTPLUG_CLICK "É¾³ýÕâ¸öÓ²¼þÖ®Ç°, µ¥»÷´ËÍ¼±ê²¢Ñ¡ÔñÄúÏëÒªÉ¾³ýµÄÓ²¼þ¡£" + IDS_HOTPLUG_REQUIERES "æ¤ç¡¬ä»¶æé""å®å¨å é¤""" + IDS_HOTPLUG_CLICK "å é¤è¿ä¸ªç¡¬ä»¶ä¹å, åå»æ¤å¾æ å¹¶éæ©æ¨æ³è¦å é¤çç¡¬ä»¶ã" //Volume related strings - IDS_VOL_VOLUME "ÒôÁ¿" - IDS_VOL_ADJUST "µ÷ÕûÒôÆµÊôÐÔ(&A)" - IDS_VOL_OPEN "´ò¿ªÒôÁ¿¿ØÖÆ(&O)" - IDS_VOL_MUTED "(¾²Òô)" + IDS_VOL_VOLUME "é³é" + IDS_VOL_ADJUST "è°æ´é³é¢å±æ§(&A)" + IDS_VOL_OPEN "æå¼é³éæ§å¶(&O)" + IDS_VOL_MUTED "(éé³)" //Keyboard-Mouse related strings - IDS_KEYS_STICKY "Õ³ÖÍ¼ü" - IDS_KEYS_MOUSE "Êó±ê¼ü" - IDS_KEYS_FILTER "É¸Ñ¡¼ü" + IDS_KEYS_STICKY "ç²æ»é®" + IDS_KEYS_MOUSE "é¼ æ é®" + IDS_KEYS_FILTER "çéé®" END Modified: trunk/reactos/dll/win32/modemui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -6,162 +6,162 @@ BEGIN POPUP "" BEGIN - MENUITEM "¸´ÖÆ...(&D)", 0 - MENUITEM "É¾³ý(&E)", 1 - MENUITEM "²é¿´ÈÕÖ¾(&V)", 2 + MENUITEM "å¤å¶...(&D)", 0 + MENUITEM "å é¤(&E)", 1 + MENUITEM "æ¥çæ¥å¿(&V)", 2 MENUITEM SEPARATOR - MENUITEM "ÊôÐÔ(&R)", 3 - MENUITEM "¸´ÖÆÊôÐÔ(&O)", 4 - MENUITEM "Ó¦ÓÃÊôÐÔ(&P)", 5 + MENUITEM "å±æ§(&R)", 3 + MENUITEM "å¤å¶å±æ§(&O)", 4 + MENUITEM "åºç¨å±æ§(&P)", 5 END END IDD_ADVANCED DIALOGEX 17, 12, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "¸ß¼¶" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "¶îÍâµÄÉèÖÃ", 1018, 6, 6, 225, 70 - LTEXT "¶îÍâµÄ³õÊ¼»¯ÃüÁî:(&X)", 1011, 16, 20, 143, 8 +CAPTION "é«çº§" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "é¢å¤çè®¾ç½®", 1018, 6, 6, 225, 70 + LTEXT "é¢å¤çåå§åå½ä»¤:(&X)", 1011, 16, 20, 143, 8 EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL - LTEXT "µÈ´ýÐÅÓÃ¿¨ÌáÊ¾Òô:(&W)", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + LTEXT "çå¾ä¿¡ç¨å¡æç¤ºé³:(&W)", 1007, 16, 55, 109, 8, NOT WS_VISIBLE EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 - LTEXT "Ãë", 1010, 173, 54, 40, 8, NOT WS_VISIBLE - GROUPBOX "¹ú¼Ò (µØÇø) Ñ¡Ôñ(&C)", 1012, 6, 80, 225, 75 + LTEXT "ç§", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "å½å®¶ (å°åº) éæ©(&C)", 1012, 6, 80, 225, 75 COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "¸ß¼¶µÄ¶Ë¿ÚÉèÖÃ...(&A)", 1100, 107, 170, 125, 14 - DEFPUSHBUTTON "¸ü¸ÄÄ¬ÈÏÊ×Ñ¡Ïî...(&D)", 3, 107, 188, 125, 14 + PUSHBUTTON "é«çº§çç«¯å£è®¾ç½®...(&A)", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "æ´æ¹é»è®¤é¦éé¡¹...(&D)", 3, 107, 188, 125, 14 END IDD_GENERAL DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "³£¹æ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "¶Ë¿Ú:", 1018, 9, 8, 32, 10 - LTEXT "×÷Îª¶Ë¿Ú", 1095, 48, 8, 181, 10 - GROUPBOX "ÑïÉùÆ÷ÒôÁ¿(&S)", 1029, 10, 21, 218, 48 +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ç«¯å£:", 1018, 9, 8, 32, 10 + LTEXT "ä½ä¸ºç«¯å£", 1095, 48, 8, 181, 10 + GROUPBOX "æ¬å£°å¨é³é(&S)", 1029, 10, 21, 218, 48 CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 - RTEXT "¹Ø±Õ", 1045, 56, 40, 22, 8 - LTEXT "¸ß", 1001, 155, 40, 25, 11 - GROUPBOX "×î´ó¶Ë¿ÚËÙ¶È(&M)", 1031, 10, 78, 218, 46 + RTEXT "å³é", 1045, 56, 40, 22, 8 + LTEXT "é«", 1001, 155, 40, 25, 11 + GROUPBOX "æå¤§ç«¯å£éåº¦(&M)", 1031, 10, 78, 218, 46 COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "²¦ºÅ¿ØÖÆ", 1060, 10, 133, 218, 51 - AUTOCHECKBOX "µÈ´ý²¦ºÅÒô²¦ºÅÇ°(&W)", 1003, 27, 157, 174, 10 + GROUPBOX "æ¨å·æ§å¶", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "çå¾æ¨å·é³æ¨å·å(&W)", 1003, 27, 157, 174, 10 END IDD_DISTINCTIVE_RING DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÓÐÌØÉ«µÄÏìÁå" +CAPTION "æç¹è²çåé" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", 1068, 10, 7, 218, 145 - AUTOCHECKBOX "ÕâÌõµç»°ÏßÓÐ¶ÀÌØÕðÁå·þÎñ(&T)", 1069, 20, 7, 184, 10 - CTEXT "ÏìÁåÄ£Ê½", -1, 84, 21, 70, 8 - CTEXT "ºô½ÐÀàÐÍ", -1, 159, 21, 63, 8 - LTEXT "Ö÷µØÖ·:(&P)", 1070, 20, 41, 62, 8 + AUTOCHECKBOX "è¿æ¡çµè¯çº¿æç¬ç¹ééæå¡(&T)", 1069, 20, 7, 184, 10 + CTEXT "åéæ¨¡å¼", -1, 84, 21, 70, 8 + CTEXT "å¼å«ç±»å", -1, 159, 21, 63, 8 + LTEXT "ä¸»å°å:(&P)", 1070, 20, 41, 62, 8 COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "µØÖ· &1:", 1071, 20, 59, 62, 8 + LTEXT "å°å &1:", 1071, 20, 59, 62, 8 COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "µØÖ· &2:", 1072, 20, 77, 62, 8 + LTEXT "å°å &2:", 1072, 20, 77, 62, 8 COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "µØÖ· &3:", 1076, 20, 95, 62, 8 + LTEXT "å°å &3:", 1076, 20, 95, 62, 8 COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "À´µçÕßÓÅÏÈ:(&C)", 1078, 20, 112, 62, 8 + LTEXT "æ¥çµèä¼å:(&C)", 1078, 20, 112, 62, 8 COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "»Ø²¦:(&B)", 1080, 20, 131, 62, 8 + LTEXT "åæ¨:(&B)", 1080, 20, 131, 62, 8 COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_DISTINCTIVE_RING_2 DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÓÐÌØÉ«µÄÏìÁå" +CAPTION "æç¹è²çåé" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", 1068, 10, 7, 218, 87 - AUTOCHECKBOX "ÕâÌõµç»°ÏßÓÐ¶ÀÌØÕðÁå·þÎñ(&T)", 1069, 19, 7, 177, 10 - CTEXT "ÏìÁåÄ£Ê½", -1, 20, 21, 74, 8 + AUTOCHECKBOX "è¿æ¡çµè¯çº¿æç¬ç¹ééæå¡(&T)", 1069, 19, 7, 177, 10 + CTEXT "åéæ¨¡å¼", -1, 20, 21, 74, 8 CTEXT "Type of Call", -1, 96, 21, 65, 8 - LTEXT "µ¥ÏìÁå:(&S)", 1088, 20, 37, 53, 8 + LTEXT "ååé:(&S)", 1088, 20, 37, 53, 8 COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Ë«ÏìÁå:(&D)", 1089, 20, 57, 53, 8 + LTEXT "ååé:(&D)", 1089, 20, 57, 53, 8 COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "ÈýÏìÁå:(&R)", 1090, 20, 76, 53, 8 + LTEXT "ä¸åé:(&R)", 1090, 20, 76, 53, 8 COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_DIAGNOSTICS DIALOGEX 0, 0, 238, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Õï¶Ï³ÌÐò" +CAPTION "è¯æç¨åº" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 - PUSHBUTTON "²éÑ¯µ÷ÖÆ½âµ÷Æ÷(&Q)", 1096, 138, 149, 75, 14 - AUTOCHECKBOX "¼ÇÂ¼ÈÕÖ¾(&L)", 1020, 18, 187, 98, 10 - PUSHBUTTON "²é¿´ÈÕÖ¾(&V)", 1094, 138, 184, 75, 14, WS_DISABLED - GROUPBOX "µ÷ÖÆ½âµ÷Æ÷ÐÅÏ¢", 1047, 10, 6, 217, 164 - GROUPBOX "ÈÕÖ¾¼ÇÂ¼", -1, 10, 173, 217, 32 + PUSHBUTTON "æ¥è¯¢è°å¶è§£è°å¨(&Q)", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "è®°å½æ¥å¿(&L)", 1020, 18, 187, 98, 10 + PUSHBUTTON "æ¥çæ¥å¿(&V)", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "è°å¶è§£è°å¨ä¿¡æ¯", 1047, 10, 6, 217, 164 + GROUPBOX "æ¥å¿è®°å½", -1, 10, 173, 217, 32 END IDD_PLEASE_WAIT DIALOGEX 0, 0, 195, 72 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ÇëÉÔºò..." +CAPTION "è¯·ç¨å..." FONT 8, "MS Shell Dlg" BEGIN ICON 5100, -1, 9, 7, 20, 20 - LTEXT "Óëµ÷ÖÆ½âµ÷Æ÷Í¨ÐÅ¡£Õâ¿ÉÄÜÐèÒª¼¸ÃëÖÓ¡£", -1, 42, 7, 146, 28 - DEFPUSHBUTTON "È¡Ïû", 2, 72, 52, 50, 14 + LTEXT "ä¸è°å¶è§£è°å¨éä¿¡ãè¿å¯è½éè¦å ç§éã", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "åæ¶", 2, 72, 52, 50, 14 END IDD_GENERAL_2 DIALOGEX 0, 0, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "³£¹æ" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "½ÓÏßÔ±¸¨ÖúµÄ (ÊÖ¶¯) ²¦ºÅ(&O)", 1002, 19, 22, 150, 10 - AUTOCHECKBOX "Èç¹û¿ÕÏÐÊ±¼ä¾Í¶Ï¿ªºô½Ð³¬¹ý(&D)", 1042, 19, 38, 143, 10 +CAPTION "å¸¸è§" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "æ¥çº¿åè¾å©ç (æå¨) æ¨å·(&O)", 1002, 19, 22, 150, 10 + AUTOCHECKBOX "å¦æç©ºé²æ¶é´å°±æå¼å¼å«è¶è¿(&D)", 1042, 19, 38, 143, 10 EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Èç¹ûÊ±¼äÄÚÎ´Á¬½Ó¾ÍÈ¡Ïûºô½Ð:(&C)", -1, 19, 56, 147, 10 + LTEXT "å¦ææ¶é´åæªè¿æ¥å°±åæ¶å¼å«:(&C)", -1, 19, 56, 147, 10 EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER - RTEXT "¶Ë¿ÚËÙ¶È:(&P)", 1034, 16, 102, 93, 8 + RTEXT "ç«¯å£éåº¦:(&P)", 1034, 16, 102, 93, 8 COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Êý¾ÝÐÒé:(&A)", 1032, 16, 122, 93, 8 + RTEXT "æ°æ®åè®®:(&A)", 1032, 16, 122, 93, 8 COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Ñ¹Ëõ:(&R)", 1035, 16, 139, 93, 8 + RTEXT "åç¼©:(&R)", 1035, 16, 139, 93, 8 COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Á÷Á¿¿ØÖÆ:(&F)", 1027, 16, 157, 93, 8 + RTEXT "æµéæ§å¶:(&F)", 1027, 16, 157, 93, 8 COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "µç»°Ê×Ñ¡Ïî", 1060, 11, 7, 217, 66 - LTEXT "·ÖÖÓ", 1044, 195, 38, 22, 8 - LTEXT "Ãë", 1041, 194, 56, 22, 8 - GROUPBOX "Êý¾ÝÁ¬½ÓÊ×Ñ¡Ïî", -1, 11, 82, 217, 94 + GROUPBOX "çµè¯é¦éé¡¹", 1060, 11, 7, 217, 66 + LTEXT "åé", 1044, 195, 38, 22, 8 + LTEXT "ç§", 1041, 194, 56, 22, 8 + GROUPBOX "æ°æ®è¿æ¥é¦éé¡¹", -1, 11, 82, 217, 94 END IDD_ADVANCED_2 DIALOGEX 17, 12, 238, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "¸ß¼¶" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "²¦ºÅÇ°ÏÔÊ¾ÖÕ¶Ë´°¿Ú(&B)", 1000, 20, 21, 200, 10 - AUTOCHECKBOX "²¦ºÅºóµ¯³öÖÕ¶Ë´°¿Ú(&F)", 1001, 20, 38, 200, 10 - RTEXT "Êý¾ÝÎ»:(&D)", 1024, 18, 79, 93, 8 +CAPTION "é«çº§" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "æ¨å·åæ¾ç¤ºç»ç«¯çªå£(&B)", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "æ¨å·åå¼¹åºç»ç«¯çªå£(&F)", 1001, 20, 38, 200, 10 + RTEXT "æ°æ®ä½:(&D)", 1024, 18, 79, 93, 8 COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "ÆæÅ¼Ð£Ñé:(&P)", 1026, 18, 97, 93, 8 + RTEXT "å¥å¶æ ¡éª:(&P)", 1026, 18, 97, 93, 8 COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "Í£Ö¹Î»:(&S)", 1029, 18, 115, 93, 8 + RTEXT "åæ¢ä½:(&S)", 1029, 18, 115, 93, 8 COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - RTEXT "µ÷ÖÆ:(&M)", 1045, 18, 133, 93, 8 + RTEXT "è°å¶:(&M)", 1045, 18, 133, 93, 8 COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "ÖÕ¶Ë´°¿Ú", 1004, 10, 7, 217, 49 - GROUPBOX "Ó²¼þÉèÖÃ", 1005, 10, 64, 217, 89 + GROUPBOX "ç»ç«¯çªå£", 1004, 10, 7, 217, 49 + GROUPBOX "ç¡¬ä»¶è®¾ç½®", 1005, 10, 64, 217, 89 END IDD_ISDN DIALOGEX 0, 0, 238, 210 @@ -169,13 +169,13 @@ CAPTION "ISDN" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "½»»»»úÀàÐÍ(&T)", -1, 11, 6, 217, 39 + GROUPBOX "äº¤æ¢æºç±»å(&T)", -1, 11, 6, 217, 39 COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "µÚÒ»¸öÊý×Ö(&F)", -1, 11, 50, 217, 50 + GROUPBOX "ç¬¬ä¸ä¸ªæ°å(&F)", -1, 11, 50, 217, 50 EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "µÚ¶þ¸öÊý×Ö(&S)", -1, 11, 105, 217, 49 + GROUPBOX "ç¬¬äºä¸ªæ°å(&S)", -1, 11, 105, 217, 49 EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER @@ -183,58 +183,58 @@ IDD_PLEASE_WAIT_2 DIALOGEX 0, 0, 195, 72 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ÇëÉÔºó" +CAPTION "è¯·ç¨å" FONT 8, "MS Shell Dlg" BEGIN ICON 5100, -1, 9, 7, 20, 20 - LTEXT "·¢ËÍµ½µ÷ÖÆ½âµ÷Æ÷µÄ¹ú¼Ò (µØÇø) ÐÅÏ¢¡£", -1, 42, 7, 146, 28 + LTEXT "åéå°è°å¶è§£è°å¨çå½å®¶ (å°åº) ä¿¡æ¯ã", -1, 42, 7, 146, 28 END IDD_WARNING DIALOGEX 0, 0, 360, 105 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "¾¯¸æ" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "²»ÒªÔÙÏÔÊ¾´ËÏûÏ¢", 1109, 17, 73, 118, 10 - DEFPUSHBUTTON "È·¶¨", 1, 302, 84, 50, 14 - LTEXT "ÓÐÐ©µ÷ÖÆ½âµ÷Æ÷²»ÕýÈ·´¦Àí³õÊ¼»¯×Ö·û´®µÄ³¤¶È¡£", -1, 50, 27, 304, 8 - LTEXT "ÓÐ¹Ø´ËÏÞÖÆµÄÐÅÏ¢¿É´ÓÄúµÄµ÷ÖÆ½âµ÷Æ÷ÖÆÔìÉÌÁªÏµ¡£", -1, 50, 41, 304, 8 +CAPTION "è¦å" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "ä¸è¦åæ¾ç¤ºæ¤æ¶æ¯", 1109, 17, 73, 118, 10 + DEFPUSHBUTTON "ç¡®å®", 1, 302, 84, 50, 14 + LTEXT "æäºè°å¶è§£è°å¨ä¸æ£ç¡®å¤çåå§ååç¬¦ä¸²çé¿åº¦ã", -1, 50, 27, 304, 8 + LTEXT "æå³æ¤éå¶çä¿¡æ¯å¯ä»æ¨çè°å¶è§£è°å¨å¶é åèç³»ã", -1, 50, 41, 304, 8 ICON 5100, -1, 15, 14, 20, 20 - LTEXT "ÄúÊäÈëµ÷ÖÆ½âµ÷Æ÷µÄ³õÊ¼»¯×Ö·û´®´óÓÚ 57 ¸ö×Ö·û³¤¡£", -1, 50, 14, 304, 8 + LTEXT "æ¨è¾å¥è°å¶è§£è°å¨çåå§ååç¬¦ä¸²å¤§äº 57 ä¸ªåç¬¦é¿ã", -1, 50, 14, 304, 8 END IDD_MODEMS DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "µ÷ÖÆ½âµ÷Æ÷" +CAPTION "è°å¶è§£è°å¨" FONT 8, "MS Shell Dlg" BEGIN ICON 5100, 1057, 6, 7, 20, 20 - LTEXT "°²×°ÏÂÁÐµ÷ÖÆ½âµ÷Æ÷:(&M)", -1, 44, 12, 203, 9 + LTEXT "å®è£ä¸åè°å¶è§£è°å¨:(&M)", -1, 44, 12, 203, 9 CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE - PUSHBUTTON "Ìí¼Ó...(&A)", 110, 56, 198, 60, 14 - PUSHBUTTON "É¾³ý(&R)", 112, 121, 198, 60, 14 - PUSHBUTTON "ÊôÐÔ(&P)", 109, 185, 198, 60, 14 + PUSHBUTTON "æ·»å ...(&A)", 110, 56, 198, 60, 14 + PUSHBUTTON "å é¤(&R)", 112, 121, 198, 60, 14 + PUSHBUTTON "å±æ§(&P)", 109, 185, 198, 60, 14 END IDD_PLEASE_WAIT_3 DIALOGEX 0, 0, 195, 72 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "ÇëÉÔºò..." -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Í£Ö¹(&S)", 2, 74, 53, 50, 14 +CAPTION "è¯·ç¨å..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "åæ¢(&S)", 2, 74, 53, 50, 14 ICON 5100, -1, 9, 7, 20, 20 - LTEXT "É¾³ýÖÐ", -1, 40, 8, 151, 8 - LTEXT "µ÷ÖÆ½âµ÷Æ÷", 1005, 40, 16, 151, 25 + LTEXT "å é¤ä¸", -1, 40, 8, 151, 8 + LTEXT "è°å¶è§£è°å¨", 1005, 40, 16, 151, 25 END STRINGTABLE BEGIN - 180 "RS-232 ´®ÐÐ¶Ë¿Ú" - 181 "ÍâÖÃµ÷ÖÆ½âµ÷Æ÷" - 182 "ÄÚÖÃµ÷ÖÆ½âµ÷Æ÷" - 183 "PCMCIA µ÷ÖÆ½âµ÷Æ÷" - 184 "²¢ÐÐµ÷ÖÆ½âµ÷Æ÷" - 185 "²¢ÐÐ¶Ë¿Ú" + 180 "RS-232 ä¸²è¡ç«¯å£" + 181 "å¤ç½®è°å¶è§£è°å¨" + 182 "åç½®è°å¶è§£è°å¨" + 183 "PCMCIA è°å¶è§£è°å¨" + 184 "å¹¶è¡è°å¶è§£è°å¨" + 185 "å¹¶è¡ç«¯å£" 200 "110" 201 "1200" 202 "2400" @@ -253,44 +253,44 @@ 242 "6" 243 "7" 244 "8" - 250 "Å¼Êý" - 251 "ÆæÊý" - 252 "ÎÞ" - 253 "Âí¿Ë" - 254 "¿Õ¼ä" + 250 "å¶æ°" + 251 "å¥æ°" + 252 "æ " + 253 "é©¬å" + 254 "ç©ºé´" 255 "1" 256 "1.5" 257 "2" 260 "Xon / Xoff" - 261 "Ó²Ìå" - 262 "ÎÞ" - 263 "¿ª" - 264 "µÍ" + 261 "ç¡¬ä½" + 262 "æ " + 263 "å¼" + 264 "ä½" 265 "V.23 (Minitel)" - 266 "±ê×¼" - 267 "·Ç±ê×¼ (Bell, HST)" - 270 "½«×·¼Óµ½ÈÕÖ¾(&L)" - 300 "Î´Ö¸¶¨" - 301 "Êý¾Ý" - 302 "´«Õæ" - 303 "ÉùÒô" - 304 "ÎÞ" - 320 "¹ú¼Ò/µØÇøÉèÖÃÒÑ¸üÐÂ" - 340 "µ÷ÖÆ½âµ÷Æ÷" - 341 "µ÷ÖÆ½âµ÷Æ÷ÉèÖÃ" - 342 "µ÷ÖÆ½âµ÷Æ÷µØÖ·" - 400 "¹ú¼Ò/µØÇøÉèÖÃÎ´¸üÐÂ" - 401 "ÓÐÐ©µ÷ÖÆ½âµ÷Æ÷²»½ÓÊÜÓÃ»§´óÓÚ 57 ×Ö·ûµÄ³õÊ¼»¯ÃüÁî¡£\n\nÓÐ¹Ø´ËÏÞÖÆµÄÐÅÏ¢¿É´ÓÄúµÄµ÷ÖÆ½âµ÷Æ÷ÖÆÔìÉÌÁªÏµ" - 402 "¾¯¸æ" - 460 "²»ÊÇ×ã¹»µÄÄÚ´æÀ´²é¿´³£¹æ¶Ô»°¿ò¡£\nÇë¹Ø±ÕÒ»Ð©ÎÄ¼þ»ò³ÌÐò£¬È»ºóÔÙÊÔ¡£" - 461 "²»ÊÇ×ã¹»µÄÄÚ´æÀ´²é¿´µ÷ÖÆ½âµ÷Æ÷ÉèÖÃ¶Ô»°¿ò¡£\nÇë¹Ø±ÕÒ»Ð©ÎÄ¼þ»ò³ÌÐò£¬È»ºóÔÙÊÔ¡£" - 463 "Ã¿¸öºô½ÐµØÖ·±ØÐëÉèÖÃ³É×Ô¶¯»ò¶ÀÌØµÄÕðÁåÄ£Ê½¡£\n\n¸ü¸ÄÎªÒ»¸ö²»Í¬µÄÖØ¸´ÏìÁåÄ£Ê½¡£" - 465 "±ê×¼ EC" - 466 "Ç¿ÆÈ EC" - 467 "Ï¸°û" - 468 "½ûÓÃ" - 469 "ÆôÓÃ" - 470 "½ûÓÃ" + 266 "æ å" + 267 "éæ å (Bell, HST)" + 270 "å°è¿½å å°æ¥å¿(&L)" + 300 "æªæå®" + 301 "æ°æ®" + 302 "ä¼ ç" + 303 "å£°é³" + 304 "æ " + 320 "å½å®¶/å°åºè®¾ç½®å·²æ´æ°" + 340 "è°å¶è§£è°å¨" + 341 "è°å¶è§£è°å¨è®¾ç½®" + 342 "è°å¶è§£è°å¨å°å" + 400 "å½å®¶/å°åºè®¾ç½®æªæ´æ°" + 401 "æäºè°å¶è§£è°å¨ä¸æ¥åç¨æ·å¤§äº 57 åç¬¦çåå§åå½ä»¤ã\n\næå³æ¤éå¶çä¿¡æ¯å¯ä»æ¨çè°å¶è§£è°å¨å¶é åèç³»" + 402 "è¦å" + 460 "ä¸æ¯è¶³å¤çååæ¥æ¥çå¸¸è§å¯¹è¯æ¡ã\nè¯·å³éä¸äºæä»¶æç¨åºï¼ç¶ååè¯ã" + 461 "ä¸æ¯è¶³å¤çååæ¥æ¥çè°å¶è§£è°å¨è®¾ç½®å¯¹è¯æ¡ã\nè¯·å³éä¸äºæä»¶æç¨åºï¼ç¶ååè¯ã" + 463 "æ¯ä¸ªå¼å«å°åå¿é¡»è®¾ç½®æèªå¨æç¬ç¹çééæ¨¡å¼ã\n\næ´æ¹ä¸ºä¸ä¸ªä¸åçéå¤åéæ¨¡å¼ã" + 465 "æ å EC" + 466 "å¼ºè¿« EC" + 467 "ç»è" + 468 "ç¦ç¨" + 469 "å¯ç¨" + 470 "ç¦ç¨" 480 "AUTO (1 Ch.)" 481 "AUTO (2 Ch.)" 482 "PPP (56K)" @@ -321,19 +321,19 @@ 515 "V.110 (28.8K)" 516 "V.110 (38.4K)" 517 "V.110 (57.6K)" - 518 "Ä£Äâ (V.34/V.90)" - 550 "ESS5 (AT&T) (±±ÃÀµØÇø)" - 551 "AT&T µã¶Ô¶àµã" + 518 "æ¨¡æ (V.34/V.90)" + 550 "ESS5 (AT&T) (åç¾å°åº)" + 551 "AT&T ç¹å¯¹å¤ç¹" 552 "National ISDN 1 (NI-1)" 553 "Northern Telecom DMS 100 (NT1)" - 554 "NTT INS64 (ÈÕ±¾)" + 554 "NTT INS64 (æ¥æ¬)" 555 "European ISDN (DSS1)" - 556 "German National (1TR6) (ºÜÉÙÊ¹ÓÃ)" - 557 "French National (VN3) (ºÜÉÙÊ¹ÓÃ)" - 558 "Belgium National (ºÜÉÙÊ¹ÓÃ)" - 559 "Australian National (ºÜÉÙÊ¹ÓÃ)" - 560 "Î´Öª¿ª¹Ø" - 570 "¸Ãµ÷ÖÆ½âµ÷Æ÷µÄ ISDN ÅäÖÃ\nÎ´Íê³É¡£\n\nÇëÌîÐ´Ö®Ç°Ê¹ÓÃ´Ëµ÷ÖÆ½âµ÷Æ÷\nISDN Ñ¡Ïî¿¨ÖÐµÄÐÅÏ¢¡£" + 556 "German National (1TR6) (å¾å°ä½¿ç¨)" + 557 "French National (VN3) (å¾å°ä½¿ç¨)" + 558 "Belgium National (å¾å°ä½¿ç¨)" + 559 "Australian National (å¾å°ä½¿ç¨)" + 560 "æªç¥å¼å³" + 570 "è¯¥è°å¶è§£è°å¨ç ISDN éç½®\næªå®æã\n\nè¯·å¡«åä¹åä½¿ç¨æ¤è°å¶è§£è°å¨\nISDN éé¡¹å¡ä¸çä¿¡æ¯ã" 600 "PPP (56K,GSM)" 601 "PPP (64K,GSM)" 602 "V.120 (64K,GSM)" @@ -347,269 +347,269 @@ 611 "V.110 (28.8K,GSM)" 612 "V.110 (38.4K,GSM)" 613 "V.110 (57.6K,GSM)" - 614 "Ä£Äâ RLP" - 615 "Ä£Äâ NRLP" + 614 "æ¨¡æ RLP" + 615 "æ¨¡æ NRLP" 616 "GPRS" - 617 "PIAFS - ´«Èë" - 618 "PIAFS - ´«³ö" - 700 "Ê¹ÓÃµ±Ç° TAPI Î»ÖÃ" - 2006 "¸½¼Óµ½" - 2007 "²»´æÔÚ" - 2008 "Ã»ÓÐ¹¦ÄÜ" - 2009 "ÐèÒªÖØÐÂÆô¶¯" - 2010 "#ÒªÍê³ÉÄúµÄµ÷ÖÆ½âµ÷Æ÷µÄÉèÖÃ£¬±ØÐëÖØÐÂÆô¶¯ÄúµÄ¼ÆËã»ú¡£\n\nÄúÏëÏÖÔÚÖØÐÂÆô¶¯¼ÆËã»úÂð?" - 2011 "µ÷ÖÆ½âµ÷Æ÷°²×°²»ÕýÈ·" - 2012 "Î´ÖªµÄ¶Ë¿Ú" - 3000 "µ÷ÖÆ½âµ÷Æ÷ÉèÖÃ" - 3018 "µ÷ÖÆ½âµ÷Æ÷" - 3019 "°²×°ÐÂµÄµ÷ÖÆ½âµ÷Æ÷²¢¸ü¸Äµ÷ÖÆ½âµ÷Æ÷ÊôÐÔ¡£" - 3053 "²»ÄÜÏÔÊ¾µ÷ÖÆ½âµ÷Æ÷ÊôÐÔ£¬ÒòÎªµ÷ÖÆ½âµ÷Æ÷²»¿ÉÓÃ¡£\n\nÖØÐÂÆô¶¯ÏµÍ³²¢ÔÙÊÔÒ»´Î¡£" - 3054 "µ÷ÖÆ½âµ÷Æ÷µÄÊôÐÔ" - 3060 "ÄãÈ·¶¨ÄãÏëÒª´ÓÏµÍ³ÖÐÉ¾³ýÑ¡¶¨µÄµ÷ÖÆ½âµ÷Æ÷?" - 3061 "ReactOS ÊÇÎÞ·¨´Ó %2 ÖÐÉ¾³ý '%1' µÄµ÷ÖÆ½âµ÷Æ÷¡£" - 3062 "µ÷ÖÆ½âµ÷Æ÷" - 3069 "ÄÚ´æ²»×ã£¬ÎÞ·¨´ò¿ªµ÷ÖÆ½âµ÷Æ÷¿ØÖÆÃæ°å¡£\n\nÇë¹Ø±ÕÒ»Ð©³ÌÐò£¬È»ºóÖØÊÔ¡£" - 3073 "Äú±ØÐëÊÇÏµÍ³¹ÜÀíÔ±²ÅÄÜ°²×°µ÷ÖÆ½âµ÷Æ÷¡£" - 3074 "Ã»ÓÐµ÷ÖÆ½âµ÷Æ÷°²×°¡£Äú±ØÐëÊÇÏµÍ³¹ÜÀíÔ±²ÅÄÜ°²×°µ÷ÖÆ½âµ÷Æ÷¡£" - 3076 "Äú±ØÐë¹Ø±Õ²¢ÖØÐÂÆô¶¯¼ÆËã»ú£¬ÐÂÉèÖÃ²ÅÄÜÉúÐ§¡£\n\nÄúÏëÏÖÔÚÖØÐÂÆô¶¯¼ÆËã»úÂð?" - 3077 "¸ü¸ÄÍøÂçÉèÖÃ" - 3200 "300 ²¨ÌØÂÊ" - 3201 "1200 ²¨ÌØÂÊ" - 3202 "2400 ²¨ÌØÂÊ" - 3203 "9600 ²¨ÌØÂÊ" - 3204 "19.2K ²¨ÌØÂÊ" - 3205 "38.4K ²¨ÌØÂÊ" - 3206 "57.6K ²¨ÌØÂÊ" - 3207 "Ã»ÓÐÏìÓ¦" - 3212 "ÃüÁî" - 3213 "ÏìÓ¦" - 3214 "ÎÞ·¨´ò¿ªÁ¬½Óµ÷ÖÆ½âµ÷Æ÷µÄ¶Ë¿Ú¡£Õâ¿ÉÄÜÊÇÓ²¼þ³åÍ»µÄ½á¹û¡£¼ì²éÉè±¸¹ÜÀíÆ÷ÒÔÈ·ÈÏËùÓÐÉè±¸¶¼¶¼¹¦ÄÜ¡£" - 3215 "µ÷ÖÆ½âµ÷Æ÷ÕýÔÚÊ¹ÓÃµÄ¶Ë¿ÚÊÇµ±Ç°´ò¿ªÁíÒ»¸öÓ¦ÓÃ³ÌÐò¡£ÍË³öÈÎºÎÓ¦ÓÃ³ÌÐò£¬¿ÉÄÜÄ¿Ç°ÕýÔÚÊ¹ÓÃµÄ¶Ë¿Ú¡£" + 617 "PIAFS - ä¼ å¥" + 618 "PIAFS - ä¼ åº" + 700 "ä½¿ç¨å½å TAPI ä½ç½®" + 2006 "éå å°" + 2007 "ä¸åå¨" + 2008 "æ²¡æåè½" + 2009 "éè¦éæ°å¯å¨" + 2010 "#è¦å®ææ¨çè°å¶è§£è°å¨çè®¾ç½®ï¼å¿é¡»éæ°å¯å¨æ¨çè®¡ç®æºã\n\næ¨æ³ç°å¨éæ°å¯å¨è®¡ç®æºå?" + 2011 "è°å¶è§£è°å¨å®è£ä¸æ£ç¡®" + 2012 "æªç¥çç«¯å£" + 3000 "è°å¶è§£è°å¨è®¾ç½®" + 3018 "è°å¶è§£è°å¨" + 3019 "å®è£æ°çè°å¶è§£è°å¨å¹¶æ´æ¹è°å¶è§£è°å¨å±æ§ã" + 3053 "ä¸è½æ¾ç¤ºè°å¶è§£è°å¨å±æ§ï¼å ä¸ºè°å¶è§£è°å¨ä¸å¯ç¨ã\n\néæ°å¯å¨ç³»ç»å¹¶åè¯ä¸æ¬¡ã" + 3054 "è°å¶è§£è°å¨çå±æ§" + 3060 "ä½ ç¡®å®ä½ æ³è¦ä»ç³»ç»ä¸å é¤éå®çè°å¶è§£è°å¨?" + 3061 "ReactOS æ¯æ æ³ä» %2 ä¸å é¤ '%1' çè°å¶è§£è°å¨ã" + 3062 "è°å¶è§£è°å¨" + 3069 "ååä¸è¶³ï¼æ æ³æå¼è°å¶è§£è°å¨æ§å¶é¢æ¿ã\n\nè¯·å³éä¸äºç¨åºï¼ç¶åéè¯ã" + 3073 "æ¨å¿é¡»æ¯ç³»ç»ç®¡çåæè½å®è£è°å¶è§£è°å¨ã" + 3074 "æ²¡æè°å¶è§£è°å¨å®è£ãæ¨å¿é¡»æ¯ç³»ç»ç®¡çåæè½å®è£è°å¶è§£è°å¨ã" + 3076 "æ¨å¿é¡»å³éå¹¶éæ°å¯å¨è®¡ç®æºï¼æ°è®¾ç½®æè½çæã\n\næ¨æ³ç°å¨éæ°å¯å¨è®¡ç®æºå?" + 3077 "æ´æ¹ç½ç»è®¾ç½®" + 3200 "300 æ³¢ç¹ç" + 3201 "1200 æ³¢ç¹ç" + 3202 "2400 æ³¢ç¹ç" + 3203 "9600 æ³¢ç¹ç" + 3204 "19.2K æ³¢ç¹ç" + 3205 "38.4K æ³¢ç¹ç" + 3206 "57.6K æ³¢ç¹ç" + 3207 "æ²¡æååº" + 3212 "å½ä»¤" + 3213 "ååº" + 3214 "æ æ³æå¼è¿æ¥è°å¶è§£è°å¨çç«¯å£ãè¿å¯è½æ¯ç¡¬ä»¶å²çªçç»æãæ£æ¥è®¾å¤ç®¡çå¨ä»¥ç¡®è®¤ææè®¾å¤é½é½åè½ã" + 3215 "è°å¶è§£è°å¨æ£å¨ä½¿ç¨çç«¯å£æ¯å½åæå¼å¦ä¸ä¸ªåºç¨ç¨åºãéåºä»»ä½åºç¨ç¨åºï¼å¯è½ç®åæ£å¨ä½¿ç¨çç«¯å£ã" 3218 "OpenComm" - 3221 "115K ²¨ÌØÂÊ" - 3222 "¸üÐÂÖÐ" - 3223 "´íÎó" - 3233 "³É¹¦" - 3236 "µ÷ÖÆ½âµ÷Æ÷Ã»ÓÐÏìÓ¦¡£ÇëÈ·±£ËüÊÇÕýÈ·Á¬½Ó²¢´ò¿ª¡£Èç¹ûËüÊÇÄÚ²¿µ÷ÖÆ½âµ÷Æ÷»òÒÑ¾Á¬½Ó£¬ÑéÖ¤ÕýÈ·ÉèÖÃ¶Ë¿ÚµÄÖÐ¶Ï¡£" + 3221 "115K æ³¢ç¹ç" + 3222 "æ´æ°ä¸" + 3223 "éè¯¯" + 3233 "æå" + 3236 "è°å¶è§£è°å¨æ²¡æååºãè¯·ç¡®ä¿å®æ¯æ£ç¡®è¿æ¥å¹¶æå¼ãå¦æå®æ¯åé¨è°å¶è§£è°å¨æå·²ç»è¿æ¥ï¼éªè¯æ£ç¡®è®¾ç½®ç«¯å£çä¸æã" 3237 "COMMAND NOT SUPPORTED" - 3238 "×Ö¶Î" - 3239 "Öµ" - 3240 " Ä¬ÈÏÊ×Ñ¡Ïî" - 3241 " Á¬½ÓÊ×Ñ¡Ïî" - 6144 "ÈÕ±¾" - 6145 "°¢¶û°ÍÄáÑÇ" - 6146 "°¢¶û¼°ÀûÑÇ" - 6147 "ÃÀÊôÈøÄ¦ÑÇ" - 6148 "µÂ¹ú (¹ú¼Ò/µØÇø´úÂë 04)" - 6149 "°²¹çÀ" - 6150 "°²Ìá¹ÏºÍ°Í²¼´ï" - 6151 "°¢¸ùÍ¢" - 6152 "°¢ÉËÉµº" - 6153 "°Ä´óÀûÑÇ" - 6154 "°ÂµØÀû" - 6155 "°Í¹þÂí" - 6156 "°ÍÁÖ" - 6157 "ÃÏ¼ÓÀ¹ú" - 6158 "°Í°Í¶àË¹" - 6159 "±ÈÀûÊ±" - 6160 "²®Àû×È" - 6161 "±´Äþ" - 6162 "°ÙÄ½´ó" - 6163 "²»µ¤" - 6164 "²£ÀûÎ¬ÑÇ" - 6165 "²©´ÄÍßÄÉ" - 6166 "°ÍÎ÷" - 6167 "¹ú¼Ò/µØÇø´úÂë (23)" - 6168 "Ó¢ÊôÓ¡¶ÈÑóÁìµØ" - 6169 "Ó¢ÊôÎ¬¾©Èºµº" - 6170 "ÎÄÀ³" - 6171 "±£¼ÓÀûÑÇ" - 6172 "Ãåµé" - 6173 "²¼Â¡µÏ" - 6174 "°×¶íÂÞË¹" - 6175 "¿¦ÂóÂ¡" - 6176 "¼ÓÄÃ´ó" - 6177 "·ðµÃ½Ç" - 6178 "¿ªÂüÈºµº" - 6179 "ÖÐ·Ç¹²ºÍ¹ú" - 6180 "Õ§µÃ" - 6181 "ÖÇÀû" - 6182 "ÖÐ¹ú" - 6183 "¸çÂ×±ÈÑÇ" - 6184 "¿ÆÄ¦ÂÞ" - 6185 "¸Õ¹û" - 6186 "¿â¿Ëµº" - 6187 "¸çË¹´ïÀè¼Ó" - 6188 "¹Å°Í" - 6189 "ÈûÆÖÂ·Ë¹" - 6190 "½Ý¿Ë¹²ºÍ¹ú" - 6191 "¼íÆÒÕ¯" - 6192 "³¯ÏÊ" - 6193 "µ¤Âó" - 6194 "¼ª²¼Ìá" - 6195 "¶àÃ×Äá¼Ó¹²ºÍ¹ú" - 6196 "¶àÃ×Äá¿Ë" - 6197 "¶ò¹Ï¶à¶û" - 6198 "°£¼°" - 6199 "Èø¶ûÍß¶à" - 6200 "³àµÀ¼¸ÄÚÑÇ" - 6201 "°£Èû¶í±ÈÑÇ" - 6202 "¸£¿ËÀ¼Èºµº (Âí¶ûÎ¬ÄÉË¹Èºµº)" - 6203 "ì³¼ÃÈºµº" - 6204 "·ÒÀ¼" - 6205 "·¨¹ú" - 6206 "·¨Êô²¨ÀûÄáÎ÷ÑÇ" - 6207 "¹ú¼Ò/µØÇø´úÂë (63)" - 6208 "¼ÓÅî" - 6209 "¸Ô±ÈÑÇ" - 6210 "µÂ¹ú (¹ú¼Ò/µØÇø´úÂë 66)" - 6211 "°²¸çÀ" - 6212 "¼ÓÄÉ" - 6213 "Ö±²¼ÂÞÍÓ" - 6214 "Ï£À°" - 6215 "¸ñÁÖÄÉ´ï" - 6216 "¹Øµº" - 6217 "Î£µØÂíÀ" - 6218 "Î÷µº" - 6219 "¼¸ÄÚÑÇ" - 6220 "¼¸ÄÚÑÇ±ÈÉÜ" - 6221 "¹çÑÇÄÇ" - 6222 "º£µØ" - 6223 "ºé¶¼ÀË¹" - 6224 "Ïã¸ÛÌØÇø" - 6225 "ÐÙÑÀÀû" - 6226 "±ùµº" - 6227 "Ó¡¶È" - 6228 "Ó¡¶ÈÄáÎ÷ÑÇ" - 6229 "ÒÁÀÊ" - 6230 "ÒÁÀ¿Ë" - 6231 "°®¶ûÀ¼" - 6232 "ÒÔÉ«ÁÐ" - 6233 "Òâ´óÀû" - 6234 "¿ÆÌØµÏÍß" - 6235 "ÑÀÂò¼Ó" - 6236 "°¢¸»º¹" - 6237 "ÔóÎ÷" - 6238 "Ô¼µ©" - 6239 "¿ÏÄáÑÇ" - 6240 "»ùÀï°ÍË¹" - 6241 "º«¹ú" - 6242 "¿ÆÍþÌØ" - 6243 "ÀÏÎÎ" - 6244 "Àè°ÍÄÛ" - 6245 "À³Ë÷ÍÐ" - 6246 "Àû±ÈÀïÑÇ" - 6247 "Àû±ÈÑÇ" - 6248 "ÁÐÖ§¶ØÊ¿µÇ" - 6249 "Â¬É±¤" - 6250 "°ÄÃÅÌØÇø" - 6251 "Âí´ï¼ÓË¹¼Ó " - 6252 "ÂíÀ´Î÷ÑÇ" - 6253 "ÂíÀÎ¬" - 6254 "Âí¶û´ú·ò" - 6255 "ÂíÀï" - 6256 "Âí¶úËû" - 6257 "Ã«ÀïËþÄáÑÇ" - 6258 "Ã«ÀïÇóË¹" - 6259 "Ä«Î÷¸ç" - 6260 "Ä¦ÄÉ¸ç" - 6261 "ÃÉ¹Å" - 6262 "ÃÉÌØÈûÀÌØ" - 6263 "Ä¦Âå¸ç" - 6264 "ÄªÉ£±È¿Ë" - 6265 "è§Â³" - 6266 "Äá²´¶û" - 6267 "ºÉÀ¼" - 6268 "ºÉÊô°²µØÁÐË¹Èºµº" - 6269 "ÐÂ¿¦Àï¶àÄáÑÇ" - 6270 "ÐÂÎ÷À¼" - 6271 "Äá¼ÓÀ¹Ï" - 6272 "ÄáÈÕ¶û" - 6273 "ÄáÈÕÀûÑÇ" - 6274 "Å²Íþ" - 6275 "°¢Âü" - 6276 "°Í»ùË¹Ì¹" - 6277 "°ÍÄÃÂí" - 6278 "°Í²¼ÑÇÐÂ¼¸ÄÚÑÇ" - 6279 "°ÍÀ¹ç" - 6280 "ÃØÂ³" - 6281 "·ÆÂÉ±ö" - 6282 "²¨À¼" - 6283 "ÆÏÌÑÑÀ" - 6284 "²¨¶àÀè¸÷" - 6285 "¿¨Ëþ¶û" - 6286 "ÂÞÂíÄáÑÇ" - 6287 "Â¬Íú´ï" - 6288 "Ê¥»ù´ÄºÍÄáÎ¬Ë¹" - 6289 "¹ú¼Ò/µØÇø´úÂë (145)" - 6290 "Ê¥º£Â×ÄÈ" - 6291 "Ê¥Â¶Î÷ÑÇ" - 6292 "Ê¥ÂíÁ¦Åµ" - 6293 "¹ú¼Ò/µØÇø´úÂë (148)" - 6294 "Ê¥¶àÃÀºÍÆÕÁÖÎ÷±È" - 6295 "Ê¥ÎÄÉÌØºÍ¸ñÁÖÄÉ¶¡Ë¹" - 6296 "É³ÌØ°¢À²®" - 6297 "ÈûÄÚ¼Ó¶û" - 6298 "ÈûÉà¶û" - 6299 "ÈûÀÀû°º" - 6300 "ÐÂ¼ÓÆÂ" - 6301 "Ë÷ÂÞÃÅÈºµº" - 6302 "Ë÷ÂíÀï" - 6303 "ÄÏ·Ç" - 6304 "Î÷°àÑÀ" - 6305 "Ë¹ÀïÀ¼¿¨" - 6306 "ËÕµ¤" - 6307 "ËÕÀïÄÏ" - 6308 "Ë¹ÍþÊ¿À¼" - 6309 "Èðµä" - 6310 "ÈðÊ¿" - 6311 "ÐðÀûÑÇ" - 6312 "Ì¹É£ÄáÑÇ" - 6313 "Ì©¹ú" - 6314 "¶à¸ç" - 6315 "ÌÀ¼Ó" - 6316 "ÌØÁ¢Äá´ïºÍ¶à°Í¸ç" - 6317 "Í»ÄáË¹" - 6318 "ÍÁ¶úÆä" - 6319 "ÌØ¿ËË¹ºÍ¿¿ÆË¹Èºµº" - 6320 "Í¼ÍßÂ¬" - 6321 "ÎÚ¸É´ï" - 6322 "ÎÚ¿ËÀ¼" - 6323 "°¢À²®ÁªºÏÇõ³¤¹ú" - 6324 "Ó¢¹ú" - 6325 "ÃÀ¹ú" - 6326 "²¼¼ªÄÉ·¨Ë÷" - 6327 "ÎÚÀ¹ç" - 6328 "¹ú¼Ò/µØÇø´úÂë (184)" - 6329 "ÍßÅ¬°¢Í¼" - 6330 "èóµÙ¸Ô³Ç" - 6331 "Î¯ÄÚÈðÀ" - 6332 "Ô½ÄÏ" - 6333 "ÍßÀûË¹ÈºµººÍ¸»Í¼ÄÉÈºµº" - 6334 "ÈøÄ¦ÑÇ" - 6335 "Ò²ÃÅ" - 6336 "Ò²ÃÅ" - 6337 "¹ú¼Ò/µØÇø´úÂë (193)" - 6338 "¸Õ¹ûÃñÖ÷¹²ºÍ¹ú" - 6339 "ÔÞ±ÈÑÇ" - 6340 "½ò°Í²¼Î¤" - 6501 "Ä¦¶û¶àÍß" - 6502 "°®É³ÄáÑÇ" - 6503 "Á¢ÌÕÍð" - 6504 "ÑÇÃÀÄáÑÇ" - 6505 "¸ñÂ³¼ªÑÇ" - 6506 "°¢Èû°Ý½®" - 6507 "ÍÁ¿âÂüË¹Ì¹" - 6508 "ÎÚ×È±ð¿ËË¹Ì¹" - 6509 "¹þÈø¿ËË¹Ì¹" - 6510 "Ëþ¼ª¿ËË¹Ì¹" - 6511 "¼ª¶û¼ªË¹Ë¹Ì¹" - 6512 "ÀÍÑÎ¬ÑÇ" - 6513 "¶íÂÞË¹" - 6600 "¿ËÂÞµØÑÇ" - 6601 "Ë¹ÂåÎÄÄáÑÇ" - 6602 "ÂíÆä¶Ù¹²ºÍ¹ú" - 6603 "²¨Ë¹ÄáÑÇºÍºÚÈû¸çÎ¬ÄÇ" - 6604 "ÄÏË¹À·ò" - 20013 "Ó²¼þ ID" -END + 3238 "åæ®µ" + 3239 "å¼" + 3240 " é»è®¤é¦éé¡¹" + 3241 " è¿æ¥é¦éé¡¹" + 6144 "æ¥æ¬" + 6145 "é¿å°å·´å°¼äº" + 6146 "é¿å°åå©äº" + 6147 "ç¾å±è¨æ©äº" + 6148 "å¾·å½ (å½å®¶/å°åºä»£ç 04)" + 6149 "å®åæ" + 6150 "å®æçåå·´å¸è¾¾" + 6151 "é¿æ ¹å»·" + 6152 "é¿æ£®æ¾å²" + 6153 "æ¾³å¤§å©äº" + 6154 "å¥¥å°å©" + 6155 "å·´åé©¬" + 6156 "å·´æ" + 6157 "åå æå½" + 6158 "å·´å·´å¤æ¯" + 6159 "æ¯å©æ¶" + 6160 "ä¼¯å©å¹" + 6161 "è´å®" + 6162 "ç¾æå¤§" + 6163 "ä¸ä¸¹" + 6164 "ç»å©ç»´äº" + 6165 "åè¨ç¦çº³" + 6166 "å·´è¥¿" + 6167 "å½å®¶/å°åºä»£ç (23)" + 6168 "è±å±å°åº¦æ´é¢å°" + 6169 "è±å±ç»´äº¬ç¾¤å²" + 6170 "æè±" + 6171 "ä¿å å©äº" + 6172 "ç¼ç¸" + 6173 "å¸éè¿ª" + 6174 "ç½ä¿ç½æ¯" + 6175 "åéº¦é" + 6176 "å æ¿å¤§" + 6177 "ä½å¾è§" + 6178 "å¼æ¼ç¾¤å²" + 6179 "ä¸éå±åå½" + 6180 "ä¹å¾" + 6181 "æºå©" + 6182 "ä¸å½" + 6183 "å¥ä¼¦æ¯äº" + 6184 "ç§æ©ç½" + 6185 "åæ" + 6186 "åºåå²" + 6187 "å¥æ¯è¾¾é»å " + 6188 "å¤å·´" + 6189 "å¡æµ¦è·¯æ¯" + 6190 "æ·åå±åå½" + 6191 "æ¬åå¯¨" + 6192 "æé²" + 6193 "ä¸¹éº¦" + 6194 "åå¸æ" + 6195 "å¤ç±³å°¼å å±åå½" + 6196 "å¤ç±³å°¼å" + 6197 "åçå¤å°" + 6198 "åå" + 6199 "è¨å°ç¦å¤" + 6200 "èµ¤éå åäº" + 6201 "åå¡ä¿æ¯äº" + 6202 "ç¦åå°ç¾¤å² (é©¬å°ç»´çº³æ¯ç¾¤å²)" + 6203 "ææµç¾¤å²" + 6204 "è¬å°" + 6205 "æ³å½" + 6206 "æ³å±æ³¢å©å°¼è¥¿äº" + 6207 "å½å®¶/å°åºä»£ç (63)" + 6208 "å è¬" + 6209 "åæ¯äº" + 6210 "å¾·å½ (å½å®¶/å°åºä»£ç 66)" + 6211 "å®å¥æ" + 6212 "å çº³" + 6213 "ç´å¸ç½é" + 6214 "å¸è" + 6215 "æ ¼æçº³è¾¾" + 6216 "å³å²" + 6217 "å±å°é©¬æ" + 6218 "è¥¿å²" + 6219 "å åäº" + 6220 "å åäºæ¯ç»" + 6221 "åäºé£" + 6222 "æµ·å°" + 6223 "æ´ªé½ææ¯" + 6224 "é¦æ¸¯ç¹åº" + 6225 "åçå©" + 6226 "å°å²" + 6227 "å°åº¦" + 6228 "å°åº¦å°¼è¥¿äº" + 6229 "ä¼æ" + 6230 "ä¼æå" + 6231 "ç±å°å°" + 6232 "ä»¥è²å" + 6233 "æå¤§å©" + 6234 "ç§ç¹è¿ªç¦" + 6235 "çä¹°å " + 6236 "é¿å¯æ±" + 6237 "æ³½è¥¿" + 6238 "çº¦æ¦" + 6239 "è¯å°¼äº" + 6240 "åºéå·´æ¯" + 6241 "é©å½" + 6242 "ç§å¨ç¹" + 6243 "èæ" + 6244 "é»å·´å«©" + 6245 "è±ç´¢æ" + 6246 "å©æ¯éäº" + 6247 "å©æ¯äº" + 6248 "åæ¯æ¦å£«ç»" + 6249 "å¢æ£®å ¡" + 6250 "æ¾³é¨ç¹åº" + 6251 "é©¬è¾¾å æ¯å " + 6252 "é©¬æ¥è¥¿äº" + 6253 "é©¬æç»´" + 6254 "é©¬å°ä»£å¤«" + 6255 "é©¬é" + 6256 "é©¬è³ä»" + 6257 "æ¯éå¡å°¼äº" + 6258 "æ¯éæ±æ¯" + 6259 "å¢¨è¥¿å¥" + 6260 "æ©çº³å¥" + 6261 "èå¤" + 6262 "èç¹å¡æç¹" + 6263 "æ©æ´å¥" + 6264 "è«æ¡æ¯å" + 6265 "çé²" + 6266 "å°¼æ³å°" + 6267 "è·å°" + 6268 "è·å±å®å°åæ¯ç¾¤å²" + 6269 "æ°åéå¤å°¼äº" + 6270 "æ°è¥¿å°" + 6271 "å°¼å æç" + 6272 "å°¼æ¥å°" + 6273 "å°¼æ¥å©äº" + 6274 "æªå¨" + 6275 "é¿æ¼" + 6276 "å·´åºæ¯å¦" + 6277 "å·´æ¿é©¬" + 6278 "å·´å¸äºæ°å åäº" + 6279 "å·´æå" + 6280 "ç§é²" + 6281 "è²å¾å®¾" + 6282 "æ³¢å°" + 6283 "è¡èç" + 6284 "æ³¢å¤é»å" + 6285 "å¡å¡å°" + 6286 "ç½é©¬å°¼äº" + 6287 "å¢æºè¾¾" + 6288 "å£åºè¨åå°¼ç»´æ¯" + 6289 "å½å®¶/å°åºä»£ç (145)" + 6290 "å£æµ·ä¼¦å¨" + 6291 "å£é²è¥¿äº" + 6292 "å£é©¬åè¯º" + 6293 "å½å®¶/å°åºä»£ç (148)" + 6294 "å£å¤ç¾åæ®æè¥¿æ¯" + 6295 "å£ææ£®ç¹åæ ¼æçº³ä¸æ¯" + 6296 "æ²ç¹é¿æä¼¯" + 6297 "å¡åå å°" + 6298 "å¡èå°" + 6299 "å¡æå©æ" + 6300 "æ°å å¡" + 6301 "ç´¢ç½é¨ç¾¤å²" + 6302 "ç´¢é©¬é" + 6303 "åé" + 6304 "è¥¿çç" + 6305 "æ¯éå°å¡" + 6306 "èä¸¹" + 6307 "èéå" + 6308 "æ¯å¨å£«å°" + 6309 "çå¸" + 6310 "çå£«" + 6311 "åå©äº" + 6312 "å¦æ¡å°¼äº" + 6313 "æ³°å½" + 6314 "å¤å¥" + 6315 "æ±¤å " + 6316 "ç¹ç«å°¼è¾¾åå¤å·´å¥" + 6317 "çªå°¼æ¯" + 6318 "åè³å¶" + 6319 "ç¹åæ¯åå¯ç§æ¯ç¾¤å²" + 6320 "å¾ç¦å¢" + 6321 "ä¹å¹²è¾¾" + 6322 "ä¹åå°" + 6323 "é¿æä¼¯èåéé¿å½" + 6324 "è±å½" + 6325 "ç¾å½" + 6326 "å¸åçº³æ³ç´¢" + 6327 "ä¹æå" + 6328 "å½å®¶/å°åºä»£ç (184)" + 6329 "ç¦åªé¿å¾" + 6330 "æ¢µèåå" + 6331 "å§åçæ" + 6332 "è¶å" + 6333 "ç¦å©æ¯ç¾¤å²åå¯å¾çº³ç¾¤å²" + 6334 "è¨æ©äº" + 6335 "ä¹é¨" + 6336 "ä¹é¨" + 6337 "å½å®¶/å°åºä»£ç (193)" + 6338 "åææ°ä¸»å±åå½" + 6339 "èµæ¯äº" + 6340 "æ´¥å·´å¸é¦" + 6501 "æ©å°å¤ç¦" + 6502 "ç±æ²å°¼äº" + 6503 "ç«é¶å®" + 6504 "äºç¾å°¼äº" + 6505 "æ ¼é²åäº" + 6506 "é¿å¡æç" + 6507 "ååºæ¼æ¯å¦" + 6508 "ä¹å¹å«åæ¯å¦" + 6509 "åè¨åæ¯å¦" + 6510 "å¡ååæ¯å¦" + 6511 "åå°åæ¯æ¯å¦" + 6512 "æè±ç»´äº" + 6513 "ä¿ç½æ¯" + 6600 "åç½å°äº" + 6601 "æ¯æ´æå°¼äº" + 6602 "é©¬å¶é¡¿å±åå½" + 6603 "æ³¢æ¯å°¼äºåé»å¡å¥ç»´é£" + 6604 "åæ¯æå¤«" + 20013 "ç¡¬ä»¶ ID" +END Modified: trunk/reactos/dll/win32/msgina/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/zh-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,7 +4,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ÇëÉÔºò..." +CAPTION "è¯·ç¨å..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -13,121 +13,121 @@ IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "»¶ÓÀ´µ½ ReactOS" +CAPTION "æ¬¢è¿æ¥å° ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 - LTEXT "°´ Ctrl-Alt-Delete ¿ªÊ¼¡£",IDC_STATIC, 38, 60, 144, 14 + LTEXT "æ Ctrl-Alt-Delete å¼å§ã",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "µÇÂ¼" +CAPTION "ç»å½" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "ÓÃ»§Ãû:", IDC_STATIC, 6, 60, 52, 8 + LTEXT "ç¨æ·å:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL - LTEXT "ÃÜÂë:", IDC_STATIC, 6, 78, 52, 8 + LTEXT "å¯ç :", IDC_STATIC, 6, 78, 52, 8 EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "µÇÂ¼µ½:", IDC_STATIC, 6, 96, 52, 8 + LTEXT "ç»å½å°:", IDC_STATIC, 6, 96, 52, 8 COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "È·¶¨",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "È¡Ïû", IDCANCEL, 160, 122, 50, 14 - PUSHBUTTON "¹Ø±Õ", IDC_SHUTDOWN, 214, 122, 50, 14 + PUSHBUTTON "ç¡®å®",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "å³é", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "°²È«" +CAPTION "å®å¨" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - GROUPBOX "µÇÂ¼ÐÅÏ¢", IDC_STATIC, 7, 61, 261, 52 - LTEXT "<ÏûÏ¢>", IDC_LOGONMSG, 15, 73, 245, 18 - LTEXT "<µÇÂ¼ÈÕÆÚ>", IDC_LOGONDATE, 15, 94, 245, 8 - CTEXT "ÄãÏëÒª×öÊ²Ã´?", IDC_STATIC, 10, 119, 255, 8 - PUSHBUTTON "Ëø¶¨¼ÆËã»ú", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "×¢Ïú...", IDC_LOGOFF, 100, 135, 75, 14 - PUSHBUTTON "¹Ø±Õ", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "¸ü¸ÄÃÜÂë", IDC_CHANGEPWD, 10, 154, 76, 14 - PUSHBUTTON "ÈÎÎñ¹ÜÀíÆ÷", IDC_TASKMGR, 100, 154, 75, 14 - PUSHBUTTON "È¡Ïû", IDCANCEL, 189, 154, 76, 14 + GROUPBOX "ç»å½ä¿¡æ¯", IDC_STATIC, 7, 61, 261, 52 + LTEXT "<æ¶æ¯>", IDC_LOGONMSG, 15, 73, 245, 18 + LTEXT "<ç»å½æ¥æ>", IDC_LOGONDATE, 15, 94, 245, 8 + CTEXT "ä½ æ³è¦åä»ä¹?", IDC_STATIC, 10, 119, 255, 8 + PUSHBUTTON "éå®è®¡ç®æº", IDC_LOCK, 10, 135, 76, 14 + PUSHBUTTON "æ³¨é...", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "å³é", IDC_SHUTDOWN, 189, 135, 76, 14 + PUSHBUTTON "æ´æ¹å¯ç ", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "ä»»å¡ç®¡çå¨", IDC_TASKMGR, 100, 154, 75, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 189, 154, 76, 14 END IDD_LOCKED_DLG DIALOGEX 0, 0, 275, 121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Ëø¶¨¼ÆËã»ú" +CAPTION "éå®è®¡ç®æº" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, -1, 7, 59, 20, 20 - LTEXT "´Ë¼ÆËã»úÕýÔÚÊ¹ÓÃÖÐ£¬ÒÑ±»Ëø¶¨¡£", IDC_STATIC, 36, 61, 232, 8 - LTEXT "ÏûÏ¢", IDC_LOCKMSG, 37, 75, 231, 26 - LTEXT "°´ Ctrl-Alt-Del ¼ü½âËø´Ë¼ÆËã»ú¡£", IDC_STATIC, 36, 106, 232, 8 + LTEXT "æ¤è®¡ç®æºæ£å¨ä½¿ç¨ä¸ï¼å·²è¢«éå®ã", IDC_STATIC, 36, 61, 232, 8 + LTEXT "æ¶æ¯", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "æ Ctrl-Alt-Del é®è§£éæ¤è®¡ç®æºã", IDC_STATIC, 36, 106, 232, 8 END IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "½â³ýËø¶¨¼ÆËã»ú" +CAPTION "è§£é¤éå®è®¡ç®æº" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, -1, 7, 59, 20, 20 - LTEXT "´Ë¼ÆËã»úÕýÔÚÊ¹ÓÃÖÐ£¬ÒÑ±»Ëø¶¨¡£", IDC_STATIC, 36, 61, 232, 8 - LTEXT "ÏûÏ¢", IDC_LOCKMSG, 36, 75, 232, 26 - LTEXT "ÓÃ»§Ãû³Æ:", IDC_STATIC, 36, 107, 40, 8 + LTEXT "æ¤è®¡ç®æºæ£å¨ä½¿ç¨ä¸ï¼å·²è¢«éå®ã", IDC_STATIC, 36, 61, 232, 8 + LTEXT "æ¶æ¯", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "ç¨æ·åç§°:", IDC_STATIC, 36, 107, 40, 8 EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL - LTEXT "ÃÜÂë:", IDC_STATIC, 36, 125, 42, 8 + LTEXT "å¯ç :", IDC_STATIC, 36, 125, 42, 8 EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "È·¶¨", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "È¡Ïû", IDCANCEL, 144, 154, 50, 14 + PUSHBUTTON "ç¡®å®", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 144, 154, 50, 14 END IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "¸ü¸ÄÃÜÂë" +CAPTION "æ´æ¹å¯ç " FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "ÓÃ»§Ãû³Æ:", IDC_STATIC, 7, 61, 78, 8 + LTEXT "ç¨æ·åç§°:", IDC_STATIC, 7, 61, 78, 8 EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL - LTEXT "µÇÂ¼µ½:", IDC_STATIC, 7, 78, 78, 8 + LTEXT "ç»å½å°:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP - LTEXT "¾ÉÃÜÂë:", IDC_STATIC, 7, 95, 78, 8 + LTEXT "æ§å¯ç :", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "ÐÂÃÜÂë:", IDC_STATIC, 7, 111, 78, 8 + LTEXT "æ°å¯ç :", IDC_STATIC, 7, 111, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "È·ÈÏÐÂÃÜÂë:", IDC_STATIC, 7, 127, 78, 8 + LTEXT "ç¡®è®¤æ°å¯ç :", IDC_STATIC, 7, 127, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "È·¶¨", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "È¡Ïû", IDCANCEL, 218, 145, 50, 14 + PUSHBUTTON "ç¡®å®", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "åæ¶", IDCANCEL, 218, 145, 50, 14 END IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP -CAPTION "ReactOS ×¢Ïú" +CAPTION "ReactOS æ³¨é" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN ICON IDI_LOCKICON, -1, 7, 7, 20, 20 - LTEXT "ÄãÈ·¶¨ÄãÏëÒª×¢Ïú?", IDC_STATIC, 35, 16, 146, 8 - PUSHBUTTON "ÊÇ", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "·ñ", IDNO, 95, 39, 50, 14 + LTEXT "ä½ ç¡®å®ä½ æ³è¦æ³¨é?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "æ¯", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "å¦", IDNO, 95, 39, 50, 14 END IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "¹Ø±Õ ReactOS" +CAPTION "å³é ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP - LTEXT "ÄãÏëÈÃ¼ÆËã»ú×öÊ²Ã´?(&W)", IDC_STATIC, 39, 57, 167, 10 + LTEXT "ä½ æ³è®©è®¡ç®æºåä»ä¹?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "È·¶¨", IDOK, 143, 122, 55, 14, WS_GROUP - PUSHBUTTON "È¡Ïû", IDCANCEL, 204, 122, 55, 14 + DEFPUSHBUTTON "ç¡®å®", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "åæ¶", IDCANCEL, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -136,60 +136,60 @@ FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - DEFPUSHBUTTON "È·¶¨", IDOK, 115, 179, 50, 14 + DEFPUSHBUTTON "ç¡®å®", IDOK, 115, 179, 50, 14 END IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "¹Ø±Õ ReactOS" +CAPTION "å³é ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP - LTEXT "ÄãÏëÈÃ¼ÆËã»ú×öÊ²Ã´?(&W)", IDC_STATIC, 39, 57, 167, 10 + LTEXT "ä½ æ³è®©è®¡ç®æºåä»ä¹?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "È·¶¨", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "È¡Ïû", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "°ïÖú(&H)", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "ç¡®å®", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "åæ¶", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "å¸®å©(&H)", IDHELP, 204, 122, 55, 14 END STRINGTABLE BEGIN - IDS_LOGGEDOUTSAS "»¶Ó!" - IDS_LOCKEDSAS "¼ÆËã»úµ±Ç°ÒÑËø¶¨¡£" - IDS_PRESSCTRLALTDELETE "°´ Control+Alt+Delete µÇÂ¼¡£" - IDS_ASKFORUSER "ÓÃ»§Ãû³Æ: " - IDS_ASKFORPASSWORD "ÃÜÂë: " - IDS_FORCELOGOFF "Õâ½«×¢Ïúµ±Ç°ÓÃ»§£¬²¢¶ªÊ§Î´±£´æµÄËùÓÐÊý¾Ý¡£Òª¼ÌÐøÂð?" - IDS_LOCKMSG "Ö»ÓÐ %s »òÏµÍ³¹ÜÀíÔ±¿ÉÒÔ½â³ý¼ÆËã»úËø¶¨¡£" - IDS_LOGONMSG "ÄúµÇÂ¼Îª %s¡£" - IDS_LOGONDATE "µÇÂ¼ÈÕÆÚ: %s %s" - IDS_COMPUTERLOCKED "Ëø¶¨¼ÆËã»ú" - IDS_LOCKEDWRONGPASSWORD "ÃÜÂëÊÇ´íÎóµÄ¡£ÇëÔÙ´ÎÊäÈëÄúµÄÃÜÂë¡£ÔÚÃÜÂëÖÐµÄ×ÖÄ¸±ØÐëÊ¹ÓÃÕýÈ·µÄ´óÐ¡Ð´¡£" - IDS_LOCKEDWRONGUSER "ÕâÌ¨¼ÆËã»ú±»Ëø¶¨¡£Ö»ÓÐ %s\\%s »òÕß¹ÜÀíÔ±¿ÉÒÔ½â³ý¼ÆËã»úËø¶¨¡£" - IDS_CHANGEPWDTITLE "¸ü¸ÄÃÜÂë" - IDS_NONMATCHINGPASSWORDS "Äú¼üÈëµÄÃÜÂë²»Æ¥Åä¡£ÔÚÕâÁ½¸öÎÄ±¾¿òÖÐ¼üÈëÏàÍ¬µÄÃÜÂë¡£" - IDS_PASSWORDCHANGED "ÄúµÄÃÜÂëÒÑ¸ü¸Ä¡£" - IDS_LOGONTITLE "µÇÂ¼ÏûÏ¢" - IDS_LOGONWRONGUSERORPWD "¸ÃÏµÍ³¿ÉÒÔ²»ÈÃÄúµÇÂ¼¡£ÇëÈ·±£ÄúµÄÓÃ»§Ãû¼°ÓòÎÞÎó£¬È»ºóÔÙ´Î¼üÈëÄúµÄÃÜÂë¡£ÔÚÃÜÂëÖÐµÄ×ÖÄ¸±ØÐëÊ¹ÓÃÕýÈ·µÄ´óÐ¡Ð´¡£" - IDS_LOGONUSERDISABLED "ÄúµÄÕÊ»§ÒÑ±»½ûÓÃ¡£Çë²ÎÔÄÄúµÄÏµÍ³¹ÜÀíÔ±¡£" - IDS_PASSWORDMUSTCHANGE "ÄúÐèÒª¸ü¸ÄÄúÔÚÊ×´ÎµÇÂ¼µÄÃÜÂë¡£" - IDS_PASSWORDEXPIRED "ÄúµÄÃÜÂëÒÑ¹ýÆÚ£¬±ØÐë¸ü¸Ä¡£" + IDS_LOGGEDOUTSAS "æ¬¢è¿!" + IDS_LOCKEDSAS "è®¡ç®æºå½åå·²éå®ã" + IDS_PRESSCTRLALTDELETE "æ Control+Alt+Delete ç»å½ã" + IDS_ASKFORUSER "ç¨æ·åç§°: " + IDS_ASKFORPASSWORD "å¯ç : " + IDS_FORCELOGOFF "è¿å°æ³¨éå½åç¨æ·ï¼å¹¶ä¸¢å¤±æªä¿åçæææ°æ®ãè¦ç»§ç»å?" + IDS_LOCKMSG "åªæ %s æç³»ç»ç®¡çåå¯ä»¥è§£é¤è®¡ç®æºéå®ã" + IDS_LOGONMSG "æ¨ç»å½ä¸º %sã" + IDS_LOGONDATE "ç»å½æ¥æ: %s %s" + IDS_COMPUTERLOCKED "éå®è®¡ç®æº" + IDS_LOCKEDWRONGPASSWORD "å¯ç æ¯éè¯¯çãè¯·åæ¬¡è¾å¥æ¨çå¯ç ãå¨å¯ç ä¸çåæ¯å¿é¡»ä½¿ç¨æ£ç¡®çå¤§å°åã" + IDS_LOCKEDWRONGUSER "è¿å°è®¡ç®æºè¢«éå®ãåªæ %s\\%s æèç®¡çåå¯ä»¥è§£é¤è®¡ç®æºéå®ã" + IDS_CHANGEPWDTITLE "æ´æ¹å¯ç " + IDS_NONMATCHINGPASSWORDS "æ¨é®å¥çå¯ç ä¸å¹éãå¨è¿ä¸¤ä¸ªææ¬æ¡ä¸é®å¥ç¸åçå¯ç ã" + IDS_PASSWORDCHANGED "æ¨çå¯ç å·²æ´æ¹ã" + IDS_LOGONTITLE "ç»å½æ¶æ¯" + IDS_LOGONWRONGUSERORPWD "è¯¥ç³»ç»å¯ä»¥ä¸è®©æ¨ç»å½ãè¯·ç¡®ä¿æ¨çç¨æ·åååæ è¯¯ï¼ç¶ååæ¬¡é®å¥æ¨çå¯ç ãå¨å¯ç ä¸çåæ¯å¿é¡»ä½¿ç¨æ£ç¡®çå¤§å°åã" + IDS_LOGONUSERDISABLED "æ¨çå¸æ·å·²è¢«ç¦ç¨ãè¯·åéæ¨çç³»ç»ç®¡çåã" + IDS_PASSWORDMUSTCHANGE "æ¨éè¦æ´æ¹æ¨å¨é¦æ¬¡ç»å½çå¯ç ã" + IDS_PASSWORDEXPIRED "æ¨çå¯ç å·²è¿æï¼å¿é¡»æ´æ¹ã" END /* Shutdown Dialog Strings */ STRINGTABLE BEGIN - IDS_SHUTDOWN_LOGOFF "×¢Ïú ""%S""" - IDS_SHUTDOWN_SHUTDOWN "¹Ø±Õ" - IDS_SHUTDOWN_RESTART "ÖØÐÂÆô¶¯" - IDS_SHUTDOWN_SLEEP "Ë¯Ãß×´Ì¬" - IDS_SHUTDOWN_HIBERNATE "ÐÝÃß×´Ì¬" + IDS_SHUTDOWN_LOGOFF "æ³¨é ""%S""" + IDS_SHUTDOWN_SHUTDOWN "å³é" + IDS_SHUTDOWN_RESTART "éæ°å¯å¨" + IDS_SHUTDOWN_SLEEP "ç¡ç ç¶æ" + IDS_SHUTDOWN_HIBERNATE "ä¼ç ç¶æ" /* Shut down descriptions */ - IDS_SHUTDOWN_LOGOFF_DESC "½áÊøµ±Ç°»á»°£¬²¢ÔÊÐíÆäËûÓÃ»§µÇÂ¼µ½ÏµÍ³ÉÏ¡£" - IDS_SHUTDOWN_SHUTDOWN_DESC "½áÊøµ±Ç°»á»°²¢¹Ø±ÕÏµÍ³£¬ÕâÑùÄú¿ÉÒÔ°²È«µØ¹Ø±ÕµçÔ´¡£" - IDS_SHUTDOWN_RESTART_DESC "½áÊøµ±Ç°»á»°²¢ÖØÐÂÒýµ¼ÏµÍ³¡£" - IDS_SHUTDOWN_SLEEP_DESC "Ê¹ÏµÍ³´¦ÓÚË¯ÃßÄ£Ê½¡£" - IDS_SHUTDOWN_HIBERNATE_DESC "±£´æµ±Ç°»á»°²¢¹Ø±Õ¼ÆËã»ú¡£" + IDS_SHUTDOWN_LOGOFF_DESC "ç»æå½åä¼è¯ï¼å¹¶åè®¸å¶ä»ç¨æ·ç»å½å°ç³»ç»ä¸ã" + IDS_SHUTDOWN_SHUTDOWN_DESC "ç»æå½åä¼è¯å¹¶å³éç³»ç»ï¼è¿æ ·æ¨å¯ä»¥å®å¨å°å³éçµæºã" + IDS_SHUTDOWN_RESTART_DESC "ç»æå½åä¼è¯å¹¶éæ°å¼å¯¼ç³»ç»ã" + IDS_SHUTDOWN_SLEEP_DESC "ä½¿ç³»ç»å¤äºç¡ç æ¨¡å¼ã" + IDS_SHUTDOWN_HIBERNATE_DESC "ä¿åå½åä¼è¯å¹¶å³éè®¡ç®æºã" END Added: trunk/reactos/dll/win32/mycomput/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/mycomput/lang/zh-CN.rc (added) +++ trunk/reactos/dll/win32/mycomput/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -0,0 +1,8 @@ +/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_MANAGE "ç®¡ç" +END Propchange: trunk/reactos/dll/win32/mycomput/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/mycompu… ============================================================================== --- trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -33,3 +33,6 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Modified: trunk/reactos/dll/win32/netid/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/zh-CN… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,79 +4,79 @@ IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "¼ÆËã»úÃû³Æ" +CAPTION "è®¡ç®æºåç§°" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS Ê¹ÓÃÒÔÏÂÐÅÏ¢À´±êÊ¶ÄúµÄ¼ÆËã»úÔÚÍøÂçÉÏ¡£", IDC_STATIC, 40, 5, 204, 20 - LTEXT "¼ÆËã»úÃèÊö:", IDC_STATIC, 6, 40, 90, 9 + LTEXT "ReactOS ä½¿ç¨ä»¥ä¸ä¿¡æ¯æ¥æ è¯æ¨çè®¡ç®æºå¨ç½ç»ä¸ã", IDC_STATIC, 40, 5, 204, 20 + LTEXT "è®¡ç®æºæè¿°:", IDC_STATIC, 6, 40, 90, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "ÍêÕûµÄ¼ÆËã»úÃû³Æ:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "å®æ´çè®¡ç®æºåç§°:", IDC_STATIC, 6, 68, 85, 9 EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "¹¤×÷×é:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "å·¥ä½ç»:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "ÒªÊ¹ÓÃÍøÂçÊ¶±ðÏòµ¼È¥¼ÓÈëÓò²¢´´½¨±¾µØÓÃ»§£¬Çëµ¥»÷""ÍøÂç ID"".", IDC_STATIC, 6, 113, 172, 24 - PUSHBUTTON "ÍøÂç ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "ÈôÒªÖØÃüÃû´Ë¼ÆËã»ú»ò¼ÓÈëÓò£¬Çëµ¥»÷""¸ü¸Ä""¡£", IDC_STATIC, 6, 149, 170, 17 - PUSHBUTTON "¸ü¸Ä...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "×¢Òâ: Ö»ÓÐ¹ÜÀíÔ±²Å¿ÉÒÔ¸ü¸Ä´Ë¼ÆËã»úµÄ±êÊ¶¡£", IDC_STATIC, 6, 179, 300, 9 + LTEXT "è¦ä½¿ç¨ç½ç»è¯å«åå¯¼å»å å¥åå¹¶åå»ºæ¬å°ç¨æ·ï¼è¯·åå»""ç½ç» ID"".", IDC_STATIC, 6, 113, 172, 24 + PUSHBUTTON "ç½ç» ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "è¥è¦éå½åæ¤è®¡ç®æºæå å¥åï¼è¯·åå»""æ´æ¹""ã", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "æ´æ¹...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "æ³¨æ: åªæç®¡çåæå¯ä»¥æ´æ¹æ¤è®¡ç®æºçæ è¯ã", IDC_STATIC, 6, 179, 300, 9 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "¼ÆËã»úÃû³Æ¸ü¸Ä" +CAPTION "è®¡ç®æºåç§°æ´æ¹" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "(´Ë´¦ÏÔÊ¾ÏûÏ¢)", 1017, 7, 5, 218, 30 - LTEXT "¼ÆËã»úÃû³Æ:(&C)", -1, 7, 41, 219, 8 + LTEXT "(æ¤å¤æ¾ç¤ºæ¶æ¯)", 1017, 7, 5, 218, 30 + LTEXT "è®¡ç®æºåç§°:(&C)", -1, 7, 41, 219, 8 EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "ÍêÕûµÄ¼ÆËã»úÃû³Æ:", 1016, 7, 72, 218, 10 + LTEXT "å®æ´çè®¡ç®æºåç§°:", 1016, 7, 72, 218, 10 EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "¸ü¶à...(&M)", 1003, 150, 102, 75, 14 - GROUPBOX "³ÉÔ±", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "Óò:(&D)", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "¹¤×÷×é:(&W)", 1004, 17, 161, 191, 10 + PUSHBUTTON "æ´å¤...(&M)", 1003, 150, 102, 75, 14 + GROUPBOX "æå", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "å:(&D)", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "å·¥ä½ç»:(&W)", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "ÕÒÎÒµÄÓòÃû(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "æ¾æçåå(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT - DEFPUSHBUTTON "È·¶¨", 1, 121, 203, 50, 14, WS_GROUP - PUSHBUTTON "È¡Ïû", 2, 176, 203, 50, 14 + DEFPUSHBUTTON "ç¡®å®", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "åæ¶", 2, 176, 203, 50, 14 END IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS ºó×ººÍ NetBIOS ¼ÆËã»úÃû" +CAPTION "DNS åç¼å NetBIOS è®¡ç®æºå" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "´Ë¼ÆËã»úµÄÖ÷ DNS ºó×º:(&P)", -1, 7, 5, 253, 8 + LTEXT "æ¤è®¡ç®æºçä¸» DNS åç¼:(&P)", -1, 7, 5, 253, 8 EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "Óò³ÉÔ±Éí·Ý±ä»¯Ê±£¬¸ü¸ÄÖ÷ DNS ºó×º(&C)", 115, 11, 39, 250, 10 - LTEXT "¼ÆËã»úµÄ NetBIOS Ãû³Æ:(&N)", -1, 7, 57, 148, 8 + AUTOCHECKBOX "åæåèº«ä»½ååæ¶ï¼æ´æ¹ä¸» DNS åç¼(&C)", 115, 11, 39, 250, 10 + LTEXT "è®¡ç®æºç NetBIOS åç§°:(&N)", -1, 7, 57, 148, 8 EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY - DEFPUSHBUTTON "È·¶¨", 1, 153, 104, 50, 14 - PUSHBUTTON "È¡Ïû", 2, 209, 104, 50, 14 - LTEXT "´ËÃû³ÆÓÃÓÚÓë½Ï¾ÉµÄ¼ÆËã»úºÍ·þÎñ»¥²Ù×÷ÐÔ¡£", 13, 7, 88, 253, 8 + DEFPUSHBUTTON "ç¡®å®", 1, 153, 104, 50, 14 + PUSHBUTTON "åæ¶", 2, 209, 104, 50, 14 + LTEXT "æ¤åç§°ç¨äºä¸è¾æ§çè®¡ç®æºåæå¡äºæä½æ§ã", 13, 7, 88, 253, 8 END STRINGTABLE BEGIN - 1 "* Î´Öª *" + 1 "* æªç¥ *" 2 "WORKGROUP" - 3 "³¢ÊÔ¶ÁÈ¡Óò³ÉÔ±Éí·ÝÐÅÏ¢Ê±³öÏÖÒÔÏÂ´íÎó:" - 4 "¼ÆËã»úÃû³Æ¸ü¸Ä" - 5 "¹¤×÷×é:" - 6 "Óò:" - 22 "»¶Óµ½ %1 ¹¤×÷×é¡£" - 23 "»¶Óµ½Óò %1¡£" - 24 "Äú±ØÐëÖØÐÂÆô¶¯¸Ã¼ÆËã»úÒÔÊ¹¸ü¸ÄÉúÐ§¡£" - 25 "Äú¿ÉÒÔ¸ü¸ÄÃû³ÆºÍÕâÌ¨¼ÆËã»úµÄ»áÔ±¡£¸ü¸Ä¿ÉÄÜ»áÓ°Ïì¶ÔÍøÂç×ÊÔ´µÄ·ÃÎÊ¡£" - 1021 "×¢Òâ: Ö»ÓÐ¹ÜÀíÔ±²Å¿ÉÒÔ¸ü¸Ä´Ë¼ÆËã»úµÄ±êÊ¶¡£" - 1022 "×¢Òâ: ²»ÄÜ¸ü¸Ä¼ÆËã»úµÄ±êÊ¶£¬ÒòÎª:" - 1030 "ÐÂµÄ¼ÆËã»úÃû³Æ ""%s"" °üº¬²»ÔÊÐíÊ¹ÓÃµÄ×Ö·û¡£²»ÔÊÐíÊ¹ÓÃµÄ×Ö·û°üÀ¨ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" + 3 "å°è¯è¯»ååæåèº«ä»½ä¿¡æ¯æ¶åºç°ä»¥ä¸éè¯¯:" + 4 "è®¡ç®æºåç§°æ´æ¹" + 5 "å·¥ä½ç»:" + 6 "å:" + 22 "æ¬¢è¿å° %1 å·¥ä½ç»ã" + 23 "æ¬¢è¿å°å %1ã" + 24 "æ¨å¿é¡»éæ°å¯å¨è¯¥è®¡ç®æºä»¥ä½¿æ´æ¹çæã" + 25 "æ¨å¯ä»¥æ´æ¹åç§°åè¿å°è®¡ç®æºçä¼åãæ´æ¹å¯è½ä¼å½±åå¯¹ç½ç»èµæºçè®¿é®ã" + 1021 "æ³¨æ: åªæç®¡çåæå¯ä»¥æ´æ¹æ¤è®¡ç®æºçæ è¯ã" + 1022 "æ³¨æ: ä¸è½æ´æ¹è®¡ç®æºçæ è¯ï¼å ä¸º:" + 1030 "æ°çè®¡ç®æºåç§° ""%s"" åå«ä¸åè®¸ä½¿ç¨çåç¬¦ãä¸åè®¸ä½¿ç¨çåç¬¦åæ¬ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" /* Windows allows using these characters, although it displays a warning message. Forbidding the use of these characters means incompatibility with Windows. */ - 3210 "ÏêÏ¸ÐÅÏ¢(&D) >>" - 3220 "<< ÏêÏ¸ÐÅÏ¢(&D)" - 4000 "ÐÅÏ¢" - 4001 "²»ÄÜÉèÖÃÐÂ¼ÆËã»úÃû³Æ!" + 3210 "è¯¦ç»ä¿¡æ¯(&D) >>" + 3220 "<< è¯¦ç»ä¿¡æ¯(&D)" + 4000 "ä¿¡æ¯" + 4001 "ä¸è½è®¾ç½®æ°è®¡ç®æºåç§°!" END Modified: trunk/reactos/dll/win32/serialui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/serialui/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,18 +4,18 @@ STRINGTABLE BEGIN - IDS_EVENPARITY "Å¼Ð£Ñé" - IDS_MARKPARITY "Âí¿ËÐ£Ñé" - IDS_NOPARITY "ÎÞÆæÅ¼Ð£Ñé" - IDS_ODDPARITY "ÆæÐ£Ñé" - IDS_SPACEPARITY "¿Õ¼äÆæÅ¼Ð£Ñé" - IDS_ONESTOPBIT "1 ¸öÍ£Ö¹Î»" - IDS_ONE5STOPBITS "1.5 Í£Ö¹Î»" - IDS_TWOSTOPBITS "2 Í£Ö¹Î»" - IDS_FC_NO "·ñ" + IDS_EVENPARITY "å¶æ ¡éª" + IDS_MARKPARITY "é©¬åæ ¡éª" + IDS_NOPARITY "æ å¥å¶æ ¡éª" + IDS_ODDPARITY "å¥æ ¡éª" + IDS_SPACEPARITY "ç©ºé´å¥å¶æ ¡éª" + IDS_ONESTOPBIT "1 ä¸ªåæ¢ä½" + IDS_ONE5STOPBITS "1.5 åæ¢ä½" + IDS_TWOSTOPBITS "2 åæ¢ä½" + IDS_FC_NO "å¦" IDS_FC_CTSRTS "CTS/RTS" IDS_FC_XONXOFF "XON/XOFF" - IDS_TITLE "%s µÄÊôÐÔ" + IDS_TITLE "%s çå±æ§" END IDD_COMMDLG DIALOGEX 6, 5, 222, 175 @@ -24,13 +24,13 @@ EXSTYLE 0x00000001 BEGIN CONTROL "", IDC_GRP1, "Button", 0x50000007, 6, 5, 210, 146, 0x00000000 - CONTROL "È·¶¨", IDC_OKBTN, "Button", 0x50010000, 98, 156, 56, 13, 0x00000000 - CONTROL "È¡Ïû", IDC_CANCELBTN, "Button", 0x50010000, 158, 156, 56, 13, 0x00000000 - CONTROL "²¨ÌØÂÊ:", IDC_STC1, "Static", 0x50000000, 24, 31, 42, 9, 0x00000000 - CONTROL "×Ö½Ú´óÐ¡:", IDC_STC2, "Static", 0x50000000, 24, 53, 42, 9, 0x00000000 - CONTROL "ÆæÅ¼Ð£Ñé:", IDC_STC3, "Static", 0x50000000, 24, 73, 42, 9, 0x00000000 - CONTROL "Í£Ö¹Î»:", IDC_STC4, "Static", 0x50000000, 24, 96, 42, 9, 0x00000000 - CONTROL "Á÷Á¿¿ØÖÆ:", IDC_STC5, "Static", 0x50000000, 24, 120, 42, 9, 0x00000000 + CONTROL "ç¡®å®", IDC_OKBTN, "Button", 0x50010000, 98, 156, 56, 13, 0x00000000 + CONTROL "åæ¶", IDC_CANCELBTN, "Button", 0x50010000, 158, 156, 56, 13, 0x00000000 + CONTROL "æ³¢ç¹ç:", IDC_STC1, "Static", 0x50000000, 24, 31, 42, 9, 0x00000000 + CONTROL "åèå¤§å°:", IDC_STC2, "Static", 0x50000000, 24, 53, 42, 9, 0x00000000 + CONTROL "å¥å¶æ ¡éª:", IDC_STC3, "Static", 0x50000000, 24, 73, 42, 9, 0x00000000 + CONTROL "åæ¢ä½:", IDC_STC4, "Static", 0x50000000, 24, 96, 42, 9, 0x00000000 + CONTROL "æµéæ§å¶:", IDC_STC5, "Static", 0x50000000, 24, 120, 42, 9, 0x00000000 CONTROL "", IDC_BAUDRATE, "ComboBox", 0x50210003, 98, 29, 100, 50, 0x00000000 CONTROL "", IDC_BYTESIZE, "ComboBox", 0x50210003, 98, 49, 100, 50, 0x00000000 CONTROL "", IDC_PARITY, "ComboBox", 0x50210003, 98, 72, 100, 50, 0x00000000 Modified: trunk/reactos/dll/win32/shimgvw/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,16 +4,16 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Í¼Æ¬ºÍ´«Õæ²é¿´Æ÷" - IDS_SETASDESKBG "ÉèÖÃÎª×ÀÃæ±³¾°" - IDS_PREVIEW "Ô¤ÀÀ" + IDS_APPTITLE "ReactOS å¾çåä¼ çæ¥çå¨" + IDS_SETASDESKBG "è®¾ç½®ä¸ºæ¡é¢èæ¯" + IDS_PREVIEW "é¢è§" /* Tooltips */ - IDS_TOOLTIP_NEXT_PIC "ÏÂÒ»ÕÅÍ¼Æ¬" - IDS_TOOLTIP_PREV_PIC "ÉÏÒ»ÕÅÍ¼Æ¬" - IDS_TOOLTIP_ZOOM_IN "·Å´ó (+)" - IDS_TOOLTIP_ZOOM_OUT "ËõÐ¡ (-)" - IDS_TOOLTIP_ROT_CLOCKW "Ðý×ªË³Ê±Õë (Ctrl+K)" - IDS_TOOLTIP_ROT_COUNCW "Ðý×ªÄæÊ±Õë (Ctrl+L)" - IDS_TOOLTIP_PRINT "´òÓ¡ (Ctrl+P)" - IDS_TOOLTIP_SAVEAS "Áí´æÎª...(Ctrl+S)" + IDS_TOOLTIP_NEXT_PIC "ä¸ä¸å¼ å¾ç" + IDS_TOOLTIP_PREV_PIC "ä¸ä¸å¼ å¾ç" + IDS_TOOLTIP_ZOOM_IN "æ¾å¤§ (+)" + IDS_TOOLTIP_ZOOM_OUT "ç¼©å° (-)" + IDS_TOOLTIP_ROT_CLOCKW "æè½¬é¡ºæ¶é (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "æè½¬éæ¶é (Ctrl+L)" + IDS_TOOLTIP_PRINT "æå° (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "å¦åä¸º...(Ctrl+S)" END Modified: trunk/reactos/media/themes/lautus.msstyles/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lang/zh-CN.rc [iso-8859-1] Mon Aug 17 14:30:57 2015 @@ -4,36 +4,36 @@ STRINGTABLE { -1000, "ÑÇÌØ" +1000, "äºç¹" } STRINGTABLE { -2000, "ÀÚ²ÓÑÇÌØ" +2000, "ç£ç¿äºç¹" } STRINGTABLE { -3000, "Ò»°ã" -3001, "´ó×ÖÌå" -3002, "ÌØ´ó×ÖÌå" +3000, "ä¸è¬" +3001, "å¤§åä½" +3002, "ç¹å¤§åä½" } STRINGTABLE { -4000, "Ò»°ã" -4001, "´ó×ÖÌå" -4002, "ÌØ´ó×ÖÌå" +4000, "ä¸è¬" +4001, "å¤§åä½" +4002, "ç¹å¤§åä½" } STRINGTABLE { -5000, "ÀÚ²Ó" -5001, "ÊÓ¾õÑùÊ½" +5000, "ç£ç¿" +5001, "è§è§æ ·å¼" 5002, "ReactOS Foundation" -5003, "Pisarz, »ùÓÚ Luna Inspirat" -5004, "¸ù¾Ý GNU/GPL 2.0, 2011 ÊÍ·Å" +5003, "Pisarz, åºäº Luna Inspirat" +5004, "æ ¹æ® GNU/GPL 2.0, 2011 éæ¾" 5005, "http://www.reactos.org" 5006, "1.0" -5007, "ReactOS µÄÊÓ¾õÑùÊ½" +5007, "ReactOS çè§è§æ ·å¼" }

9 years, 4 months

[tfaber] 68739: [QMGR] - Do not omit mandatory argument to WriteFile. Fixes crash in qmgr_winetest:job

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Aug 17 14:21:13 2015 New Revision: 68739 URL: http://svn.reactos.org/svn/reactos?rev=68739&view=rev Log: [QMGR] - Do not omit mandatory argument to WriteFile. Fixes crash in qmgr_winetest:job Modified: trunk/reactos/dll/win32/qmgr/file.c Modified: trunk/reactos/dll/win32/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] Mon Aug 17 14:21:13 2015 @@ -365,6 +365,7 @@ DWORD flags = (uc->nScheme == INTERNET_SCHEME_HTTPS) ? WINHTTP_FLAG_SECURE : 0; char buf[4096]; BOOL ret = FALSE; + DWORD written; transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_CONNECTING); @@ -397,7 +398,7 @@ break; } if (!file->read_size) break; - if (!(ret = WriteFile(handle, buf, file->read_size, NULL, NULL))) break; + if (!(ret = WriteFile(handle, buf, file->read_size, &written, NULL))) break; EnterCriticalSection(&job->cs); file->fileProgress.BytesTransferred += file->read_size;

9 years, 4 months

[gadamopoulos] 68738: [SHELL32] - Fix a regression in SHELL32_GetFSItemAttributes found by our tests.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 13:34:38 2015 New Revision: 68738 URL: http://svn.reactos.org/svn/reactos?rev=68738&view=rev Log: [SHELL32] - Fix a regression in SHELL32_GetFSItemAttributes found by our tests. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Aug 17 13:34:38 2015 @@ -572,6 +572,13 @@ { DWORD dwAttributes; + if (!_ILIsFolder(pidl) && !_ILIsValue(pidl)) + { + ERR("Got wrong type of pidl!\n"); + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; + } + if (*pdwAttributes & ~dwSupportedAttr) { WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); @@ -579,12 +586,6 @@ } dwAttributes = _ILGetFileAttributes(pidl, NULL, 0); - if (!dwAttributes) - { - ERR("Got 0 attrs!\n"); - *pdwAttributes &= SFGAO_CANLINK; - return S_OK; - } /* Set common attributes */ *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE |

9 years, 4 months

[gadamopoulos] 68737: [SHELL32] - Remove unused function

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 13:18:18 2015 New Revision: 68737 URL: http://svn.reactos.org/svn/reactos?rev=68737&view=rev Log: [SHELL32] - Remove unused function Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 17 13:18:18 2015 @@ -132,18 +132,6 @@ } return Result; -} - -static VOID -SetNamespaceExtensionVisibleStatus(const WCHAR * iid, DWORD dwStatus) -{ - HKEY hKey; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, ClassicStartMenuW, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey, iid, 0, REG_DWORD, (LPBYTE)&dwStatus, sizeof(DWORD)); - RegCloseKey(hKey); - } } /**************************************************************************

9 years, 4 months

[gadamopoulos] 68736: [SHELL32] - CDesktopFolder: Create two interal fs folders that wiill eventually take care of all file support for the desktop folder. - Implement some methods using the intern...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Aug 17 12:55:37 2015 New Revision: 68736 URL: http://svn.reactos.org/svn/reactos?rev=68736&view=rev Log: [SHELL32] - CDesktopFolder: Create two interal fs folders that wiill eventually take care of all file support for the desktop folder. - Implement some methods using the internal fs folders. Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 17 12:55:37 2015 @@ -292,11 +292,41 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct() { WCHAR szMyPath[MAX_PATH]; + HRESULT hr; + CComPtr<IPersistFolder3> ppf3; + + /* Create the root pidl */ + pidlRoot = _ILCreateDesktop(); + + /* Create the inner fs folder */ + hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_DesktopFSFolder)); + if (FAILED(hr)) + return hr; + + hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)); + if (FAILED(hr)) + return hr; + + PERSIST_FOLDER_TARGET_INFO info; + ZeroMemory(&info, sizeof(PERSIST_FOLDER_TARGET_INFO)); + info.csidl = CSIDL_DESKTOPDIRECTORY; + hr = ppf3->InitializeEx(NULL, pidlRoot, &info); + + /* Create the inner shared fs folder */ + hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_SharedDesktopFSFolder)); + if (FAILED(hr)) + return hr; + + hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)); + if (FAILED(hr)) + return hr; + + info.csidl = CSIDL_COMMON_DESKTOPDIRECTORY; + hr = ppf3->InitializeEx(NULL, pidlRoot, &info); if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE )) return E_UNEXPECTED; - pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ sPathTarget = (LPWSTR)SHAlloc((wcslen(szMyPath) + 1) * sizeof(WCHAR)); wcscpy(sPathTarget, szMyPath); return S_OK; @@ -380,26 +410,14 @@ } else { - /* it's a filesystem path on the desktop. Let a FSFolder parse it */ - if (*lpszDisplayName) { - WCHAR szPath[MAX_PATH]; - LPWSTR pathPtr; - - /* build a complete path to create a simple pidl */ - lstrcpynW(szPath, sPathTarget, MAX_PATH); - pathPtr = PathAddBackslashW(szPath); - if (pathPtr) - { - lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); - hr = _ILCreateFromPathW(szPath, &pidlTemp); - } - else - { - /* should never reach here, but for completeness */ - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - } + /* it's a filesystem path on the desktop. Let a FSFolder parse it */ + hr = m_DesktopFSFolder->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + if (SUCCEEDED(hr)) + return hr; + + return m_SharedDesktopFSFolder->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } else pidlTemp = _ILCreateMyComputer(); @@ -476,12 +494,10 @@ */ HRESULT WINAPI CDesktopFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs ((IShellFolder *)this, lParam, pidl1, pidl2); - TRACE ("-- %i\n", nReturn); - return nReturn; + if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) + return SHELL32_CompareIDs ((IShellFolder *)this, lParam, pidl1, pidl2); + + return m_DesktopFSFolder->CompareIDs(lParam, pidl1, pidl2); } /************************************************************************** @@ -565,7 +581,7 @@ else if (_ILIsNetHood(apidl[i])) *rgfInOut &= dwMyNetPlacesAttributes; else if (_ILIsSpecialFolder(apidl[i])) - SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); + SHELL32_GetGuidItemAttributes(this, apidl[i], rgfInOut); else if(_ILIsFolder(apidl[i]) || _ILIsValue(apidl[i])) SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); else @@ -1044,289 +1060,37 @@ HRESULT WINAPI CDesktopFolder::GetUniqueName(LPWSTR pwszName, UINT uLen) { - CComPtr<IEnumIDList> penum; - HRESULT hr; - WCHAR wszText[MAX_PATH]; - WCHAR wszNewFolder[25]; - const WCHAR wszFormat[] = {'%', 's', ' ', '%', 'd', 0 }; - - LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, sizeof(wszNewFolder) / sizeof(WCHAR)); - - TRACE ("(%p)(%p %u)\n", this, pwszName, uLen); - - if (uLen < sizeof(wszNewFolder) / sizeof(WCHAR) + 3) - return E_POINTER; - - lstrcpynW (pwszName, wszNewFolder, uLen); - - hr = EnumObjects(0, - SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); - if (penum) { - LPITEMIDLIST pidl; - DWORD dwFetched; - int i = 1; - -next: - penum->Reset (); - while (S_OK == penum->Next(1, &pidl, &dwFetched) && - dwFetched) { - _ILSimpleGetTextW (pidl, wszText, MAX_PATH); - if (0 == lstrcmpiW (wszText, pwszName)) { - _snwprintf (pwszName, uLen, wszFormat, wszNewFolder, i++); - if (i > 99) { - hr = E_FAIL; - break; - } - goto next; - } - } - - } - return hr; + CComPtr<ISFHelper> psfHelper; + HRESULT hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfHelper)); + if (FAILED(hr)) + return hr; + + return psfHelper->GetUniqueName(pwszName, uLen); } HRESULT WINAPI CDesktopFolder::AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut) { - WCHAR wszNewDir[MAX_PATH]; - DWORD bRes; - HRESULT hres = E_FAIL; - - TRACE ("(%p)(%s %p)\n", this, debugstr_w(pwszName), ppidlOut); - - wszNewDir[0] = 0; - if (sPathTarget) - lstrcpynW(wszNewDir, sPathTarget, MAX_PATH); - PathAppendW(wszNewDir, pwszName); - bRes = CreateDirectoryW (wszNewDir, NULL); - if (bRes) - { - SHChangeNotify (SHCNE_MKDIR, SHCNF_PATHW, wszNewDir, NULL); - hres = S_OK; - if (ppidlOut) - hres = _ILCreateFromPathW(wszNewDir, ppidlOut); - } - - return hres; + CComPtr<ISFHelper> psfHelper; + HRESULT hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfHelper)); + if (FAILED(hr)) + return hr; + + return psfHelper->AddFolder(hwnd, pwszName, ppidlOut); } HRESULT WINAPI CDesktopFolder::DeleteItems(UINT cidl, LPCITEMIDLIST *apidl) { - UINT i; - SHFILEOPSTRUCTW op; - WCHAR wszPath[MAX_PATH]; - WCHAR wszCaption[50]; - WCHAR *wszPathsList; - HRESULT ret; - WCHAR *wszCurrentPath; - UINT bRestoreWithDeskCpl = FALSE; - int res; - - TRACE ("(%p)(%u %p)\n", this, cidl, apidl); - if (cidl == 0) return S_OK; - - for(i = 0; i < cidl; i++) - { - if (_ILIsMyComputer(apidl[i])) - bRestoreWithDeskCpl++; - else if (_ILIsNetHood(apidl[i])) - bRestoreWithDeskCpl++; - else if (_ILIsMyDocuments(apidl[i])) - bRestoreWithDeskCpl++; - } - - if (bRestoreWithDeskCpl) - { - /* FIXME use FormatMessage - * use a similar message resource as in windows - */ - LoadStringW(shell32_hInstance, IDS_DELETEMULTIPLE_TEXT, wszPath, sizeof(wszPath) / sizeof(WCHAR)); - wszPath[(sizeof(wszPath)/sizeof(WCHAR))-1] = 0; - - LoadStringW(shell32_hInstance, IDS_DELETEITEM_CAPTION, wszCaption, sizeof(wszCaption) / sizeof(WCHAR)); - wszCaption[(sizeof(wszCaption)/sizeof(WCHAR))-1] = 0; - - res = SHELL_ConfirmMsgBox(GetActiveWindow(), wszPath, wszCaption, NULL, cidl > 1); - if (res == IDC_YESTOALL || res == IDYES) - { - for(i = 0; i < cidl; i++) - { - if (_ILIsMyComputer(apidl[i])) - SetNamespaceExtensionVisibleStatus(L"{20D04FE0-3AEA-1069-A2D8-08002B30309D}", 0x1); - else if (_ILIsNetHood(apidl[i])) - SetNamespaceExtensionVisibleStatus(L"{208D2C60-3AEA-1069-A2D7-08002B30309D}", 0x1); - else if (_ILIsMyDocuments(apidl[i])) - SetNamespaceExtensionVisibleStatus(L"{450D8FBA-AD25-11D0-98A8-0800361B1103}", 0x1); - } - } - } - if (sPathTarget) - lstrcpynW(wszPath, sPathTarget, MAX_PATH); - else - wszPath[0] = '\0'; - - PathAddBackslashW(wszPath); - wszPathsList = BuildPathsList(wszPath, cidl, apidl); - - ZeroMemory(&op, sizeof(op)); - op.hwnd = GetActiveWindow(); - op.wFunc = FO_DELETE; - op.pFrom = wszPathsList; - op.fFlags = FOF_ALLOWUNDO; - if (SHFileOperationW(&op)) - { - WARN("SHFileOperation failed\n"); - ret = E_FAIL; - } - else - ret = S_OK; - - /* we currently need to manually send the notifies */ - wszCurrentPath = wszPathsList; - for (i = 0; i < cidl; i++) - { - LONG wEventId; - - if (_ILIsFolder(apidl[i])) - wEventId = SHCNE_RMDIR; - else if (_ILIsValue(apidl[i])) - wEventId = SHCNE_DELETE; - else - continue; - - /* check if file exists */ - if (GetFileAttributesW(wszCurrentPath) == INVALID_FILE_ATTRIBUTES) - { - LPITEMIDLIST pidl = ILCombine(pidlRoot, apidl[i]); - SHChangeNotify(wEventId, SHCNF_IDLIST, pidl, NULL); - SHFree(pidl); - } - - wszCurrentPath += wcslen(wszCurrentPath) + 1; - } - HeapFree(GetProcessHeap(), 0, wszPathsList); - return ret; + return E_NOTIMPL; } HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy) { - CComPtr<IPersistFolder2> ppf2; - WCHAR szSrcPath[MAX_PATH]; - WCHAR szTargetPath[MAX_PATH]; - SHFILEOPSTRUCTW op; - LPITEMIDLIST pidl; - LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; - int res, length; - STRRET strRet; - - TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); - - pSFFrom->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (ppf2) - { - if (FAILED(ppf2->GetCurFolder(&pidl))) - return E_FAIL; - - if (FAILED(pSFFrom->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strRet))) - { - SHFree (pidl); - return E_FAIL; - } - - if (FAILED(StrRetToBufW(&strRet, pidl, szSrcPath, MAX_PATH))) - { - SHFree (pidl); - return E_FAIL; - } - SHFree (pidl); - - pszSrc = PathAddBackslashW (szSrcPath); - - wcscpy(szTargetPath, sPathTarget); - pszTarget = PathAddBackslashW (szTargetPath); - - pszSrcList = BuildPathsList(szSrcPath, cidl, apidl); - pszTargetList = BuildPathsList(szTargetPath, cidl, apidl); - - if (!pszSrcList || !pszTargetList) - { - if (pszSrcList) - HeapFree(GetProcessHeap(), 0, pszSrcList); - - if (pszTargetList) - HeapFree(GetProcessHeap(), 0, pszTargetList); - - SHFree (pidl); - return E_OUTOFMEMORY; - } - ZeroMemory(&op, sizeof(op)); - if (!pszSrcList[0]) - { - /* remove trailing backslash */ - pszSrc--; - pszSrc[0] = L'\0'; - op.pFrom = szSrcPath; - } - else - { - op.pFrom = pszSrcList; - } - - if (!pszTargetList[0]) - { - /* remove trailing backslash */ - if (pszTarget - szTargetPath > 3) - { - pszTarget--; - pszTarget[0] = L'\0'; - } - else - { - pszTarget[1] = L'\0'; - } - - op.pTo = szTargetPath; - op.fFlags = 0; - } - else - { - op.pTo = pszTargetList; - op.fFlags = FOF_MULTIDESTFILES; - } - op.hwnd = GetActiveWindow(); - op.wFunc = bCopy ? FO_COPY : FO_MOVE; - op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - - res = SHFileOperationW(&op); - - if (res == DE_SAMEFILE) - { - length = wcslen(szTargetPath); - - - pszFileName = wcsrchr(pszSrcList, '\\'); - pszFileName++; - - if (LoadStringW(shell32_hInstance, IDS_COPY_OF, pszTarget, MAX_PATH - length)) - { - wcscat(szTargetPath, L" "); - } - - wcscat(szTargetPath, pszFileName); - op.pTo = szTargetPath; - - res = SHFileOperationW(&op); - } - - - HeapFree(GetProcessHeap(), 0, pszSrcList); - HeapFree(GetProcessHeap(), 0, pszTargetList); - - if (res) - return E_FAIL; - else - return S_OK; - } - return E_FAIL; + CComPtr<ISFHelper> psfHelper; + HRESULT hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfHelper)); + if (FAILED(hr)) + return hr; + + return psfHelper->CopyItems(pSFFrom, cidl, apidl, bCopy); } /**************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] Mon Aug 17 12:55:37 2015 @@ -32,6 +32,9 @@ { private: /* both paths are parsible from the desktop */ + CComPtr<IShellFolder> m_DesktopFSFolder; + CComPtr<IShellFolder> m_SharedDesktopFSFolder; + LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */

9 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
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 2015