diff --git a/CMakeLists.txt b/CMakeLists.txt index b25e158ae45..4741020af4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,22 @@ endif() project(REACTOS) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.1") + message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}") + endif() +elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS "8.4") + message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}") + endif() +elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS "19.0") # v14 (2015) + message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}") + endif() +else() + message(WARNING "Unknown ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} compiler, skipping compiler version check...") +endif() + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_SHARED_LIBRARY_PREFIX "") @@ -76,9 +92,9 @@ add_definitions( # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime. file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR}) -if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") - OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0"))) - # Thankfully, GCC has this +if(NOT MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" + OR CMAKE_C_COMPILER_ID STREQUAL "Clang")) + # Thankfully, CLANG and GCC have this add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=) add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=) else() @@ -141,9 +157,7 @@ if(NOT CMAKE_CROSSCOMPILING) elseif(ARCH STREQUAL "amd64") add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS) endif() - if(MSVC_VERSION GREATER 1699) - add_definitions(/D_ALLOW_KEYWORD_MACROS) - endif() + add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() add_subdirectory(sdk/include/host) diff --git a/README.md b/README.md index 67c367f8c63..ce9476330c4 100644 --- a/README.md +++ b/README.md @@ -1,136 +1,66 @@ -

- - ReactOS - -

---- +What is Windivs? -

- - ReactOS 0.4.14 Release - - - Download ReactOS - - - SourceForge Download - - - License - - - Donate - - - Follow on Twitter - -

+Windivs™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7). -## Quick Links -[Website](https://reactos.org/) • -[Official chat](https://chat.reactos.org/) • -[Wiki](https://reactos.org/wiki/) • -[Forum](https://reactos.org/forum/) • -[Community Discord](https://discord.gg/7knjvhT) • -[JIRA Bug Tracker](https://jira.reactos.org/issues/) • -[ReactOS Git mirror](https://git.reactos.org/) • -[Testman](https://reactos.org/testman/) +The Windivs project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. -## What is ReactOS? +The code of Windivs is licensed under GNU GPL 2.0. -ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7). +Product quality warning +Windivs is currently an Alpha quality operating system. This means that Windivs is under heavy development, and you have to be ready to encounter some problems. Different things may not work well, and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test Windivs on a virtual machine or on a computer with no sensitive or critical data! -The ReactOS project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. +Building +Build rosbewin.badge rosbeunix.badge coverity.badge -The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING). +To build the system, it is strongly advised to use the Windivs Build Environment (WinBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: "Build Environment". -### Product quality warning +Alternatively, one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: "Visual Studio or Microsoft Visual C++". -**ReactOS is currently an Alpha quality operating system.** This means that ReactOS is under heavy development and you have to be ready to encounter some problems. Different things may not work well and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data! +See the "Building Windivs" article for more details. -## Building +Binaries +To build Windivs, you must run the configure script in the directory you want to have your build files. Choose configure.cmd or configure.sh depending on your system. Then run ninja to build a module you want or just ninja to build all modules. -![Build](https://github.com/reactos/reactos/workflows/Build/badge.svg) [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link] +Bootable images +To build a bootable CD image, run ninja bootcd from the build directory. This will create a CD image with a filename bootcd.iso. -To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ -Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). +You can always download fresh binary builds of bootable images from the "Daily builds" page. -Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). +Installing +By default, Windivs currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. The partition on which Windivs is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. Windivs Setup can format the partitions if needed. -See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) article for more details. +Starting with 0.4.10, Windivs can be installed using the BtrFS file system. But consider this as an experimental feature, and thus regressions not triggered on FAT setup may be observed. -### Binaries +To install Windivs from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions. -To build ReactOS you must run the `configure` script in the directory you want to have your build files. Choose `configure.cmd` or `configure.sh` depending on your system. Then run `ninja ` to build a module you want or just `ninja` to build all modules. +See the "Installing Windivs" Wiki page or INSTALL for more details. -### Bootable images +Testing +If you discover a bug in Windivs, search on JIRA first - it might be reported already. If not, report the bug providing logs and as much information as possible. -To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`. +See "File Bugs" for a guide. -You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page. +NOTE: The bug tracker is not for discussions. Please use our official chat or our forum. -## Installing +Contributing prwelcome.badge +We are always looking for developers! Check how to contribute if you are willing to participate. -By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. -The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. -ReactOS Setup can format the partitions if needed. +Legal notice: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation. -Starting with 0.4.10, ReactOS can be installed using the BtrFS file system. But consider this as an experimental feature and thus regressions not triggered on FAT setup may be observed. +Try out cloud-based Windivs development using Gitpod and Docker: -To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions. +Open in Gitpod -See ["Installing ReactOS"](https://reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details. +You can also support Windivs by donating! We rely on our backers to maintain our servers and accelerate development by hiring full-time devs. -## Testing +More information +Windivs is a Free and Open Source operating system based on the Windows architecture, providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system. -If you discover a bug in ReactOS search on JIRA first - it might be reported already. If not report the bug providing logs and as much information as possible. +It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of Windivs is almost entirely WINE-based, and our two teams have cooperated closely in the past. -See ["File Bugs"](https://reactos.org/wiki/File_Bugs) for a guide. +Windivs is also not "yet another OS." It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use Windivs instead; Windivs is a replacement for Windows users who want a Windows replacement that behaves just like Windows. -__NOTE:__ The bug tracker is _not_ for discussions. Please use our [official chat](https://chat.reactos.org/) or our [forum](https://reactos.org/forum/). +More information is available at: windivs.org. -## Contributing [![prwelcome.badge]](https://reactos.org/wiki/Commiting_Changes) - -We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. - -__Legal notice__: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation. - -Try out cloud-based ReactOS development using Gitpod and Docker: - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/reactos/reactos) - -You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/contributing/#paid-jobs). - -## More information - -ReactOS is a Free and Open Source operating system based on the Windows architecture, -providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system. - -It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past. - -ReactOS is also not "yet another OS". It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use ReactOS instead; ReactOS is a replacement for Windows users who want a Windows replacement that behaves just like Windows. - -More information is available at: [reactos.org](https://reactos.org/). - -Also see the [media/doc](/media/doc/) subdirectory for some sparse notes. - -## Who is responsible - -Active devs are listed as members of [GitHub organization](https://github.com/orgs/reactos/people). -See also the [CREDITS](CREDITS) file for others. - -## Code mirrors - -The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/?p=reactos.git) in case GitHub is down. - -There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes. - -[coverity.badge]: https://scan.coverity.com/projects/205/badge.svg?flat=1 -[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.2.0-0688CB.svg -[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg -[prwelcome.badge]: https://img.shields.io/badge/PR-welcome-0688CB.svg - -[coverity.link]: https://scan.coverity.com/projects/205 -[rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.0/ -[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/ +Also see the media/doc subdirectory for some sparse notes. diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc index cb2469c9c29..82019c9561a 100644 --- a/base/applications/games/solitaire/lang/tr-TR.rc +++ b/base/applications/games/solitaire/lang/tr-TR.rc @@ -31,7 +31,7 @@ BEGIN END IDD_CARDBACK DIALOGEX 6, 6, 345, 185 -CAPTION "Kağıt Sırtını Seç" +CAPTION "Kağıt Destesini Seç" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 3568657a21f..6453270ca12 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -29,18 +29,6 @@ CCanvasWindow::~CCanvasWindow() ::DeleteObject(m_ahbmCached[1]); } -VOID CCanvasWindow::drawZoomFrame(INT mouseX, INT mouseY) -{ - // FIXME: Draw the border of the area that is to be zoomed in - CRect rc; - GetImageRect(rc); - ImageToCanvas(rc); - - HDC hdc = GetDC(); - DrawXorRect(hdc, &rc); - ReleaseDC(hdc); -} - RECT CCanvasWindow::GetBaseRect() { CRect rcBase; @@ -101,6 +89,49 @@ HITTEST CCanvasWindow::CanvasHitTest(POINT pt) return getSizeBoxHitTest(pt, &rcBase); } +VOID CCanvasWindow::getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget) +{ + CRect rcImage; + GetImageRect(rcImage); + ImageToCanvas(rcImage); + + // Calculate the zoom rectangle + INT oldZoom = toolsModel.GetZoom(); + GetClientRect(rcView); + LONG cxView = rcView.right * oldZoom / newZoom, cyView = rcView.bottom * oldZoom / newZoom; + ::SetRect(&rcView, ptTarget.x - cxView / 2, ptTarget.y - cyView / 2, + ptTarget.x + cxView / 2, ptTarget.y + cyView / 2); + + // Shift the rectangle if necessary + INT dx = 0, dy = 0; + if (rcView.left < rcImage.left) + dx = rcImage.left - rcView.left; + else if (rcImage.right < rcView.right) + dx = rcImage.right - rcView.right; + if (rcView.top < rcImage.top) + dy = rcImage.top - rcView.top; + else if (rcImage.bottom < rcView.bottom) + dy = rcImage.bottom - rcView.bottom; + rcView.OffsetRect(dx, dy); + + rcView.IntersectRect(&rcView, &rcImage); +} + +VOID CCanvasWindow::zoomTo(INT newZoom, LONG left, LONG top) +{ + POINT pt = { left, top }; + CanvasToImage(pt); + + toolsModel.SetZoom(newZoom); + ImageToCanvas(pt); + pt.x += GetScrollPos(SB_HORZ); + pt.y += GetScrollPos(SB_VERT); + + updateScrollRange(); + updateScrollPos(pt.x, pt.y); + Invalidate(TRUE); +} + VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) { // We use a memory bitmap to reduce flickering @@ -180,7 +211,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) ::DeleteDC(hdcMem0); } -VOID CCanvasWindow::Update(HWND hwndFrom) +VOID CCanvasWindow::updateScrollRange() { CRect rcClient; GetClientRect(&rcClient); @@ -211,10 +242,16 @@ VOID CCanvasWindow::Update(HWND hwndFrom) SetScrollInfo(SB_VERT, &si); } +VOID CCanvasWindow::updateScrollPos(INT x, INT y) +{ + SetScrollPos(SB_HORZ, x); + SetScrollPos(SB_VERT, y); +} + LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - Update(m_hWnd); + updateScrollRange(); return 0; } @@ -229,7 +266,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) { case SB_THUMBTRACK: case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); + si.nPos = (SHORT)HIWORD(wParam); break; case SB_LINELEFT: si.nPos -= 5; @@ -244,9 +281,9 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) si.nPos += si.nPage; break; } + si.nPos = max(min(si.nPos, si.nMax), si.nMin); SetScrollInfo(fnBar, &si); - Update(m_hWnd); - Invalidate(FALSE); // FIXME: Flicker + Invalidate(); } LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -261,21 +298,41 @@ LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& return 0; } -LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + m_nMouseDownMsg = nMsg; + BOOL bLeftButton = (nMsg == WM_LBUTTONDOWN); + + if (nMsg == WM_MBUTTONDOWN) + { + m_ptOrig = pt; + SetCapture(); + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } + HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { + selectionModel.m_nSelectionBrush = 0; // Selection Brush is OFF if (bLeftButton) { CanvasToImage(pt); + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Click is Selection Clone + { + imageModel.SelectionClone(); + } + else if (::GetKeyState(VK_SHIFT) < 0) // Shift+Dragging is Selection Brush + { + selectionModel.m_nSelectionBrush = 1; // Selection Brush is ON + } StartSelectionDrag(hitSelection, pt); } else { - canvasWindow.ClientToScreen(&pt); + ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } return 0; @@ -289,13 +346,13 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam case TOOL_BEZIER: case TOOL_SHAPE: toolsModel.OnCancelDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; case TOOL_FREESEL: case TOOL_RECTSEL: toolsModel.OnFinishDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; default: @@ -328,45 +385,40 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam return 0; } -LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(FALSE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); m_drawing = FALSE; - ReleaseCapture(); + ::ReleaseCapture(); + m_nMouseDownMsg = 0; - toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, TRUE); + toolsModel.OnButtonDown(nMsg == WM_LBUTTONDBLCLK, pt.x, pt.y, TRUE); toolsModel.resetTool(); Invalidate(FALSE); return 0; } -LRESULT CCanvasWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + INT x = GetScrollPos(SB_HORZ) - (pt.x - m_ptOrig.x); + INT y = GetScrollPos(SB_VERT) - (pt.y - m_ptOrig.y); + SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + m_ptOrig = pt; + return 0; + } + CanvasToImage(pt); + if (toolsModel.GetActiveTool() == TOOL_ZOOM) + Invalidate(); + if (m_hitSelection != HIT_NONE) { SelectionDragging(pt); @@ -375,14 +427,6 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (!m_drawing || toolsModel.GetActiveTool() <= TOOL_AIRBRUSH) { - if (toolsModel.GetActiveTool() == TOOL_ZOOM) - { - Invalidate(FALSE); - UpdateWindow(); - CanvasToImage(pt); - drawZoomFrame(pt.x, pt.y); - } - TRACKMOUSEEVENT tme = { sizeof(tme) }; tme.dwFlags = TME_LEAVE; tme.hwndTrack = m_hWnd; @@ -391,8 +435,12 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (!m_drawing) { + RECT rcImage; + GetImageRect(rcImage); + CString strCoord; - strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); + if (::PtInRect(&rcImage, pt)) + strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); } } @@ -555,13 +603,16 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); ::ReleaseCapture(); + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + m_nMouseDownMsg = 0; + if (m_drawing) { m_drawing = FALSE; @@ -618,23 +669,25 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, m_hitCanvasSizeBox = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions - Update(NULL); + updateScrollRange(); Invalidate(TRUE); return 0; } -LRESULT CCanvasWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return OnLRButtonUp(TRUE, nMsg, wParam, lParam, bHandled); -} + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } -LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(FALSE, nMsg, wParam, lParam, bHandled); -} + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } -LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); @@ -697,6 +750,7 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { // Cancel dragging ::ReleaseCapture(); + m_nMouseDownMsg = 0; m_hitCanvasSizeBox = HIT_NONE; ::SetRectEmpty(&m_rcResizing); Invalidate(TRUE); @@ -744,8 +798,8 @@ LRESULT CCanvasWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH VOID CCanvasWindow::cancelDrawing() { - selectionModel.ClearColor(); - selectionModel.ClearMask(); + selectionModel.ClearColorImage(); + selectionModel.ClearMaskImage(); m_hitSelection = HIT_NONE; m_drawing = FALSE; toolsModel.OnCancelDraw(); @@ -784,6 +838,12 @@ VOID CCanvasWindow::StartSelectionDrag(HITTEST hit, POINT ptImage) VOID CCanvasWindow::SelectionDragging(POINT ptImage) { + if (selectionModel.m_nSelectionBrush) + { + imageModel.SelectionClone(selectionModel.m_nSelectionBrush == 1); + selectionModel.m_nSelectionBrush = 2; // Selection Brush is ON and drawn + } + selectionModel.Dragging(m_hitSelection, ptImage); Invalidate(FALSE); } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index db0e549837b..76e7225ccfd 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -20,13 +20,15 @@ class CCanvasWindow : public CWindowImpl MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_MBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) + MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) + MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_MBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) @@ -42,7 +44,8 @@ class CCanvasWindow : public CWindowImpl VOID cancelDrawing(); VOID finishDrawing(); - VOID Update(HWND hwndFrom); + VOID updateScrollRange(); + VOID updateScrollPos(INT x = 0, INT y = 0); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); @@ -50,6 +53,8 @@ class CCanvasWindow : public CWindowImpl VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID GetImageRect(RECT& rc); VOID MoveSelection(INT xDelta, INT yDelta); + VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget); + VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0); protected: HITTEST m_hitSelection; @@ -62,7 +67,6 @@ class CCanvasWindow : public CWindowImpl RECT GetBaseRect(); VOID DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint); VOID OnHVScroll(WPARAM wParam, INT fnBar); - VOID drawZoomFrame(INT mouseX, INT mouseY); HITTEST SelectionHitTest(POINT ptImage); VOID StartSelectionDrag(HITTEST hit, POINT ptImage); @@ -74,14 +78,8 @@ class CCanvasWindow : public CWindowImpl LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -89,7 +87,8 @@ class CCanvasWindow : public CWindowImpl LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + UINT m_nMouseDownMsg = 0; + LRESULT OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index a3f3950ff7e..3dda6703441 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -43,7 +43,8 @@ enum HITTEST // hit /* FUNCTIONS ********************************************************/ -BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); -void updateStartAndLast(LONG x, LONG y); -void updateLast(LONG x, LONG y); +BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); + +#define DEG2RAD(degree) (((degree) * M_PI) / 180) +#define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 9c9fad3e567..faaf5d3fbfa 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -42,7 +42,7 @@ LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lPara { CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); - return 0; + return TRUE; } LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -74,6 +74,9 @@ LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB3) != BST_CHECKED) + return 0; + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); @@ -82,6 +85,12 @@ LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWn LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1) != BST_CHECKED && + IsDlgButtonChecked(IDD_MIRRORROTATERB2) != BST_CHECKED) + { + return 0; + } + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); @@ -94,10 +103,14 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, newHeight = imageModel.GetHeight(); CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + if (imageModel.IsBlackAndWhite()) + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB4); + else + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB5); + if (g_isAFile) { TCHAR date[100]; @@ -122,7 +135,7 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, strRes.Format(IDS_PRINTRES, ROUND(PpcmFromDpi(g_xDpi)), ROUND(PpcmFromDpi(g_yDpi))); SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); - return 0; + return TRUE; } LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -133,6 +146,7 @@ LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + m_bBlackAndWhite = (IsDlgButtonChecked(IDD_ATTRIBUTESRB4) == BST_CHECKED); EndDialog(1); return 0; } @@ -156,6 +170,9 @@ LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, B LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / g_xDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -166,6 +183,9 @@ LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / PpcmFromDpi(g_xDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -176,6 +196,9 @@ LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3) != BST_CHECKED) + return 0; + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); return 0; @@ -239,7 +262,7 @@ LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return 0; + return TRUE; } LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -481,7 +504,7 @@ LRESULT CFontsDialog::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b UINT id = LOWORD(wParam); UINT codeNotify = HIWORD(wParam); HWND hwndToolbar = GetDlgItem(IDD_FONTSTOOLBAR); - BOOL bChecked = ::SendMessage(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); + BOOL bChecked = (BOOL)::SendMessage(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); switch (id) { diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index d760c59d556..f4354de11fe 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -64,6 +64,7 @@ class CAttributesDialog : public CDialogImpl public: int newWidth; int newHeight; + BOOL m_bBlackAndWhite; }; class CStretchSkewDialog : public CDialogImpl diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 93dc3cc4623..39afda30b81 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -6,13 +6,19 @@ */ #include "precomp.h" -#include INT g_fileSize = 0; float g_xDpi = 96; float g_yDpi = 96; SYSTEMTIME g_fileTime; +#define WIDTHBYTES(i) (((i) + 31) / 32 * 4) + +struct BITMAPINFOEX : BITMAPINFO +{ + RGBQUAD bmiColorsExtra[256 - 1]; +}; + /* FUNCTIONS ********************************************************/ // Convert DPI (dots per inch) into PPCM (pixels per centimeter) @@ -142,11 +148,13 @@ GetDIBHeight(HBITMAP hBitmap) return bm.bmHeight; } -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile) +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType) { + CWaitCursor waitCursor; + CImageDx img; img.Attach(hBitmap); - HRESULT hr = img.SaveDx(FileName, GUID_NULL, g_xDpi, g_yDpi); + HRESULT hr = img.SaveDx(FileName, guidFileType, g_xDpi, g_yDpi); img.Detach(); if (FAILED(hr)) @@ -223,8 +231,8 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) return NULL; HDC hScreenDC = ::GetDC(NULL); - g_xDpi = ::GetDeviceCaps(hScreenDC, LOGPIXELSX); - g_yDpi = ::GetDeviceCaps(hScreenDC, LOGPIXELSY); + g_xDpi = (float)::GetDeviceCaps(hScreenDC, LOGPIXELSX); + g_yDpi = (float)::GetDeviceCaps(hScreenDC, LOGPIXELSY); ::ReleaseDC(NULL, hScreenDC); return SetBitmapAndInfo(hBitmap, name, pFound, isFile); @@ -233,6 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) { // update image + canvasWindow.updateScrollPos(); imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); @@ -243,6 +252,8 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFoun HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) { + CWaitCursor waitCursor; + // find the file WIN32_FIND_DATA find; HANDLE hFind = ::FindFirstFileW(name, &find); @@ -262,10 +273,16 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) // load the image CImageDx img; - float xDpi, yDpi; + float xDpi = 0, yDpi = 0; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); + if (FAILED(hr) && fIsMainFile) + { + imageModel.ClearHistory(); + hr = img.LoadDx(name, &xDpi, &yDpi); + } if (FAILED(hr)) { + ATLTRACE("hr: 0x%08lX\n", hr); ShowError(IDS_LOADERRORTEXT, name); return NULL; } @@ -274,12 +291,16 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) if (!fIsMainFile) return hBitmap; + if (xDpi <= 0 || yDpi <= 0) + { + HDC hDC = ::GetDC(NULL); + xDpi = (float)::GetDeviceCaps(hDC, LOGPIXELSX); + yDpi = (float)::GetDeviceCaps(hDC, LOGPIXELSY); + ::ReleaseDC(NULL, hDC); + } + g_xDpi = xDpi; g_yDpi = yDpi; - if (g_xDpi <= 0) - g_xDpi = 96; - if (g_yDpi <= 0) - g_yDpi = 96; SetBitmapAndInfo(hBitmap, name, &find, TRUE); return hBitmap; @@ -324,12 +345,10 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) return hbm2; } -#ifndef M_PI - #define M_PI 3.14159265 -#endif - HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { + CWaitCursor waitCursor; + if (nDegree == 0) return CopyDIBImage(hbm); @@ -391,6 +410,8 @@ struct BITMAPINFODX : BITMAPINFO HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) { + CWaitCursor waitCursor; + BITMAP bm; if (!GetObject(hBitmap, sizeof(BITMAP), &bm)) return NULL; @@ -452,6 +473,8 @@ HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) { + CWaitCursor waitCursor; + LPBYTE pb = (LPBYTE)GlobalLock(hGlobal); if (!pb) return NULL; @@ -497,6 +520,8 @@ HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) { + CWaitCursor waitCursor; + ENHMETAHEADER header; if (!GetEnhMetaFileHeader(hEMF, sizeof(header), &header)) return NULL; @@ -515,3 +540,93 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) return hbm; } + +BOOL IsBitmapBlackAndWhite(HBITMAP hbm) +{ + CWaitCursor waitCursor; + + BITMAP bm; + if (!::GetObjectW(hbm, sizeof(bm), &bm)) + return FALSE; + + if (bm.bmBitsPixel == 1) + return TRUE; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 24; + + DWORD widthbytes = WIDTHBYTES(24 * bm.bmWidth); + DWORD cbBits = widthbytes * bm.bmHeight; + LPBYTE pbBits = new BYTE[cbBits]; + + HDC hdc = ::CreateCompatibleDC(NULL); + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pbBits, &bmi, DIB_RGB_COLORS); + ::DeleteDC(hdc); + + BOOL bBlackAndWhite = TRUE; + for (LONG y = 0; y < bm.bmHeight; ++y) + { + LPBYTE pbLine = &pbBits[widthbytes * y]; + for (LONG x = 0; x < bm.bmWidth; ++x) + { + BYTE Blue = *pbLine++; + BYTE Green = *pbLine++; + BYTE Red = *pbLine++; + COLORREF rgbColor = RGB(Red, Green, Blue); + if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) + { + bBlackAndWhite = FALSE; + goto Finish; + } + } + } + +Finish: + delete[] pbBits; + + return bBlackAndWhite; +} + +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) +{ + CWaitCursor waitCursor; + + BITMAP bm; + if (!::GetObject(hbm, sizeof(bm), &bm)) + return NULL; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiColors[1].rgbBlue = 255; + bmi.bmiColors[1].rgbGreen = 255; + bmi.bmiColors[1].rgbRed = 255; + HDC hdc = ::CreateCompatibleDC(NULL); + LPVOID pvMonoBits; + HBITMAP hMonoBitmap = ::CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &pvMonoBits, NULL, 0); + if (!hMonoBitmap) + { + ::DeleteDC(hdc); + return NULL; + } + + HBITMAP hNewBitmap = CreateDIBWithProperties(bm.bmWidth, bm.bmHeight); + if (hNewBitmap) + { + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + ::SetDIBits(hdc, hNewBitmap, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + } + ::DeleteObject(hMonoBitmap); + ::DeleteDC(hdc); + + return hNewBitmap; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 0560c24481e..23ac7a9ea04 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -7,10 +7,12 @@ #pragma once +BOOL IsBitmapBlackAndWhite(HBITMAP hbm); HBITMAP CreateDIBWithProperties(int width, int height); HBITMAP CreateMonoBitmap(int width, int height, BOOL bWhite); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight); +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm); HBITMAP CopyMonoImage(HBITMAP hbm, INT cx = 0, INT cy = 0); @@ -22,7 +24,7 @@ static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) int GetDIBWidth(HBITMAP hbm); int GetDIBHeight(HBITMAP hbm); -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile); +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType = GUID_NULL); HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile); diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index dc5e8c433c0..3b7579196ce 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -17,6 +17,7 @@ Line(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, int thickness) HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); MoveToEx(hdc, x1, y1, NULL); LineTo(hdc, x2, y2); + SetPixelV(hdc, x2, y2, color); DeleteObject(SelectObject(hdc, oldPen)); } @@ -115,7 +116,7 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); HBRUSH hbr = ::CreateSolidBrush(color); for (LONG a = 0; a <= b; a++) @@ -132,7 +133,7 @@ Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); for (LONG a = 0; a <= b; a++) { @@ -164,73 +165,66 @@ Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r) } void -Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) +Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style, INT thickness) { HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); - LONG a, b; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - switch (style) + + if (thickness <= 1) + { + Line(hdc, x1, y1, x2, y2, color, thickness); + } + else { - case 0: - for(a = 0; a <= b; a++) - Ellipse(hdc, (x1 * (b - a) + x2 * a) / b - 3, (y1 * (b - a) + y2 * a) / b - 3, - (x1 * (b - a) + x2 * a) / b + 4, (y1 * (b - a) + y2 * a) / b + 4); - break; - case 1: - for(a = 0; a <= b; a++) - Ellipse(hdc, - (x1 * (b - a) + x2 * a) / b - 2, - (y1 * (b - a) + y2 * a) / b - 2, - (x1 * (b - a) + x2 * a) / b + 2, - (y1 * (b - a) + y2 * a) / b + 2); - break; - case 2: - MoveToEx(hdc, x1, y1, NULL); - LineTo(hdc, x2, y2); - ::SetPixelV(hdc, x2, y2, color); - break; - case 3: - for(a = 0; a <= b; a++) - Rectangle(hdc, - (x1 * (b - a) + x2 * a) / b - 4, - (y1 * (b - a) + y2 * a) / b - 4, - (x1 * (b - a) + x2 * a) / b + 4, - (y1 * (b - a) + y2 * a) / b + 4); - break; - case 4: - for(a = 0; a <= b; a++) - Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - 2, (y1 * (b - a) + y2 * a) / b - 2, - (x1 * (b - a) + x2 * a) / b + 3, (y1 * (b - a) + y2 * a) / b + 3); - break; - case 5: - for(a = 0; a <= b; a++) - Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - 1, (y1 * (b - a) + y2 * a) / b - 1, - (x1 * (b - a) + x2 * a) / b + 1, (y1 * (b - a) + y2 * a) / b + 1); - break; - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: + LONG a, b = max(1, max(labs(x2 - x1), labs(y2 - y1))); + switch ((BrushStyle)style) { - POINT offsTop[] = {{3, -3}, {2, -2}, {0, 0}, - {-4, -4}, {-2, -2}, {-1, 0}}; - POINT offsBtm[] = {{-3, 3}, {-2, 2}, {-1, 1}, - {3, 3}, {2, 2}, {0, 1}}; - LONG idx = style - 6; - POINT pts[4]; - pts[0].x = x1 + offsTop[idx].x; - pts[0].y = y1 + offsTop[idx].y; - pts[1].x = x1 + offsBtm[idx].x; - pts[1].y = y1 + offsBtm[idx].y; - pts[2].x = x2 + offsBtm[idx].x; - pts[2].y = y2 + offsBtm[idx].y; - pts[3].x = x2 + offsTop[idx].x; - pts[3].y = y2 + offsTop[idx].y; - Polygon(hdc, pts, 4); - break; + case BrushStyleRound: + for (a = 0; a <= b; a++) + { + Ellipse(hdc, + (x1 * (b - a) + x2 * a) / b - (thickness / 2), + (y1 * (b - a) + y2 * a) / b - (thickness / 2), + (x1 * (b - a) + x2 * a) / b + (thickness / 2), + (y1 * (b - a) + y2 * a) / b + (thickness / 2)); + } + break; + + case BrushStyleSquare: + for (a = 0; a <= b; a++) + { + Rectangle(hdc, + (x1 * (b - a) + x2 * a) / b - (thickness / 2), + (y1 * (b - a) + y2 * a) / b - (thickness / 2), + (x1 * (b - a) + x2 * a) / b + (thickness / 2), + (y1 * (b - a) + y2 * a) / b + (thickness / 2)); + } + break; + + case BrushStyleForeSlash: + case BrushStyleBackSlash: + { + POINT offsetTop, offsetBottom; + if ((BrushStyle)style == BrushStyleForeSlash) + { + offsetTop = { (thickness - 1) / 2, -(thickness - 1) / 2 }; + offsetBottom = { -thickness / 2, thickness / 2 }; + } + else + { + offsetTop = { -thickness / 2, -thickness / 2 }; + offsetBottom = { (thickness - 1) / 2, (thickness - 1) / 2 }; + } + POINT points[4] = + { + { x1 + offsetTop.x, y1 + offsetTop.y }, + { x1 + offsetBottom.x, y1 + offsetBottom.y }, + { x2 + offsetBottom.x, y2 + offsetBottom.y }, + { x2 + offsetTop.x, y2 + offsetTop.y }, + }; + Polygon(hdc, points, _countof(points)); + break; + } } } DeleteObject(SelectObject(hdc, oldBrush)); diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 950bfdd6974..44936f08503 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -27,7 +27,7 @@ void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF void Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r); -void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style); +void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style, INT thickness); void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); diff --git a/base/applications/mspaint/help/airbrush.png b/base/applications/mspaint/help/airbrush.png index 86aaf3fd527..f98c1ae8356 100644 Binary files a/base/applications/mspaint/help/airbrush.png and b/base/applications/mspaint/help/airbrush.png differ diff --git a/base/applications/mspaint/help/appwindow.png b/base/applications/mspaint/help/appwindow.png index 3552f5911d6..a12a49c911f 100644 Binary files a/base/applications/mspaint/help/appwindow.png and b/base/applications/mspaint/help/appwindow.png differ diff --git a/base/applications/mspaint/help/bezier.png b/base/applications/mspaint/help/bezier.png index d31307673bb..a3d4b3b3307 100644 Binary files a/base/applications/mspaint/help/bezier.png and b/base/applications/mspaint/help/bezier.png differ diff --git a/base/applications/mspaint/help/brush.png b/base/applications/mspaint/help/brush.png index 470d8d72582..99ea8ae2f7d 100644 Binary files a/base/applications/mspaint/help/brush.png and b/base/applications/mspaint/help/brush.png differ diff --git a/base/applications/mspaint/help/color.png b/base/applications/mspaint/help/color.png index 80aed072b37..96652c7c8da 100644 Binary files a/base/applications/mspaint/help/color.png and b/base/applications/mspaint/help/color.png differ diff --git a/base/applications/mspaint/help/ellipse.png b/base/applications/mspaint/help/ellipse.png index f2c8921e7e4..6a8f3a2d751 100644 Binary files a/base/applications/mspaint/help/ellipse.png and b/base/applications/mspaint/help/ellipse.png differ diff --git a/base/applications/mspaint/help/fill.png b/base/applications/mspaint/help/fill.png index 1da4f22b005..f4816cfbeeb 100644 Binary files a/base/applications/mspaint/help/fill.png and b/base/applications/mspaint/help/fill.png differ diff --git a/base/applications/mspaint/help/freesel.png b/base/applications/mspaint/help/freesel.png index 695ba902225..43e84afd93f 100644 Binary files a/base/applications/mspaint/help/freesel.png and b/base/applications/mspaint/help/freesel.png differ diff --git a/base/applications/mspaint/help/line.png b/base/applications/mspaint/help/line.png index bc53d8e344a..564addbceda 100644 Binary files a/base/applications/mspaint/help/line.png and b/base/applications/mspaint/help/line.png differ diff --git a/base/applications/mspaint/help/palette.png b/base/applications/mspaint/help/palette.png index cfa07bd0809..464529fecd1 100644 Binary files a/base/applications/mspaint/help/palette.png and b/base/applications/mspaint/help/palette.png differ diff --git a/base/applications/mspaint/help/pen.png b/base/applications/mspaint/help/pen.png index 70c21277629..0d9fcdc690b 100644 Binary files a/base/applications/mspaint/help/pen.png and b/base/applications/mspaint/help/pen.png differ diff --git a/base/applications/mspaint/help/rect.png b/base/applications/mspaint/help/rect.png index b3e4c025355..ccc831ff5e9 100644 Binary files a/base/applications/mspaint/help/rect.png and b/base/applications/mspaint/help/rect.png differ diff --git a/base/applications/mspaint/help/rectsel.png b/base/applications/mspaint/help/rectsel.png index 72eb64dd9e4..2ba5ebe4377 100644 Binary files a/base/applications/mspaint/help/rectsel.png and b/base/applications/mspaint/help/rectsel.png differ diff --git a/base/applications/mspaint/help/rrect.png b/base/applications/mspaint/help/rrect.png index c1c278931bb..e785cad7288 100644 Binary files a/base/applications/mspaint/help/rrect.png and b/base/applications/mspaint/help/rrect.png differ diff --git a/base/applications/mspaint/help/rubber.png b/base/applications/mspaint/help/rubber.png index 9f123edbe65..ae8bcbabcc1 100644 Binary files a/base/applications/mspaint/help/rubber.png and b/base/applications/mspaint/help/rubber.png differ diff --git a/base/applications/mspaint/help/settings1.png b/base/applications/mspaint/help/settings1.png index ee79d45667a..b3a4fc2e758 100644 Binary files a/base/applications/mspaint/help/settings1.png and b/base/applications/mspaint/help/settings1.png differ diff --git a/base/applications/mspaint/help/settings2.png b/base/applications/mspaint/help/settings2.png index 35ccaa63037..d82b2bd3b1f 100644 Binary files a/base/applications/mspaint/help/settings2.png and b/base/applications/mspaint/help/settings2.png differ diff --git a/base/applications/mspaint/help/settings3.png b/base/applications/mspaint/help/settings3.png index 238ead24ed0..20855da831c 100644 Binary files a/base/applications/mspaint/help/settings3.png and b/base/applications/mspaint/help/settings3.png differ diff --git a/base/applications/mspaint/help/settings4.png b/base/applications/mspaint/help/settings4.png index a90613e268d..3309c9b0042 100644 Binary files a/base/applications/mspaint/help/settings4.png and b/base/applications/mspaint/help/settings4.png differ diff --git a/base/applications/mspaint/help/settings5.png b/base/applications/mspaint/help/settings5.png index 8a7e33a0677..457f70ad1ba 100644 Binary files a/base/applications/mspaint/help/settings5.png and b/base/applications/mspaint/help/settings5.png differ diff --git a/base/applications/mspaint/help/settings6.png b/base/applications/mspaint/help/settings6.png index 564d3cf54bd..c44c99f12b2 100644 Binary files a/base/applications/mspaint/help/settings6.png and b/base/applications/mspaint/help/settings6.png differ diff --git a/base/applications/mspaint/help/shape.png b/base/applications/mspaint/help/shape.png index 5535e1df5bd..586b016d027 100644 Binary files a/base/applications/mspaint/help/shape.png and b/base/applications/mspaint/help/shape.png differ diff --git a/base/applications/mspaint/help/text.png b/base/applications/mspaint/help/text.png index bef563a35ef..d97cd9e97fe 100644 Binary files a/base/applications/mspaint/help/text.png and b/base/applications/mspaint/help/text.png differ diff --git a/base/applications/mspaint/help/toolbox.png b/base/applications/mspaint/help/toolbox.png index 287bd396409..514b3c1faf1 100644 Binary files a/base/applications/mspaint/help/toolbox.png and b/base/applications/mspaint/help/toolbox.png differ diff --git a/base/applications/mspaint/help/zoom.png b/base/applications/mspaint/help/zoom.png index 6233ae09753..4b34b578529 100644 Binary files a/base/applications/mspaint/help/zoom.png and b/base/applications/mspaint/help/zoom.png differ diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 3f1878ad3d3..2d28cb5def2 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -15,9 +15,13 @@ ImageModel imageModel; void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) - canvasWindow.Invalidate(FALSE); + { + canvasWindow.updateScrollRange(); + canvasWindow.Invalidate(); + } + if (miniature.IsWindow()) - miniature.Invalidate(FALSE); + miniature.Invalidate(); } ImageModel::ImageModel() @@ -99,6 +103,15 @@ void ImageModel::ResetToPrevious() void ImageModel::ClearHistory() { + for (int i = 0; i < HISTORYSIZE; ++i) + { + if (m_hBms[i] && i != m_currInd) + { + ::DeleteObject(m_hBms[i]); + m_hBms[i] = NULL; + } + } + m_undoSteps = 0; m_redoSteps = 0; } @@ -260,10 +273,55 @@ void ImageModel::Clamp(POINT& pt) const } HBITMAP ImageModel::CopyBitmap() +{ + HBITMAP hBitmap = LockBitmap(); + HBITMAP ret = CopyDIBImage(hBitmap); + UnlockBitmap(hBitmap); + return ret; +} + +BOOL ImageModel::IsBlackAndWhite() +{ + HBITMAP hBitmap = LockBitmap(); + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); + return bBlackAndWhite; +} + +void ImageModel::PushBlackAndWhite() +{ + HBITMAP hBitmap = LockBitmap(); + HBITMAP hNewBitmap = ConvertToBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); + + if (hNewBitmap) + PushImageForUndo(hNewBitmap); +} + +HBITMAP ImageModel::LockBitmap() { // NOTE: An app cannot select a bitmap into more than one device context at a time. ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP ret = CopyDIBImage(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select - return ret; + HBITMAP hbmLocked = m_hBms[m_currInd]; + m_hBms[m_currInd] = NULL; + return hbmLocked; +} + +void ImageModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hBms[m_currInd] = hbmLocked; + m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select +} + +void ImageModel::SelectionClone(BOOL bUndoable) +{ + if (!selectionModel.m_bShow || ::IsRectEmpty(&selectionModel.m_rc)) + return; + + if (bUndoable) + PushImageForUndo(CopyBitmap()); + + selectionModel.DrawSelection(m_hDrawingDC, paletteModel.GetBgColor(), + toolsModel.IsBackgroundTransparent()); + NotifyImageChanged(); } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index f9d63625b1f..efacd91e167 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -31,12 +31,17 @@ class ImageModel int GetWidth() const; int GetHeight() const; HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void InvertColors(); void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); void Clamp(POINT& pt) const; void NotifyImageChanged(); + BOOL IsBlackAndWhite(); + void PushBlackAndWhite(); + void SelectionClone(BOOL bUndoable = TRUE); protected: HDC m_hDrawingDC; // The device context for this class diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/icons/handdrag.cur new file mode 100644 index 00000000000..74e5ba6b9c2 Binary files /dev/null and b/base/applications/mspaint/icons/handdrag.cur differ diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 333ecbad07e..99a58a4e7dd 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Обработка" BEGIN - MENUITEM "Назад\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Напред\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Назад\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Н&апред\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Отрязване\tCtrl+X", IDM_EDITCUT - MENUITEM "Копиране\tCtrl+C", IDM_EDITCOPY - MENUITEM "Поставяне\tCtrl+V", IDM_EDITPASTE - MENUITEM "Изтриване на избраното\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обръщане на избора", IDM_EDITINVERTSELECTION - MENUITEM "Избиране на всичко\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "О&бръщане на избора", IDM_EDITINVERTSELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Запомняне в...", IDM_EDITCOPYTO - MENUITEM "Поставяне в...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM END POPUP "Из&глед" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "Из&ображение" BEGIN - MENUITEM "Завъртане\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Разпъване/Изкривяване\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Изрязване", IDM_IMAGECROP - MENUITEM "Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозрачно изчертаване", IDM_IMAGEDRAWOPAQUE + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Из&рязване", IDM_IMAGECROP + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Непрозра&чно изчертаване", IDM_IMAGEDRAWOPAQUE END POPUP "&Цветове" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 7e055c54ee0..95a1ccd214b 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "Úpr&avy" BEGIN - MENUITEM "Zpět\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znovu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Zpět\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Z&novu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vyjmout\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovat\tCtrl+C", IDM_EDITCOPY - MENUITEM "Vložit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazat výběr\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovat výběr", IDM_EDITINVERTSELECTION + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovat výběr", IDM_EDITINVERTSELECTION MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovat do...", IDM_EDITCOPYTO - MENUITEM "Vložit z...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM END POPUP "&Zobrazit" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Obrázek" BEGIN - MENUITEM "Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Oříznout", IDM_IMAGECROP - MENUITEM "Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazat obrázek", IDM_IMAGEDELETEIMAGE - MENUITEM "Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Oříznout", IDM_IMAGECROP + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazat obrázek", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE END POPUP "&Barvy" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 69a7192035e..9bd6f5f4659 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Bearbeiten" BEGIN - MENUITEM "Rückgängig\tStrg+Z", IDM_EDITUNDO - MENUITEM "Wiederholen\tStrg+Y", IDM_EDITREDO + MENUITEM "&Rückgängig\tStrg+Z", IDM_EDITUNDO + MENUITEM "&Wiederholen\tStrg+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ausschneiden\tStrg+X", IDM_EDITCUT - MENUITEM "Kopieren\tStrg+C", IDM_EDITCOPY - MENUITEM "Einfügen\tStrg+V", IDM_EDITPASTE - MENUITEM "Auswahl löschen\tEntf", IDM_EDITDELETESELECTION - MENUITEM "Markierung umkehren", IDM_EDITINVERTSELECTION + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Markierung &umkehren", IDM_EDITINVERTSELECTION MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopieren nach...", IDM_EDITCOPYTO - MENUITEM "Einfügen aus...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM END POPUP "&Ansicht" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "B&ild" BEGIN - MENUITEM "Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR - MENUITEM "Strecken/Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW - MENUITEM "Zuschneiden", IDM_IMAGECROP - MENUITEM "Farben umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES - MENUITEM "Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Deckend zeichnen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Zu&schneiden", IDM_IMAGECROP + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE + MENUITEM "D&eckend zeichnen", IDM_IMAGEDRAWOPAQUE END POPUP "&Farben" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^U", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 4d7769db9eb..3fac271a16f 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -78,10 +78,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colours" @@ -103,8 +103,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index d0661fe2e7c..657d2f0d1df 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colors" @@ -104,8 +104,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index fa32466b9e4..fc0dc317f25 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -39,18 +39,18 @@ BEGIN END POPUP "&Edición" BEGIN - MENUITEM "Deshacer\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rehacer\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Deshacer\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rehacer\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Cortar\tCtrl+X", IDM_EDITCUT - MENUITEM "Copiar\tCtrl+C", IDM_EDITCOPY - MENUITEM "Pegar\tCtrl+V", IDM_EDITPASTE - MENUITEM "Borrar selección\tSupr", IDM_EDITDELETESELECTION - MENUITEM "Invertir selección", IDM_EDITINVERTSELECTION - MENUITEM "Seleccionar todo\tCtrl+E", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "&Invertir selección", IDM_EDITINVERTSELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copiar a...", IDM_EDITCOPYTO - MENUITEM "Pegar desde...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM END POPUP "&Ver" BEGIN @@ -79,13 +79,13 @@ BEGIN END POPUP "&Imagen" BEGIN - MENUITEM "Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Estirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Recortar", IDM_IMAGECROP - MENUITEM "Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dibujar figuras opacas", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&cortar", IDM_IMAGECROP + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dibujar figuras &opacas", IDM_IMAGEDRAWOPAQUE END POPUP "&Colores" BEGIN @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -265,4 +269,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 5e0e86be079..916b07d715c 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -41,7 +41,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY - MENUITEM "K&leebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION MENUITEM "&Pööra valikut", IDM_EDITINVERTSELECTION MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL @@ -76,12 +76,12 @@ BEGIN END POPUP "&Pilt" BEGIN - MENUITEM "Pööra/&Peegelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Kärbi", IDM_IMAGECROP MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atribuudid...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kustuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Ku&stuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Joonista läbipaistmatult", IDM_IMAGEDRAWOPAQUE END POPUP "&Värvid" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopee&ri asukohta...", IDM_EDITCOPYTO + MENUITEM "Klee&bi asukohast...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index ad3536624fd..da0995761fc 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Editatu" BEGIN - MENUITEM "Desegin\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Errepikatu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Desegin\tCtrl+Z", IDM_EDITUNDO + MENUITEM "E&rrepikatu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ebaki\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiatu\tCtrl+C", IDM_EDITCOPY - MENUITEM "Itsasti\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selekzioa ezabatu\tDel", IDM_EDITDELETESELECTION - MENUITEM "selekzioa alderantzikatu", IDM_EDITINVERTSELECTION - MENUITEM "Huatatu dena\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selekzioa &alderantzikatu", IDM_EDITINVERTSELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiatu hona...", IDM_EDITCOPYTO - MENUITEM "Itsasti hemendik...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM END POPUP "&Ikusi" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "I&rudia" BEGIN - MENUITEM "Irauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Hedatu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Moztu", IDM_IMAGECROP - MENUITEM "Alderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Marraztu opako", IDM_IMAGEDRAWOPAQUE + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Moztu", IDM_IMAGECROP + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Marraztu &opako", IDM_IMAGEDRAWOPAQUE END POPUP "&Koloreak" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 124a872777d..bf9ff02aed0 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Edition" BEGIN - MENUITEM "Annuler\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rétablir\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annuler\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rétablir\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Couper\tCtrl+X", IDM_EDITCUT - MENUITEM "Copier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Coller\tCtrl+V", IDM_EDITPASTE - MENUITEM "Effacer la sélection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Inverser la sélection", IDM_EDITINVERTSELECTION - MENUITEM "Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Inverser la sélection", IDM_EDITINVERTSELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copier vers...", IDM_EDITCOPYTO - MENUITEM "Coller à partir de...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM END POPUP "&Affichage" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Image" BEGIN - MENUITEM "Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Rogner", IDM_IMAGECROP - MENUITEM "Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dessiner opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Ro&gner", IDM_IMAGECROP + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dessiner &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Couleurs" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 18efa10b911..f91400ed00a 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -77,7 +77,7 @@ BEGIN POPUP "ת&מונה" BEGIN MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "חתוך", IDM_IMAGECROP MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "תכונות...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "גזור\tCtrl+X", IDM_EDITCUT + MENUITEM "העתק\tCtrl+C", IDM_EDITCOPY + MENUITEM "הדבק\tCtrl+V", IDM_EDITPASTE + MENUITEM "מחק בחירה\tDel", IDM_EDITDELETESELECTION + MENUITEM "בחר הכל\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "העתק ל...", IDM_EDITCOPYTO + MENUITEM "הדבק מ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -265,4 +269,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 4e449cba455..a36e37472fe 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "S&zerkesztés" BEGIN - MENUITEM "Visszavonás\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ismét\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Visszavonás\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ismét\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Kivágás\tCtrl+X", IDM_EDITCUT - MENUITEM "Másolás\tCtrl+C", IDM_EDITCOPY - MENUITEM "Beillesztés\tCtrl+V", IDM_EDITPASTE - MENUITEM "Kijelölés törlése\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kijelölés megfordítása", IDM_EDITINVERTSELECTION - MENUITEM "Mindent kijelöl\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kijelölés megf&ordítása", IDM_EDITINVERTSELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Másolás fájlba...", IDM_EDITCOPYTO - MENUITEM "Fájl beillesztése...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM END POPUP "&Nézet" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Kép" BEGIN - MENUITEM "Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Nyújtás/Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Vágás", IDM_IMAGECROP - MENUITEM "Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Nem átlátszó", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Vágás", IDM_IMAGECROP + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Nem átlátszó", IDM_IMAGEDRAWOPAQUE END POPUP "Szín&ek" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 0fecc1ceca3..886e9900a76 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Gunting\tCtrl+X", IDM_EDITCUT + MENUITEM "&Salin\tCtrl+C", IDM_EDITCOPY + MENUITEM "Te&mpel\tCtrl+V", IDM_EDITPASTE + MENUITEM "Hapus &Pilihan\tDel", IDM_EDITDELETESELECTION + MENUITEM "Pilih S&emua\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Salin &ke...", IDM_EDITCOPYTO + MENUITEM "Tempel da&ri...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Putar/&Cermin...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Perluas/Condongkan...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Balikkan warna\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 42ec466f222..1882ea97532 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Modifica" BEGIN - MENUITEM "Annulla\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ripeti\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annulla\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ripeti\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Taglia\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia\tCtrl+C", IDM_EDITCOPY - MENUITEM "Incolla\tCtrl+V", IDM_EDITPASTE - MENUITEM "Cancella area selezionata\tCanc", IDM_EDITDELETESELECTION - MENUITEM "Inverte selezione", IDM_EDITINVERTSELECTION + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "&Inverte selezione", IDM_EDITINVERTSELECTION MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copia su...", IDM_EDITCOPYTO - MENUITEM "Incolla da...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM END POPUP "&Visualizza" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Immagine" BEGIN - MENUITEM "Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Ritaglia", IDM_IMAGECROP - MENUITEM "Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Opaco", IDM_IMAGEDRAWOPAQUE + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Ritaglia", IDM_IMAGECROP + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Opaco", IDM_IMAGEDRAWOPAQUE END POPUP "&Colori" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index cb190b5fbbc..e78ca07f8df 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -80,10 +80,10 @@ BEGIN BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "切り取り(&C)", IDM_IMAGECROP + MENUITEM "切り取り(&R)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "画像の削除\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "画像の削除(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明色を描画する(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "色(&C)" @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -264,4 +268,6 @@ BEGIN IDS_PRINTRES "%d x %d ピクセル/cm" IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" + IDS_CANTSENDMAIL "メール送信に失敗しました。" + IDS_LOSECOLOR "この操作を行うと色情報が失われます。続行しますか？" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 3bc28067aec..b8f706e7dd7 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "Be&werken" BEGIN - MENUITEM "Ongedaan maken\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Opnieuw\tCtrl+Y", IDM_EDITREDO + MENUITEM "On&gedaan maken\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Opni&euw\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Knippen\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiëren\tCtrl+C", IDM_EDITCOPY - MENUITEM "Plakken\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selectie wissen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectie omkeren", IDM_EDITINVERTSELECTION + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectie o&mkeren", IDM_EDITINVERTSELECTION MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiëren naar...", IDM_EDITCOPYTO - MENUITEM "Plakken uit...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM END POPUP "Beel&d" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Afbeelding" BEGIN - MENUITEM "Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Bijsnijden", IDM_IMAGECROP - MENUITEM "Negatief\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Kenmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Afbeelding wissen", IDM_IMAGEDELETEIMAGE - MENUITEM "Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Bijsnijden", IDM_IMAGECROP + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "K&enmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Afbeelding wissen", IDM_IMAGEDELETEIMAGE + MENUITEM "&Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE END POPUP "&Kleuren" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index f38b5af6928..c0d2acb0761 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Rediger" BEGIN - MENUITEM "Angre\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Gjenopprett\tCtrl+Y", IDM_EDITREDO + MENUITEM "A&ngre\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Gjenopprett\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Lim inn\tCtrl+V", IDM_EDITPASTE - MENUITEM "Slett valgt\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertere valg", IDM_EDITINVERTSELECTION - MENUITEM "Velg alt\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertere valg", IDM_EDITINVERTSELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopier til...", IDM_EDITCOPYTO - MENUITEM "Lim inn fra...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM END POPUP "&Vis" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Bilde" BEGIN - MENUITEM "Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskjær", IDM_IMAGECROP - MENUITEM "Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Gjør ugjennomsiktig", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskjær", IDM_IMAGECROP + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Gjør &ugjennomsiktig", IDM_IMAGEDRAWOPAQUE END POPUP "&Farger" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Str&etch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index f172b9b0769..1707fa0b251 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -107,7 +107,7 @@ BEGIN POPUP "Popup #0" BEGIN MENUITEM "&Wytnij\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiuj\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Kopiuj\tCtrl+C", IDM_EDITCOPY MENUITEM "Wkl&ej\tCtrl+V", IDM_EDITPASTE MENUITEM "Wyczyść z&aznaczenie\tDel", IDM_EDITDELETESELECTION MENUITEM "&Zaznacz wszystko\tCtrl+A", IDM_EDITSELECTALL @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -265,4 +269,6 @@ BEGIN IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 01bb5fcdfd2..b37e0f517a3 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN BEGIN MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Cortar", IDM_IMAGECROP + MENUITEM "&Cortar", IDM_IMAGECROP MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "A&tributos...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "&Limpar imagem\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Recortar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&olar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Limpar seleção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selecionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar ¶...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 93b7f1292b7..1fae0b88f9c 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "Co&lar\tCtrl+V", IDM_EDITPASTE + MENUITEM "Limpar &selecção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiar para...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&nverter/rodar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Redimensionar/Torcer...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index f43c549153d..93581727a4a 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -4,7 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu * Copyright 2011-2018 Ștefan Fulea - * Copyright 2022 Andrei Miloiu + * Copyright 2022-2023 Andrei Miloiu */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -16,17 +16,17 @@ BEGIN POPUP "&Fișier" BEGIN MENUITEM "&Nou\tCtrl+N", IDM_FILENEW - MENUITEM "&Deschidere…\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Deschidere...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE - MENUITEM "Păst&rare în…", IDM_FILESAVEAS + MENUITEM "Păst&rare în...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "Din aparat media…", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "Din aparat media...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR MENUITEM "Pre&vizionează pagina", IDM_FILEPAGEVIEW - MENUITEM "C&onfigurare pagină…", IDM_FILEPAGESETUP - MENUITEM "I&mprimă…\tCtrl+P", IDM_FILEPRINT + MENUITEM "C&onfigurare pagină...", IDM_FILEPAGESETUP + MENUITEM "I&mprimă...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Transmite…", IDM_FILESEND + MENUITEM "Transmite...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE MENUITEM "Decor de birou (¢rat)", IDM_FILEASWALLPAPERCENTERED @@ -48,8 +48,8 @@ BEGIN MENUITEM "In&versează selecția", IDM_EDITINVERTSELECTION MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opiere în…", IDM_EDITCOPYTO - MENUITEM "Lipire di&n…", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM END POPUP "&Afișare" BEGIN @@ -78,26 +78,26 @@ BEGIN END POPUP "I&magine" BEGIN - MENUITEM "&Rotire/Oglindire…\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Întin&dere/Înclinare…\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întin&dere/Înclinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "Recoltea&ză", IDM_IMAGECROP MENUITEM "In&versează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Atribute…\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Atribute...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "Șt&erge imaginea", IDM_IMAGEDELETEIMAGE MENUITEM "Mod &opac", IDM_IMAGEDRAWOPAQUE END POPUP "&Culori" BEGIN - MENUITEM "&Editare paletă…", IDM_COLORSEDITPALETTE + MENUITEM "&Editare paletă...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR MENUITEM "Paletă &modernă", IDM_COLORSMODERNPALETTE MENUITEM "Paletă &veche", IDM_COLORSOLDPALETTE END POPUP "Aj&utor" BEGIN - MENUITEM "&Manual…", IDM_HELPHELPTOPICS + MENUITEM "&Manual...", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Despre…", IDM_HELPINFO + MENUITEM "&Despre...", IDM_HELPINFO END END @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Decupează\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiază\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE + MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întindere/În&clinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inversează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -214,7 +218,7 @@ BEGIN END IDD_FONTS DIALOG 0, 0, 225, 25 -CAPTION "Fonts" +CAPTION "Fonturi" STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" @@ -263,5 +267,7 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Eșec în păstrarea imaginii bitmap („hartă de biți”) în fișierul:\n\n%s" + IDS_CANTSENDMAIL "Eșec în trimiterea unei scrisori." + IDS_LOSECOLOR "În această operațiune informațiile legate de culoare vor fi pierdute. Sigur veți continua?" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 77436936086..964453968e6 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Russian resource file * TRANSLATORS: Copyright 2009 Dmitry Chapyshev @@ -143,6 +143,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -230,7 +234,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint для Windivs" + IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)" IDS_SAVEPROMPTTEXT "Сохранить изменения в %s?" IDS_DEFAULTFILENAME "Безымянный" @@ -266,4 +270,6 @@ BEGIN IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" + IDS_CANTSENDMAIL "Не удалось отправить письмо." + IDS_LOSECOLOR "В результате этой операции сведения о цвете будут потеряны. Продолжить?" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index bd8e3f28bfa..ecd5d49bc25 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Upraviť" BEGIN - MENUITEM "Späť\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znova\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Späť\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Znova\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vystrihnúť\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovať\tCtrl+C", IDM_EDITCOPY - MENUITEM "Prilepiť\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazať výber\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovať výber", IDM_EDITINVERTSELECTION + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovať výber", IDM_EDITINVERTSELECTION MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovať do...", IDM_EDITCOPYTO - MENUITEM "Prilepiť z...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM END POPUP "&Zobraziť" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Obrázok" BEGIN - MENUITEM "Prevrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Orezať", IDM_IMAGECROP - MENUITEM "Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Orezať", IDM_IMAGECROP + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE END POPUP "&Farby" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 44381ad680f..70c64d99dad 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Modifiko" BEGIN - MENUITEM "&v\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Undo\tCtrl+Z", IDM_EDITUNDO MENUITEM "&Perserit\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Prej\tCtrl+X", IDM_EDITCUT + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kthe perzgjedhjen", IDM_EDITINVERTSELECTION - MENUITEM "Perzgjedh te gjitha\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kth&e perzgjedhjen", IDM_EDITINVERTSELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopjo tek...", IDM_EDITCOPYTO - MENUITEM "Ngjit nga...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM END POPUP "Shiko" BEGIN @@ -77,11 +77,11 @@ BEGIN POPUP "&Imazhe" BEGIN MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Copto", IDM_IMAGECROP MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atributet...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "Vizato errët", IDM_IMAGEDRAWOPAQUE END POPUP "Ngjyrat" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 8f79b6a2b94..a046aac5276 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Redigera" BEGIN - MENUITEM "Ångra\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Göra om\tCtrl+Y", IDM_EDITREDO + MENUITEM "Å&ngra\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Göra om\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiera\tCtrl+C", IDM_EDITCOPY - MENUITEM "Klistra in\tCtrl+V", IDM_EDITPASTE - MENUITEM "Ta bort\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertera val", IDM_EDITINVERTSELECTION + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertera val", IDM_EDITINVERTSELECTION MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiera till...", IDM_EDITCOPYTO - MENUITEM "Klistra från...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM END POPUP "&Visa" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Bild" BEGIN - MENUITEM "Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskära", IDM_IMAGECROP - MENUITEM "Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Radera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "???Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskära", IDM_IMAGECROP + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ra&dera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Draw &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Färger" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index ab2e89a717c..9567339af76 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -89,7 +89,7 @@ BEGIN BEGIN MENUITEM "&Renk Paletini Düzenle...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "&Çağdaş Renk Paleti", IDM_COLORSMODERNPALETTE + MENUITEM "&Yeni Renk Paleti", IDM_COLORSMODERNPALETTE MENUITEM "&Eski Renk Paleti", IDM_COLORSOLDPALETTE END POPUP "&Yardım" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Kes\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opyala\tCtrl+C", IDM_EDITCOPY + MENUITEM "Y&apıştır\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Seçimi Sil\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Tümünü Seç\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ş&uraya Kopyala...", IDM_EDITCOPYTO + MENUITEM "Şu&radan Yapıştır...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Döndür ya da Yansıt...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Yeniden Boyutlandır veya Eğ...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&nkleri Tersine Çevir\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -261,6 +265,8 @@ BEGIN IDS_UNDERLINE "Altı Çizgili" IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTPASTE "Panodan yapıştırma işlemi başarısız oldu. Veri biçimi bozuk veya desteklenmiyor olabilir." + IDS_SAVEERROR "Dosya kaydetme başarısız oldu:\n\n%s" + IDS_CANTSENDMAIL "Mail gönderme başarısız oldu." + IDS_LOSECOLOR "Renk biçimi bu işlem sonrası kaybolacaktır. Bu işlemi yapmak istediğinizden emin misiniz?" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 412943c8bc3..647679c6a5c 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -38,18 +38,18 @@ BEGIN END POPUP "&Редагування" BEGIN - MENUITEM "Скасувати\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Повторити\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Скасувати\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Повторити\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Вирізати\tCtrl+X", IDM_EDITCUT - MENUITEM "Копіювати\tCtrl+C", IDM_EDITCOPY - MENUITEM "Вставити\tCtrl+V", IDM_EDITPASTE - MENUITEM "Видалити виділення\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обернути виділення", IDM_EDITINVERTSELECTION + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Обернути виділення", IDM_EDITINVERTSELECTION MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Копіювати до файлу...", IDM_EDITCOPYTO - MENUITEM "Вставити з файлу...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM END POPUP "В&игляд" BEGIN @@ -78,13 +78,13 @@ BEGIN END POPUP "&Зображення" BEGIN - MENUITEM "Відобразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Обітнути", IDM_IMAGECROP - MENUITEM "Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Видалити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозоре тло", IDM_IMAGEDRAWOPAQUE + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Обі&тнути", IDM_IMAGECROP + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ви&далити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Не&прозоре тло", IDM_IMAGEDRAWOPAQUE END POPUP "&Кольори" BEGIN @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -264,4 +268,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index c72aa3648ec..87280814bb3 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -37,17 +37,17 @@ BEGIN POPUP "&Chỉnh sửa" BEGIN MENUITEM "&Quay về trạng thái trước\tCtrl+Z", IDM_EDITUNDO - MENUITEM "&Quay về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO + MENUITEM "Qua&y về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION MENUITEM "&Nghịch đảo phần chọn", IDM_EDITINVERTSELECTION - MENUITEM "Chọn &Tất cả\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO - MENUITEM "Dán &từ...", IDM_EDITPASTEFROM + MENUITEM "Sa&o chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM END POPUP "&Xem" BEGIN @@ -81,7 +81,7 @@ BEGIN MENUITEM "&Cắt hình ảnh", IDM_IMAGECROP MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Thuộc tính...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Vẽ nét mờ", IDM_IMAGEDRAWOPAQUE END POPUP "&Màu sắc" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE + MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Xoay/&Lật hình ảnh...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Kéo dãn/Nghiêng...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -262,4 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 31d41c54c40..ee9e02562ab 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -81,10 +81,10 @@ BEGIN BEGIN MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "属性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "删除图像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "删除图像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明处理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "颜色(&C)" @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪切(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "复制(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "粘贴(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "删除选中区域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全部选择(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "复制到(&O)...", IDM_EDITCOPYTO + MENUITEM "从...粘贴(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -265,4 +269,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index c82ade4fcf4..6c4681475cd 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 58225aa24fc..21ba5ed365f 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 @@ -263,4 +267,6 @@ BEGIN IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index d80249afdfe..d5100fa197c 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -7,10 +7,13 @@ #include "precomp.h" +#include + POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry HINSTANCE g_hinstExe = NULL; TCHAR g_szFileName[MAX_LONG_PATH] = { 0 }; +WCHAR g_szMailTempFile[MAX_LONG_PATH] = { 0 }; BOOL g_isAFile = FALSE; BOOL g_imageSaved = FALSE; BOOL g_showGrid = FALSE; @@ -69,6 +72,116 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } +typedef ULONG (WINAPI *FN_MAPISendMail)(LHANDLE, ULONG_PTR, lpMapiMessage, FLAGS, ULONG); +typedef ULONG (WINAPI *FN_MAPISendMailW)(LHANDLE, ULONG_PTR, lpMapiMessageW, FLAGS, ULONG); + +BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) +{ + // Delete the temporary file if any + if (g_szMailTempFile[0]) + { + ::DeleteFileW(g_szMailTempFile); + g_szMailTempFile[0] = UNICODE_NULL; + } + + CStringW strFileTitle; + if (PathFileExistsW(pszPathName) && imageModel.IsImageSaved()) + { + strFileTitle = PathFindFileNameW(pszPathName); + } + else // Not existing or not saved + { + // Get the name of a temporary file + WCHAR szTempDir[MAX_PATH]; + ::GetTempPathW(_countof(szTempDir), szTempDir); + if (!::GetTempFileNameW(szTempDir, L"afx", 0, g_szMailTempFile)) + return FALSE; // Failure + + if (PathFileExistsW(g_szFileName)) + { + // Set file title + strFileTitle = PathFindFileNameW(g_szFileName); + + // Copy to the temporary file + if (!::CopyFileW(g_szFileName, g_szMailTempFile, FALSE)) + { + g_szMailTempFile[0] = UNICODE_NULL; + return FALSE; // Failure + } + } + else + { + // Set file title + strFileTitle.LoadString(IDS_DEFAULTFILENAME); + strFileTitle += L".png"; + + // Save it to the temporary file + HBITMAP hbmLocked = imageModel.LockBitmap(); + BOOL ret = SaveDIBToFile(hbmLocked, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); + imageModel.UnlockBitmap(hbmLocked); + if (!ret) + { + g_szMailTempFile[0] = UNICODE_NULL; + return FALSE; // Failure + } + } + + // Use the temporary file + pszPathName = g_szMailTempFile; + } + + // Load "mapi32.dll" + HINSTANCE hMAPI = LoadLibraryW(L"mapi32.dll"); + if (!hMAPI) + return FALSE; // Failure + + // Attachment + MapiFileDescW attachmentW = { 0 }; + attachmentW.nPosition = (ULONG)-1; + attachmentW.lpszPathName = (LPWSTR)pszPathName; + attachmentW.lpszFileName = (LPWSTR)(LPCWSTR)strFileTitle; + + // Message with attachment + MapiMessageW messageW = { 0 }; + messageW.lpszSubject = NULL; + messageW.nFileCount = 1; + messageW.lpFiles = &attachmentW; + + // First, try to open the mailer by the function of Unicode version + FN_MAPISendMailW pMAPISendMailW = (FN_MAPISendMailW)::GetProcAddress(hMAPI, "MAPISendMailW"); + if (pMAPISendMailW) + { + pMAPISendMailW(0, (ULONG_PTR)hWnd, &messageW, MAPI_DIALOG | MAPI_LOGON_UI, 0); + ::FreeLibrary(hMAPI); + return TRUE; // MAPISendMailW will show an error message on failure + } + + // Convert to ANSI strings + CStringA szPathNameA(pszPathName), szFileTitleA(strFileTitle); + + MapiFileDesc attachment = { 0 }; + attachment.nPosition = (ULONG)-1; + attachment.lpszPathName = (LPSTR)(LPCSTR)szPathNameA; + attachment.lpszFileName = (LPSTR)(LPCSTR)szFileTitleA; + + MapiMessage message = { 0 }; + message.lpszSubject = NULL; + message.nFileCount = 1; + message.lpFiles = &attachment; + + // Try again but in ANSI version + FN_MAPISendMail pMAPISendMail = (FN_MAPISendMail)::GetProcAddress(hMAPI, "MAPISendMail"); + if (pMAPISendMail) + { + pMAPISendMail(0, (ULONG_PTR)hWnd, &message, MAPI_DIALOG | MAPI_LOGON_UI, 0); + ::FreeLibrary(hMAPI); + return TRUE; // MAPISendMail will show an error message on failure + } + + ::FreeLibrary(hMAPI); + return FALSE; // Failure +} + BOOL CMainWindow::GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) { static OPENFILENAME ofn = { 0 }; @@ -238,6 +351,9 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC // Write back settings to registry registrySettings.Store(); + if (g_szMailTempFile[0]) + ::DeleteFileW(g_szMailTempFile); + // Return the value that PostQuitMessage() gave return (INT)msg.wParam; } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f6cb9e2ac22..423f876c32b 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -18,28 +18,28 @@ POINT ToolBase::s_pointStack[256] = { { 0 } }; void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + if (labs(x1 - x0) >= labs(y1 - y0)) + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } void roundTo8Directions(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) + if (labs(x1 - x0) >= labs(y1 - y0)) { - if (abs(y1 - y0) * 5 < abs(x1 - x0) * 2) + if (labs(y1 - y0) * 5 < labs(x1 - x0) * 2) y1 = y0; else - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); } else { - if (abs(x1 - x0) * 5 < abs(y1 - y0) * 2) + if (labs(x1 - x0) * 5 < labs(y1 - y0) * 2) x1 = x0; else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } } @@ -50,18 +50,6 @@ BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1) return (abs(x1 - x0) <= cxThreshold) && (abs(y1 - y0) <= cyThreshold); } -void updateStartAndLast(LONG x, LONG y) -{ - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; -} - -void updateLast(LONG x, LONG y) -{ - g_ptEnd.x = x; - g_ptEnd.y = y; -} - void ToolBase::reset() { s_pointSP = 0; @@ -124,10 +112,7 @@ struct FreeSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundPoly(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { @@ -153,7 +138,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -162,9 +147,10 @@ struct FreeSelTool : ToolBase selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -186,6 +172,7 @@ struct FreeSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -199,6 +186,11 @@ struct FreeSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; // TOOL_RECTSEL @@ -213,10 +205,7 @@ struct RectSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundRect(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { @@ -241,7 +230,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -250,9 +239,10 @@ struct RectSelTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; if (bLeftButton) @@ -267,6 +257,7 @@ struct RectSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -280,6 +271,11 @@ struct RectSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; struct TwoPointDrawTool : ToolBase @@ -295,26 +291,22 @@ struct TwoPointDrawTool : ToolBase { m_bLeftButton = bLeftButton; m_bDrawing = TRUE; - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.PushImageForUndo(); OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); + return TRUE; } void OnFinishDraw() override @@ -328,10 +320,108 @@ struct TwoPointDrawTool : ToolBase m_bDrawing = FALSE; ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; +typedef enum DIRECTION +{ + NO_DIRECTION = -1, + DIRECTION_HORIZONTAL, + DIRECTION_VERTICAL, + DIRECTION_DIAGONAL_RIGHT_DOWN, + DIRECTION_DIAGONAL_RIGHT_UP, +} DIRECTION; + +#define THRESHOULD_DEG 15 + +static DIRECTION +GetDirection(LONG x0, LONG y0, LONG x1, LONG y1) +{ + LONG dx = x1 - x0, dy = y1 - y0; + + if (labs(dx) <= 8 && labs(dy) <= 8) + return NO_DIRECTION; + + double radian = atan2((double)dy, (double)dx); + if (radian < DEG2RAD(-180 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(-90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(-90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(-THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + if (radian < DEG2RAD(+THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(+90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(+90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(+180 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; +} + +static void +RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) +{ + switch (dir) + { + case NO_DIRECTION: + default: + return; + + case DIRECTION_HORIZONTAL: + y1 = y0; + break; + + case DIRECTION_VERTICAL: + x1 = x0; + break; + + case DIRECTION_DIAGONAL_RIGHT_DOWN: + y1 = y0 + (x1 - x0); + break; + + case DIRECTION_DIAGONAL_RIGHT_UP: + x1 = x0 - (y1 - y0); + break; + } +} + struct SmoothDrawTool : ToolBase { + DIRECTION m_direction = NO_DIRECTION; + SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { } @@ -340,22 +430,51 @@ struct SmoothDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { + if (::GetKeyState(VK_SHIFT) < 0) // Shift key is pressed + { + if (m_direction == NO_DIRECTION) + { + m_direction = GetDirection(g_ptStart.x, g_ptStart.y, x, y); + if (m_direction == NO_DIRECTION) + return FALSE; + } + + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + else + { + if (m_direction != NO_DIRECTION) + { + m_direction = NO_DIRECTION; + draw(bLeftButton, x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + return TRUE; + } + } + draw(bLeftButton, x, y); imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { + if (m_direction != NO_DIRECTION) + { + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + draw(bLeftButton, x, y); OnFinishDraw(); + return TRUE; } void OnFinishDraw() override @@ -365,7 +484,8 @@ struct SmoothDrawTool : ToolBase void OnCancelDraw() override { - OnButtonUp(FALSE, 0, 0); + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } @@ -384,8 +504,11 @@ struct RubberTool : SmoothDrawTool Erase(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_bg, toolsModel.GetRubberRadius()); else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); - g_ptEnd.x = x; - g_ptEnd.y = y; + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeRubberThickerOrThinner(bMinus); } }; @@ -425,41 +548,84 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + return TRUE; } }; // TOOL_ZOOM struct ZoomTool : ToolBase { + BOOL m_bZoomed = FALSE; + ZoomTool() : ToolBase(TOOL_ZOOM) { } + BOOL getNewZoomRect(CRect& rcView, INT newZoom); + + void OnDrawOverlayOnCanvas(HDC hdc) override + { + CRect rcView; + INT oldZoom = toolsModel.GetZoom(); + if (oldZoom < MAX_ZOOM && getNewZoomRect(rcView, oldZoom * 2)) + DrawXorRect(hdc, &rcView); + } + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { - imageModel.PushImageForUndo(); + INT newZoom, oldZoom = toolsModel.GetZoom(); if (bLeftButton) - { - if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, x, y); - } + newZoom = (oldZoom < MAX_ZOOM) ? (oldZoom * 2) : MIN_ZOOM; else + newZoom = (oldZoom > MIN_ZOOM) ? (oldZoom / 2) : MAX_ZOOM; + + m_bZoomed = FALSE; + + if (oldZoom != newZoom) { - if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, x, y); + CRect rcView; + if (getNewZoomRect(rcView, newZoom)) + { + canvasWindow.zoomTo(newZoom, rcView.left, rcView.top); + m_bZoomed = TRUE; + } } } + + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + { + if (m_bZoomed) + toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + + return TRUE; + } }; +BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) +{ + CPoint pt; + ::GetCursorPos(&pt); + canvasWindow.ScreenToClient(&pt); + + canvasWindow.getNewZoomRect(rcView, newZoom, pt); + + CRect rc; + canvasWindow.GetImageRect(rc); + canvasWindow.ImageToCanvas(rc); + + return rc.PtInRect(pt); +} + // TOOL_PEN struct PenTool : SmoothDrawTool { @@ -470,10 +636,12 @@ struct PenTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, 1); - ::SetPixelV(m_hdc, x, y, rgb); - g_ptEnd.x = x; - g_ptEnd.y = y; + Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetPenWidth()); + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakePenThickerOrThinner(bMinus); } }; @@ -487,9 +655,13 @@ struct BrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); - g_ptEnd.x = x; - g_ptEnd.y = y; + Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle(), + toolsModel.GetBrushWidth()); + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeBrushThickerOrThinner(bMinus); } }; @@ -505,6 +677,11 @@ struct AirBrushTool : SmoothDrawTool COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeAirBrushThickerOrThinner(bMinus); + } }; // TOOL_TEXT @@ -540,9 +717,10 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { UpdatePoint(x, y); + return TRUE; } void draw(HDC hdc) @@ -568,7 +746,7 @@ struct TextTool : ToolBase selectionModel.HideSelection(); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; imageModel.Clamp(pt); @@ -585,7 +763,7 @@ struct TextTool : ToolBase if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); - return; + return TRUE; } } @@ -620,11 +798,13 @@ struct TextTool : ToolBase textEditWindow.ValidateEditRect(&rc); textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); textEditWindow.SetFocus(); + return TRUE; } void OnFinishDraw() override { - if (textEditWindow.GetWindowTextLength() > 0) + if (::IsWindowVisible(textEditWindow) && + textEditWindow.GetWindowTextLength() > 0) { imageModel.PushImageForUndo(); draw(m_hdc); @@ -710,23 +890,25 @@ struct BezierTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { OnFinishDraw(); - return; + return TRUE; } imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -742,6 +924,11 @@ struct BezierTool : ToolBase m_bDrawing = FALSE; ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_RECT @@ -812,7 +999,7 @@ struct ShapeTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -821,9 +1008,10 @@ struct ShapeTool : ToolBase s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -832,7 +1020,7 @@ struct ShapeTool : ToolBase if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); - return; + return TRUE; } else { @@ -845,6 +1033,7 @@ struct ShapeTool : ToolBase s_pointSP--; imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -868,6 +1057,11 @@ struct ShapeTool : ToolBase ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_ELLIPSE diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 368ce304461..f3e6b9d0d1b 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -22,6 +22,8 @@ #include #include #include +#define _USE_MATH_DEFINES /* for M_PI */ +#include #include #include #include "atlimagedx.h" @@ -51,6 +53,7 @@ #include "toolsmodel.h" #include "winproc.h" #include "dialogs.h" +#include #include "globalvar.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 1e34232d3c1..3f87e6e42e1 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -22,6 +22,7 @@ #define IDC_ZOOM 532 #define IDC_PEN 533 #define IDC_AIRBRUSH 534 +#define IDC_HANDDRAG 535 #define IDI_HORZSTRETCH 535 #define IDI_VERTSTRETCH 536 @@ -102,6 +103,9 @@ #define IDM_UNDERLINE 282 #define IDM_VERTICAL 283 +#define IDM_CTRL_PLUS 290 +#define IDM_CTRL_MINUS 291 + /* the following 16 numbers need to be in order, increasing by 1 */ #define ID_FREESEL 600 #define ID_RECTSEL 601 @@ -221,3 +225,5 @@ #define IDS_PRINTRES 939 #define IDS_CANTPASTE 940 #define IDS_SAVEERROR 941 +#define IDS_CANTSENDMAIL 942 +#define IDS_LOSECOLOR 943 diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 8950699e968..9d3a7890b5d 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -33,6 +33,7 @@ IDC_COLOR ICON "icons/color_cur.ico" IDC_ZOOM ICON "icons/zoom_cur.ico" IDC_PEN ICON "icons/pen_cur.ico" IDC_AIRBRUSH ICON "icons/airbrush_cur.ico" +IDC_HANDDRAG CURSOR "icons/handdrag.cur" IDI_HORZSTRETCH ICON "icons/horzstretch.ico" IDI_VERTSTRETCH ICON "icons/vertstretch.ico" diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 843979f05bd..5657f824ed2 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -28,8 +28,8 @@ SelectionModel::SelectionModel() SelectionModel::~SelectionModel() { - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ResetPtStack(); } @@ -85,7 +85,7 @@ void SelectionModel::BuildMaskFromPtStack() m_rc = m_rcOld = rc; - ClearMask(); + ClearMaskImage(); ShiftPtStack(-m_rcOld.left, -m_rcOld.top); @@ -154,7 +154,7 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTranspar void SelectionModel::GetSelectionContents(HDC hDCImage) { - ClearColor(); + ClearColorImage(); HDC hMemDC = ::CreateCompatibleDC(NULL); m_hbmColor = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); @@ -174,14 +174,30 @@ BOOL SelectionModel::TakeOff() if (!IsLanded() || ::IsRectEmpty(&m_rc)) return FALSE; + // The background color is needed for transparency of selection m_rgbBack = paletteModel.GetBgColor(); + + // Get the contents of the selection area GetSelectionContents(imageModel.GetDC()); + // RectSel doesn't need the mask image if (toolsModel.GetActiveTool() == TOOL_RECTSEL) - ClearMask(); + ClearMaskImage(); + // Save the selection area m_rcOld = m_rc; + if (toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.PushImageForUndo(); + selectionModel.DrawBackgroundRect(imageModel.GetDC(), selectionModel.m_rgbBack); + } + else if (toolsModel.GetActiveTool() == TOOL_FREESEL) + { + imageModel.PushImageForUndo(); + selectionModel.DrawBackgroundPoly(imageModel.GetDC(), selectionModel.m_rgbBack); + } + imageModel.NotifyImageChanged(); return TRUE; } @@ -225,7 +241,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP h } else { - ClearMask(); + ClearMaskImage(); } NotifyContentChanged(); @@ -458,7 +474,7 @@ void SelectionModel::Dragging(HITTEST hit, POINT pt) m_ptHit = pt; } -void SelectionModel::ClearMask() +void SelectionModel::ClearMaskImage() { if (m_hbmMask) { @@ -467,7 +483,7 @@ void SelectionModel::ClearMask() } } -void SelectionModel::ClearColor() +void SelectionModel::ClearColorImage() { if (m_hbmColor) { @@ -479,8 +495,8 @@ void SelectionModel::ClearColor() void SelectionModel::HideSelection() { m_bShow = m_bContentChanged = FALSE; - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); imageModel.NotifyImageChanged(); @@ -528,3 +544,38 @@ void SelectionModel::SwapWidthAndHeight() m_rc.right = m_rc.left + cy; m_rc.bottom = m_rc.top + cx; } + +HBITMAP SelectionModel::LockBitmap() +{ + HBITMAP hbm = m_hbmColor; + m_hbmColor = NULL; + return hbm; +} + +void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hbmColor = hbmLocked; +} + +void SelectionModel::StretchSelection(BOOL bShrink) +{ + if (!m_bShow) + return; + + TakeOff(); + + INT cx = m_rc.Width(), cy = m_rc.Height(); + + if (bShrink) + m_rc.InflateRect(-cx / 4, -cy / 4); + else + m_rc.InflateRect(+cx / 2, +cy / 2); + + // The selection area must exist there + if (m_rc.Width() <= 0) + m_rc.right = m_rc.left + 1; + if (m_rc.Height() <= 0) + m_rc.bottom = m_rc.top + 1; + + imageModel.NotifyImageChanged(); +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 6585088f1c1..7e927564758 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -23,6 +23,7 @@ class SelectionModel CRect m_rc; // in image pixel coordinates POINT m_ptHit; // in image pixel coordinates CRect m_rcOld; // in image pixel coordinates + INT m_nSelectionBrush = 0; SelectionModel(); ~SelectionModel(); @@ -40,6 +41,8 @@ class SelectionModel void DeleteSelection(); HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void GetSelectionContents(HDC hDCImage); void DrawFramePoly(HDC hDCImage); void DrawBackground(HDC hDCImage); @@ -56,10 +59,12 @@ class SelectionModel void InvertSelection(); void Dragging(HITTEST hit, POINT pt); - void ClearMask(); - void ClearColor(); + void ClearMaskImage(); + void ClearColorImage(); void NotifyContentChanged(); + void StretchSelection(BOOL bShrink); + private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index e5b51aa3de3..39cc1ba40e3 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -187,6 +187,12 @@ LRESULT CTextEditWindow::OnNCHitTest(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + UINT nHitTest = LOWORD(lParam); if (nHitTest == HTCAPTION) { @@ -334,8 +340,8 @@ void CTextEditWindow::UpdateFont() ZeroMemory(&lf, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; // registrySettings.CharSet; // Ignore lf.lfWeight = (registrySettings.Bold ? FW_BOLD : FW_NORMAL); - lf.lfItalic = registrySettings.Italic; - lf.lfUnderline = registrySettings.Underline; + lf.lfItalic = (BYTE)registrySettings.Italic; + lf.lfUnderline = (BYTE)registrySettings.Underline; lstrcpyn(lf.lfFaceName, registrySettings.strFontName, _countof(lf.lfFaceName)); HDC hdc = GetDC(); diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index b02d4fb99b8..891093f3f77 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -20,8 +20,13 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { // We have to detect clicking on toolbar even if no change of pressed button POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - INT id = (INT)SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); - ::PostMessage(::GetParent(hwnd), WM_TOOLBARHIT, id, 0); + INT index = (INT)::SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); + if (index >= 0) + { + TBBUTTON button; + if (::SendMessage(hwnd, TB_GETBUTTON, index, (LPARAM)&button)) + ::PostMessage(::GetParent(hwnd), WM_COMMAND, button.idCommand, 0); + } } return ::CallWindowProc(oldWndProc, hwnd, uMsg, wParam, lParam); } @@ -29,7 +34,12 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam BOOL CPaintToolBar::DoCreate(HWND hwndParent) { // NOTE: The horizontal line above the toolbar is hidden by CCS_NODIVIDER style. - RECT toolbarPos = { 0, 0, CX_TOOLBAR, CY_TOOLBAR }; + RECT toolbarPos = + { + 0, 0, + CX_TOOLBAR + 2 * GetSystemMetrics(SM_CXBORDER), + CY_TOOLBAR + 2 * GetSystemMetrics(SM_CYBORDER) + }; DWORD style = WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT; if (!CWindow::Create(TOOLBARCLASSNAME, hwndParent, toolbarPos, NULL, style)) @@ -112,6 +122,7 @@ static const COMMAND_TO_TOOL CommandToToolMapping[] = { ID_ELLIPSE, TOOL_ELLIPSE }, { ID_RRECT, TOOL_RRECT }, }; +static_assert(_countof(CommandToToolMapping) == TOOL_MAX, "Logical error"); LRESULT CToolBox::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { @@ -183,10 +194,3 @@ LRESULT CToolBox::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa ::ReleaseCapture(); return 0; } - -LRESULT CToolBox::OnToolBarHit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - // See also: CPaintToolBar::ToolBarWndProc - selectionModel.Landing(); - return 0; -} diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 859493407a4..291032c1fcf 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -14,8 +14,6 @@ #define CX_TOOLBAR (TOOLBAR_COLUMNS * CXY_TB_BUTTON) #define CY_TOOLBAR (TOOLBAR_ROWS * CXY_TB_BUTTON) -#define WM_TOOLBARHIT (WM_APP + 1) - class CPaintToolBar : public CWindow { public: @@ -36,7 +34,6 @@ class CToolBox : public CWindowImpl MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) - MESSAGE_HANDLER(WM_TOOLBARHIT, OnToolBarHit) END_MSG_MAP() BOOL DoCreate(HWND hwndParent); @@ -51,5 +48,4 @@ class CToolBox : public CWindowImpl LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnToolBarHit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 4d9f63ae0f6..64f09ed80e9 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -21,6 +21,10 @@ #define MARGIN1 3 #define MARGIN2 2 +#define MAX_ZOOM_TRACK 6 +#define MIN_ZOOM_TRACK 0 +#define DEFAULT_ZOOM_TRACK 3 + static const BYTE s_AirRadius[4] = { 5, 8, 3, 12 }; CToolSettingsWindow toolSettingsWindow; @@ -112,23 +116,43 @@ static inline INT getBrushRects(RECT rects[12], LPCRECT prc, LPPOINT ppt = NULL) return getSplitRects(rects, 3, 4, prc, ppt); } +struct BrushStyleAndWidth +{ + BrushStyle style; + INT width; +}; + +static const BrushStyleAndWidth c_BrushPresets[] = +{ + { BrushStyleRound, 7 }, { BrushStyleRound, 4 }, { BrushStyleRound, 1 }, + { BrushStyleSquare, 8 }, { BrushStyleSquare, 5 }, { BrushStyleSquare, 2 }, + { BrushStyleForeSlash, 8 }, { BrushStyleForeSlash, 5 }, { BrushStyleForeSlash, 2 }, + { BrushStyleBackSlash, 8 }, { BrushStyleBackSlash, 5 }, { BrushStyleBackSlash, 2 }, +}; + VOID CToolSettingsWindow::drawBrush(HDC hdc, LPCRECT prc) { RECT rects[12]; getBrushRects(rects, prc); - ::FillRect(hdc, &rects[toolsModel.GetBrushStyle()], (HBRUSH)(COLOR_HIGHLIGHT + 1)); - for (INT i = 0; i < 12; i++) { RECT rcItem = rects[i]; INT x = (rcItem.left + rcItem.right) / 2, y = (rcItem.top + rcItem.bottom) / 2; + INT iColor; - if (i == toolsModel.GetBrushStyle()) + const BrushStyleAndWidth& data = c_BrushPresets[i]; + if (data.width == toolsModel.GetBrushWidth() && data.style == toolsModel.GetBrushStyle()) + { iColor = COLOR_HIGHLIGHTTEXT; + ::FillRect(hdc, &rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + } else + { iColor = COLOR_WINDOWTEXT; - Brush(hdc, x, y, x, y, ::GetSysColor(iColor), i); + } + + Brush(hdc, x, y, x, y, ::GetSysColor(iColor), data.style, data.width); } } @@ -257,7 +281,7 @@ VOID CToolSettingsWindow::drawBox(HDC hdc, LPCRECT prc) } } -LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, WINBOOL& bHandled) +LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* preloading the draw transparent/nontransparent icons for later use */ m_hNontranspIcon = (HICON)LoadImage(g_hinstExe, MAKEINTRESOURCE(IDI_NONTRANSPARENT), @@ -265,10 +289,13 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, W m_hTranspIcon = (HICON)LoadImage(g_hinstExe, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); - RECT trackbarZoomPos = {1, 1, 1 + 40, 1 + 64}; + RECT trackbarZoomPos, rect2; + calculateTwoBoxes(trackbarZoomPos, rect2); + ::InflateRect(&trackbarZoomPos, -1, -1); + trackbarZoom.Create(TRACKBAR_CLASS, m_hWnd, trackbarZoomPos, NULL, WS_CHILD | TBS_VERT | TBS_AUTOTICKS); - trackbarZoom.SendMessage(TBM_SETRANGE, (WPARAM) TRUE, MAKELPARAM(0, 6)); - trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 3); + trackbarZoom.SendMessage(TBM_SETRANGE, TRUE, MAKELPARAM(MIN_ZOOM_TRACK, MAX_ZOOM_TRACK)); + trackbarZoom.SendMessage(TBM_SETPOS, TRUE, DEFAULT_ZOOM_TRACK); return 0; } @@ -281,9 +308,30 @@ LRESULT CToolSettingsWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (!zoomTo(125 << trackbarZoom.SendMessage(TBM_GETPOS, 0, 0), 0, 0)) + INT trackPos = MAX_ZOOM_TRACK - (INT)trackbarZoom.SendMessage(TBM_GETPOS, 0, 0); + canvasWindow.zoomTo(MIN_ZOOM << trackPos); + + INT zoomRate = toolsModel.GetZoom(); + + CString strZoom; + if (zoomRate % 10 == 0) + strZoom.Format(_T("%d%%"), zoomRate / 10); + else + strZoom.Format(_T("%d.%d%%"), zoomRate / 10, zoomRate % 10); + + ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCTSTR)strZoom); + + OnToolsModelZoomChanged(nMsg, wParam, lParam, bHandled); + return 0; +} + +LRESULT CToolSettingsWindow::OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + NMHDR *pnmhdr = (NMHDR*)lParam; + if (pnmhdr->code == NM_CUSTOMDRAW) { - OnToolsModelZoomChanged(nMsg, wParam, lParam, bHandled); + NMCUSTOMDRAW *pCustomDraw = (NMCUSTOMDRAW*)pnmhdr; + pCustomDraw->uItemState &= ~CDIS_FOCUS; // Do not draw the focus } return 0; } @@ -310,9 +358,7 @@ LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BO PAINTSTRUCT ps; HDC hdc = BeginPaint(&ps); - if (toolsModel.GetActiveTool() == TOOL_ZOOM) - ::DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, BF_RECT); - else + if (toolsModel.GetActiveTool() != TOOL_ZOOM) ::DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); if (toolsModel.GetActiveTool() >= TOOL_RECT) @@ -383,7 +429,11 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar case TOOL_BRUSH: iItem = getBrushRects(rects, &rect1, &pt); if (iItem != -1) - toolsModel.SetBrushStyle(iItem); + { + const BrushStyleAndWidth& data = c_BrushPresets[iItem]; + toolsModel.SetBrushStyle(data.style); + toolsModel.SetBrushWidth(data.width); + } break; case TOOL_AIRBRUSH: iItem = getAirBrushRects(rects, &rect1, &pt); @@ -434,7 +484,7 @@ LRESULT CToolSettingsWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wPara LRESULT CToolSettingsWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - int tbPos = 0; + int tbPos = MIN_ZOOM_TRACK; int tempZoom = toolsModel.GetZoom(); while (tempZoom > MIN_ZOOM) @@ -442,6 +492,7 @@ LRESULT CToolSettingsWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, L tbPos++; tempZoom = tempZoom >> 1; } - trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) tbPos); + + trackbarZoom.SendMessage(TBM_SETPOS, TRUE, MAX_ZOOM_TRACK - tbPos); return 0; } diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index be9b09928dd..2c200c333f2 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -17,6 +17,7 @@ class CToolSettingsWindow : public CWindowImpl MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) @@ -43,6 +44,7 @@ class CToolSettingsWindow : public CWindowImpl LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 604d4bead54..dec101adc9e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -13,9 +13,10 @@ ToolsModel toolsModel; ToolsModel::ToolsModel() { - m_lineWidth = 1; + m_lineWidth = m_penWidth = 1; + m_brushWidth = 4; m_shapeStyle = 0; - m_brushStyle = 0; + m_brushStyle = BrushStyleRound; m_oldActiveTool = m_activeTool = TOOL_PEN; m_airBrushWidth = 5; m_rubberRadius = 4; @@ -53,6 +54,61 @@ void ToolsModel::SetLineWidth(int nLineWidth) { m_lineWidth = nLineWidth; NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +INT ToolsModel::GetPenWidth() const +{ + return m_penWidth; +} + +void ToolsModel::SetPenWidth(INT nPenWidth) +{ + m_penWidth = nPenWidth; + NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +INT ToolsModel::GetBrushWidth() const +{ + return m_brushWidth; +} + +void ToolsModel::SetBrushWidth(INT nBrushWidth) +{ + m_brushWidth = nBrushWidth; + NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +void ToolsModel::MakeLineThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetLineWidth(); + SetLineWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakePenThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetPenWidth(); + SetPenWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetBrushWidth(); + SetBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakeAirBrushThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetAirBrushWidth(); + SetAirBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakeRubberThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetRubberRadius(); + SetRubberRadius(bThinner ? max(1, thickness - 1) : (thickness + 1)); } int ToolsModel::GetShapeStyle() const @@ -66,12 +122,12 @@ void ToolsModel::SetShapeStyle(int nShapeStyle) NotifyToolSettingsChanged(); } -int ToolsModel::GetBrushStyle() const +BrushStyle ToolsModel::GetBrushStyle() const { return m_brushStyle; } -void ToolsModel::SetBrushStyle(int nBrushStyle) +void ToolsModel::SetBrushStyle(BrushStyle nBrushStyle) { m_brushStyle = nBrushStyle; NotifyToolSettingsChanged(); @@ -91,23 +147,38 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) { OnFinishDraw(); + selectionModel.Landing(); + + m_activeTool = nActiveTool; + switch (m_activeTool) { case TOOL_FREESEL: case TOOL_RECTSEL: - case TOOL_RUBBER: case TOOL_COLOR: case TOOL_ZOOM: case TOOL_TEXT: + // The active tool is not an actually drawing tool break; - default: - m_oldActiveTool = m_activeTool; + case TOOL_LINE: + case TOOL_BEZIER: + case TOOL_RECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + case TOOL_FILL: + case TOOL_AIRBRUSH: + case TOOL_RRECT: + case TOOL_RUBBER: + case TOOL_BRUSH: + case TOOL_PEN: + // The active tool is an actually drawing tool. Save it for TOOL_COLOR to restore + m_oldActiveTool = nActiveTool; break; } - m_activeTool = nActiveTool; m_pToolObject = GetOrCreateTool(m_activeTool); + NotifyToolChanged(); } @@ -189,7 +260,8 @@ void ToolsModel::NotifyZoomChanged() void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { m_pToolObject->beginEvent(); - updateStartAndLast(x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); m_pToolObject->endEvent(); } @@ -197,16 +269,22 @@ void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClic void ToolsModel::OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnMouseMove(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnMouseMove(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnButtonUp(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnButtonUp(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } @@ -248,3 +326,8 @@ void ToolsModel::selectAll() OnMouseMove(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); OnButtonUp(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); } + +void ToolsModel::SpecialTweak(BOOL bMinus) +{ + m_pToolObject->OnSpecialTweak(bMinus); +} diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index a00e8682a5f..d90faee117b 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -28,6 +28,14 @@ enum TOOLTYPE TOOL_MAX = TOOL_RRECT, }; +enum BrushStyle +{ + BrushStyleRound, + BrushStyleSquare, + BrushStyleForeSlash, + BrushStyleBackSlash, +}; + /* CLASSES **********************************************************/ struct ToolBase @@ -42,8 +50,8 @@ struct ToolBase virtual ~ToolBase() { } virtual void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { } - virtual void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { } - virtual void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { } + virtual BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } + virtual BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } virtual void OnCancelDraw(); virtual void OnFinishDraw(); @@ -51,6 +59,8 @@ struct ToolBase virtual void OnDrawOverlayOnImage(HDC hdc) { } virtual void OnDrawOverlayOnCanvas(HDC hdc) { } + virtual void OnSpecialTweak(BOOL bMinus) { } + void beginEvent(); void endEvent(); void reset(); @@ -65,8 +75,10 @@ class ToolsModel { private: int m_lineWidth; + INT m_penWidth; + INT m_brushWidth; int m_shapeStyle; - int m_brushStyle; + BrushStyle m_brushStyle; TOOLTYPE m_activeTool; TOOLTYPE m_oldActiveTool; int m_airBrushWidth; @@ -83,21 +95,40 @@ class ToolsModel ~ToolsModel(); BOOL IsSelection() const; + int GetLineWidth() const; void SetLineWidth(int nLineWidth); + void MakeLineThickerOrThinner(BOOL bThinner); + + INT GetPenWidth() const; + void SetPenWidth(INT nPenWidth); + void MakePenThickerOrThinner(BOOL bThinner); + int GetShapeStyle() const; void SetShapeStyle(int nShapeStyle); - int GetBrushStyle() const; - void SetBrushStyle(int nBrushStyle); + + INT GetBrushWidth() const; + void SetBrushWidth(INT nBrushWidth); + void MakeBrushThickerOrThinner(BOOL bThinner); + + BrushStyle GetBrushStyle() const; + void SetBrushStyle(BrushStyle nBrushStyle); + TOOLTYPE GetActiveTool() const; TOOLTYPE GetOldActiveTool() const; void SetActiveTool(TOOLTYPE nActiveTool); + int GetAirBrushWidth() const; void SetAirBrushWidth(int nAirBrushWidth); + void MakeAirBrushThickerOrThinner(BOOL bThinner); + int GetRubberRadius() const; void SetRubberRadius(int nRubberRadius); + void MakeRubberThickerOrThinner(BOOL bThinner); + BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent); + int GetZoom() const; void SetZoom(int nZoom); @@ -115,6 +146,8 @@ class ToolsModel void NotifyToolChanged(); void NotifyToolSettingsChanged(); void NotifyZoomChanged(); + + void SpecialTweak(BOOL bMinus); }; extern ToolsModel toolsModel; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ba3fbbc72a3..1cb79a3b6c2 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -41,42 +41,12 @@ static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_P return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); } -BOOL -zoomTo(int newZoom, int mouseX, int mouseY) -{ - int x, y, w, h; - RECT clientRectScrollbox; - canvasWindow.GetClientRect(&clientRectScrollbox); - - RECT clientRectImageArea; - ::SetRect(&clientRectImageArea, 0, 0, imageModel.GetWidth(), imageModel.GetHeight()); - Zoomed(clientRectImageArea); - - w = clientRectImageArea.right * newZoom / toolsModel.GetZoom(); - h = clientRectImageArea.bottom * newZoom / toolsModel.GetZoom(); - if (!w || !h) - { - return FALSE; - } - w = clientRectImageArea.right * clientRectScrollbox.right / w; - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / h; - x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / toolsModel.GetZoom(); - y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / toolsModel.GetZoom(); - - toolsModel.SetZoom(newZoom); - - canvasWindow.Invalidate(TRUE); - - canvasWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); - canvasWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); - return TRUE; -} - void CMainWindow::alignChildrenToMainWindow() { RECT clientRect, rc; GetClientRect(&clientRect); RECT rcSpace = clientRect; + const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); if (::IsWindowVisible(g_hStatusBar)) { @@ -93,7 +63,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.right - CX_TOOLBAR, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.right -= CX_TOOLBAR; } else @@ -101,7 +71,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.left, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.left += CX_TOOLBAR; } } @@ -113,7 +83,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.bottom - CY_PALETTE, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.bottom -= CY_PALETTE; } else @@ -121,7 +91,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.top += CY_PALETTE; } } @@ -131,7 +101,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); } ::EndDeferWindowPos(hDWP); @@ -205,20 +175,20 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { INT zDelta = (SHORT)HIWORD(wParam); - if (::GetAsyncKeyState(VK_CONTROL) < 0) + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Wheel { if (zDelta < 0) { if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() / 2); } else if (zDelta > 0) { if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() * 2); } } - else + else // Wheel only { UINT nCount = 3; if (::GetAsyncKeyState(VK_SHIFT) < 0) @@ -657,6 +627,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (pd.hDevNames) GlobalFree(pd.hDevNames); break; + case IDM_FILESEND: + canvasWindow.finishDrawing(); + if (!OpenMailer(m_hWnd, g_szFileName)) + { + ShowError(IDS_CANTSENDMAIL); + } + break; case IDM_FILEASWALLPAPERPLANE: RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::TILED); break; @@ -687,6 +664,16 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (toolsModel.IsSelection()) { canvasWindow.cancelDrawing(); + if (toolsModel.GetActiveTool() == TOOL_FREESEL || + toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.Undo(); + if (selectionModel.m_nSelectionBrush == 2) // Selection Brush is drawn + { + imageModel.Undo(); + selectionModel.m_nSelectionBrush = 0; + } + } break; } } @@ -724,13 +711,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH selectionModel.TakeOff(); { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (hbm) + HBITMAP hbmLocked = selectionModel.LockBitmap(); + if (hbmLocked) { - HGLOBAL hGlobal = BitmapToClipboardDIB(hbm); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbmLocked); if (hGlobal) ::SetClipboardData(CF_DIB, hGlobal); - ::DeleteObject(hbm); + selectionModel.UnlockBitmap(hbmLocked); } } @@ -848,10 +835,9 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH WCHAR szFileName[MAX_LONG_PATH] = L"*.png"; if (GetSaveFileName(szFileName, _countof(szFileName))) { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (!SaveDIBToFile(hbm, szFileName, FALSE)) - ShowError(IDS_SAVEERROR, szFileName); - ::DeleteObject(hbm); + HBITMAP hbmLocked = selectionModel.LockBitmap(); + SaveDIBToFile(hbmLocked, szFileName, FALSE); + selectionModel.UnlockBitmap(hbmLocked); } break; } @@ -863,8 +849,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); if (hbmNew) InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - else - ShowError(IDS_LOADERRORTEXT, szFileName); } break; } @@ -895,45 +879,75 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.NotifyImageChanged(); break; case IDM_IMAGEROTATEMIRROR: - switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { - case 1: /* flip horizontally */ - if (selectionModel.m_bShow) - selectionModel.FlipHorizontally(); - else - imageModel.FlipHorizontally(); - break; - case 2: /* flip vertically */ - if (selectionModel.m_bShow) - selectionModel.FlipVertically(); - else - imageModel.FlipVertically(); - break; - case 3: /* rotate 90 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(1); - else - imageModel.RotateNTimes90Degrees(1); - break; - case 4: /* rotate 180 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(2); - else - imageModel.RotateNTimes90Degrees(2); - break; - case 5: /* rotate 270 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(3); - else - imageModel.RotateNTimes90Degrees(3); - break; + CWaitCursor waitCursor; + canvasWindow.updateScrollPos(); + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) + { + case 1: /* flip horizontally */ + { + if (selectionModel.m_bShow) + selectionModel.FlipHorizontally(); + else + imageModel.FlipHorizontally(); + break; + } + case 2: /* flip vertically */ + { + if (selectionModel.m_bShow) + selectionModel.FlipVertically(); + else + imageModel.FlipVertically(); + break; + } + case 3: /* rotate 90 degrees */ + { + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(1); + else + imageModel.RotateNTimes90Degrees(1); + break; + } + case 4: /* rotate 180 degrees */ + { + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(2); + else + imageModel.RotateNTimes90Degrees(2); + break; + } + case 5: /* rotate 270 degrees */ + { + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(3); + else + imageModel.RotateNTimes90Degrees(3); + break; + } + } } break; case IDM_IMAGEATTRIBUTES: { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0); + CWaitCursor waitCursor; + if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) + { + CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); + CString strTitle(MAKEINTRESOURCE(IDS_PROGRAMNAME)); + INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); + if (id != IDYES) + break; + + imageModel.PushBlackAndWhite(); + } + + if (imageModel.GetWidth() != attributesDialog.newWidth || + imageModel.GetHeight() != attributesDialog.newHeight) + { + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight); + } } break; } @@ -941,6 +955,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (selectionModel.m_bShow) { selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, @@ -961,7 +976,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.PushImageForUndo(selectionModel.CopyBitmap()); selectionModel.HideSelection(); break; - case IDM_VIEWTOOLBOX: registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE); @@ -1000,25 +1014,25 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWZOOM125: - zoomTo(125, 0, 0); + canvasWindow.zoomTo(125); break; case IDM_VIEWZOOM25: - zoomTo(250, 0, 0); + canvasWindow.zoomTo(250); break; case IDM_VIEWZOOM50: - zoomTo(500, 0, 0); + canvasWindow.zoomTo(500); break; case IDM_VIEWZOOM100: - zoomTo(1000, 0, 0); + canvasWindow.zoomTo(1000); break; case IDM_VIEWZOOM200: - zoomTo(2000, 0, 0); + canvasWindow.zoomTo(2000); break; case IDM_VIEWZOOM400: - zoomTo(4000, 0, 0); + canvasWindow.zoomTo(4000); break; case IDM_VIEWZOOM800: - zoomTo(8000, 0, 0); + canvasWindow.zoomTo(8000); break; case IDM_VIEWFULLSCREEN: @@ -1026,6 +1040,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH fullscreenWindow.DoCreate(); fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); break; + + case IDM_CTRL_PLUS: + toolsModel.SpecialTweak(FALSE); + break; + case IDM_CTRL_MINUS: + toolsModel.SpecialTweak(TRUE); + break; } return 0; } diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 1f37825511e..5066d0c3757 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -134,11 +134,11 @@ BEGIN END DIALOG_PRINTING DIALOG 0, 0, 160, 100 -CAPTION "Now printing" +CAPTION "Yazdırılıyor" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "Yazdırma işi başlatılıyor...", IDC_PRINTING_STATUS, 5, 10, 150, 15 CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 CTEXT "Sayfa %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 PUSHBUTTON "İptal", IDCANCEL, 50, 75, 60, 20 @@ -149,8 +149,8 @@ BEGIN STRING_PAGESETUP_HEADERVALUE "&f" STRING_PAGESETUP_FOOTERVALUE "Sayfa &p" STRING_NOTEPAD "Not Defteri" - STRING_ERROR "HATA" - STRING_WARNING "UYARI" + STRING_ERROR "Hata" + STRING_WARNING "Uyarı" STRING_INFO "Bilgi" STRING_UNTITLED "Adsız" STRING_ALL_FILES "Tüm Dosyalar (*.*)" @@ -173,12 +173,12 @@ BEGIN STRING_LINE_COLUMN "%d. Satır, %d. Sütun" STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." STRING_DEFAULTFONT "Lucida Console" - STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." - STRING_NOWPRINTING "Now printing page..." - STRING_PRINTCANCELING "The print job is being canceled..." - STRING_PRINTCOMPLETE "Printing is successfully done." - STRING_PRINTCANCELED "Printing has been canceled." - STRING_PRINTFAILED "Printing is failed." + STRING_LINE_NUMBER_OUT_OF_RANGE "Belirtilen satır numarası aralık dışında." + STRING_NOWPRINTING "Belge yazdırılıyor..." + STRING_PRINTCANCELING "Yazdırma işi iptal ediliyor..." + STRING_PRINTCOMPLETE "Yazdırma işlemi başarılıyla tamamlandı!" + STRING_PRINTCANCELED "Yazdırma işlemi iptal rdildi." + STRING_PRINTFAILED "Yazdırma işlemi başarısız oldu." STRING_TEXT_DOCUMENT "Metin Belgesi" STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/osk/res/reactos.ico b/base/applications/osk/res/reactos.ico index 24b3225f370..aa611c782b1 100644 Binary files a/base/applications/osk/res/reactos.ico and b/base/applications/osk/res/reactos.ico differ diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index a20a43e7efb..6d61d93da97 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -124,7 +124,7 @@ BEGIN POPUP "DUMMY" BEGIN MENUITEM "&İşlemi Sonlandır", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "İ&şlem Ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE + MENUITEM "İ&şlem ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Hata Ayıkla", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR POPUP "&Önceliği Aayarla" @@ -148,7 +148,7 @@ END IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Görev Yöneticisi" +CAPTION "Windivs Görev Yöneticisi" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN @@ -324,8 +324,8 @@ END STRINGTABLE BEGIN - IDS_APP_TITLE "Görev Yöneticisi" - IDC_TASKMGR "Görev Yöneticisi" + IDS_APP_TITLE "Windivs Görev Yöneticisi" + IDC_TASKMGR "Windivs Görev Yöneticisi" IDS_IDLE_PROCESS "Boş Sistem İşlemi" END @@ -379,8 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "İşlemi NORMAL öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "İşlemi NORMAL ALTI öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_LOW "İşlemi DÜŞÜK öncelik sınıfına getirir." - ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" - ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" + ID_PROCESS_PAGE_PROPERTIES "İşlemin dosyasının özelliklerini gösterir." + ID_PROCESS_PAGE_OPENFILELOCATION "İşlemin dosyasının konumunu açar." END STRINGTABLE @@ -428,15 +428,15 @@ BEGIN IDS_MENU_SHOWKERNELTIMES "&Çekirdek Sürelerini Göster" IDS_CREATENEWTASK "Yeni Görev Oluşturma" IDS_CREATENEWTASK_DESC "Bir programın, bir dizinin, bir belgenin veya bir İnternet kaynağının adını yazınız, Görev Yöneticisi onu sizin için açacaktır." - IDS_MSG_ACCESSPROCESSAFF "İşlemci İlişkisinin Erişilemedi veya Ayarlanadı" + IDS_MSG_ACCESSPROCESSAFF "İşlemci İlişkisine Erişilemedi veya Ayarlanamadı." IDS_MSG_PROCESSONEPRO "İşlemin en azından bir işlemciyle ilişkisi olmalıdır." IDS_MSG_INVALIDOPTION "Geçersiz Seçenek" - IDS_MSG_UNABLEDEBUGPROCESS "Hata Ayıklama İşleminin Yapılamadı" + IDS_MSG_UNABLEDEBUGPROCESS "Hata Ayıklama İşlemi Yapılamadı" IDS_MSG_WARNINGDEBUG "UYARI: Bu işlemde hata ayıklama veri kaybıyla sonuçlanabilir.\nHata ayıklayıcı bağlamak istediğinizden emin misiniz?" IDS_MSG_TASKMGRWARNING "Görev Yöneticisi Uyarısı" IDS_MSG_WARNINGTERMINATING "UYARI: Bir işlemin sonlandırılması, veri\nkaybı ve sistem kararsızlığı dahil pek çok istenmeyen sonuca neden\nolabilir. İşleme, işlem sonlandırılmadan önce durumunu veya verisini\nkaydetme fırsatı verilmeyecektir. İşlemi\nsonlandırmak istediğinizden emin misiniz?" IDS_MSG_UNABLETERMINATEPRO "İşlem Sonlandırlamadı" - IDS_MSG_CLOSESYSTEMPROCESS "Bu çok önemli bir sistem işlemidir. Görev Yöneticisi bu işlemi sonlandırmayacak." + IDS_MSG_CLOSESYSTEMPROCESS "Bu kritik bir sistem işlemidir. Görev Yöneticisi bu işlemi sonlandırmamaz." IDS_MSG_UNABLECHANGEPRIORITY "Öncelik Değiştirilemedi" IDS_MSG_WARNINGCHANGEPRIORITY "UYARI: Bu işlemin öncelik sınıfının değiştirilmesi, sistem\nkararsızlığı dahil pek çok istenmeyen sonuca neden olabilir. Öncelik\nsınıfını değiştirmek istediğinizden emin misiniz?" IDS_MSG_TRAYICONCPUUSAGE "CPU Kullanımı: %%%d" diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 30055880532..0590f0c0516 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -8,7 +8,7 @@ static MUI_ENTRY bgBGSetupInitPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY bgBGLanguagePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -192,7 +192,7 @@ static MUI_ENTRY bgBGIntroPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -279,7 +279,7 @@ static MUI_ENTRY bgBGLicensePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -422,7 +422,7 @@ static MUI_ENTRY bgBGDevicePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -529,7 +529,7 @@ static MUI_ENTRY bgBGRepairPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY bgBGUpgradePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY bgBGComputerPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY bgBGFlushPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY bgBGQuitPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY bgBGDisplayPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY bgBGSuccessPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY bgBGBootPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1083,7 +1083,7 @@ static MUI_ENTRY bgBGChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \210\255\341\342\240\253\240\346\250\357 ", + " Windivs 2k3 Service Pack 2 \210\255\341\342\240\253\240\346\250\357 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1205,7 +1205,7 @@ static MUI_ENTRY bgBGConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1313,7 +1313,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1350,7 +1350,7 @@ static MUI_ENTRY bgBGCheckFSEntries[] = { { 4, - 3, " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + 3, " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1381,7 +1381,7 @@ static MUI_ENTRY bgBGInstallDirectoryEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1440,7 +1440,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1486,7 +1486,7 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1545,7 +1545,7 @@ static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \210\255\341\342\240\253\240\346\250\357 ", + " Windivs 2k3 Service Pack 2 \210\255\341\342\240\253\240\346\250\357 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1569,7 +1569,7 @@ static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1628,7 +1628,7 @@ static MUI_ENTRY bgBGLayoutSettingsEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1688,7 +1688,7 @@ static MUI_ENTRY bgBGPrepareCopyEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1720,7 +1720,7 @@ static MUI_ENTRY bgBGSelectFSEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1768,7 +1768,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1820,7 +1820,7 @@ static MUI_ENTRY bgBGRegistryEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 00345c5d257..878a710ab4b 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -5,7 +5,7 @@ static MUI_ENTRY bnBDSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY bnBDLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY bnBDWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -183,7 +183,7 @@ static MUI_ENTRY bnBDIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -270,7 +270,7 @@ static MUI_ENTRY bnBDLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -413,7 +413,7 @@ static MUI_ENTRY bnBDDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -520,7 +520,7 @@ static MUI_ENTRY bnBDRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -593,7 +593,7 @@ static MUI_ENTRY bnBDUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -673,7 +673,7 @@ static MUI_ENTRY bnBDComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -732,7 +732,7 @@ static MUI_ENTRY bnBDFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -777,7 +777,7 @@ static MUI_ENTRY bnBDQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -829,7 +829,7 @@ static MUI_ENTRY bnBDDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -888,7 +888,7 @@ static MUI_ENTRY bnBDSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -940,7 +940,7 @@ static MUI_ENTRY bnBDBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -993,7 +993,7 @@ static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1017,7 +1017,7 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1097,7 +1097,7 @@ static MUI_ENTRY bnBDChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1219,7 +1219,7 @@ static MUI_ENTRY bnBDConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1327,7 +1327,7 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1365,7 +1365,7 @@ static MUI_ENTRY bnBDCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1396,7 +1396,7 @@ static MUI_ENTRY bnBDInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1455,7 +1455,7 @@ static MUI_ENTRY bnBDFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1500,7 +1500,7 @@ static MUI_ENTRY bnBDBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY bnBDKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1618,7 +1618,7 @@ static MUI_ENTRY bnBDLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1678,7 +1678,7 @@ static MUI_ENTRY bnBDPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1710,7 +1710,7 @@ static MUI_ENTRY bnBDSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1758,7 +1758,7 @@ static MUI_ENTRY bnBDDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1810,7 +1810,7 @@ static MUI_ENTRY bnBDRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 492b334247c..d5efbe455a8 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -14,7 +14,7 @@ static MUI_ENTRY csCZSetupInitPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -52,7 +52,7 @@ static MUI_ENTRY csCZLanguagePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -104,7 +104,7 @@ static MUI_ENTRY csCZWelcomePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -191,7 +191,7 @@ static MUI_ENTRY csCZIntroPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -278,7 +278,7 @@ static MUI_ENTRY csCZLicensePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -421,7 +421,7 @@ static MUI_ENTRY csCZDevicePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -528,7 +528,7 @@ static MUI_ENTRY csCZRepairPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -601,7 +601,7 @@ static MUI_ENTRY csCZUpgradePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -681,7 +681,7 @@ static MUI_ENTRY csCZComputerPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -740,7 +740,7 @@ static MUI_ENTRY csCZFlushPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -785,7 +785,7 @@ static MUI_ENTRY csCZQuitPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -837,7 +837,7 @@ static MUI_ENTRY csCZDisplayPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -896,7 +896,7 @@ static MUI_ENTRY csCZSuccessPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -948,7 +948,7 @@ static MUI_ENTRY csCZBootPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY csCZSelectPartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1081,7 +1081,7 @@ static MUI_ENTRY csCZChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1203,7 +1203,7 @@ static MUI_ENTRY csCZConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1311,7 +1311,7 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1349,7 +1349,7 @@ static MUI_ENTRY csCZCheckFSEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1380,7 +1380,7 @@ static MUI_ENTRY csCZInstallDirectoryEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1439,7 +1439,7 @@ static MUI_ENTRY csCZFileCopyEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1484,7 +1484,7 @@ static MUI_ENTRY csCZBootLoaderEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1543,7 +1543,7 @@ static MUI_ENTRY csCZBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1567,7 +1567,7 @@ static MUI_ENTRY csCZKeyboardSettingsEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1626,7 +1626,7 @@ static MUI_ENTRY csCZLayoutSettingsEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1686,7 +1686,7 @@ static MUI_ENTRY csCZPrepareCopyEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1718,7 +1718,7 @@ static MUI_ENTRY csCZSelectFSEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1766,7 +1766,7 @@ static MUI_ENTRY csCZDeletePartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1818,7 +1818,7 @@ static MUI_ENTRY csCZRegistryEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 235ad977094..bdcd788f736 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -8,7 +8,7 @@ static MUI_ENTRY daDKSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY daDKLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY daDKWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY daDKIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY daDKLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY daDKDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY daDKRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY daDKUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY daDKComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY daDKFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY daDKQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY daDKDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY daDKSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY daDKBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY daDKSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY daDKChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1204,7 +1204,7 @@ static MUI_ENTRY daDKConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1305,7 +1305,7 @@ static MUI_ENTRY daDKFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1343,7 +1343,7 @@ static MUI_ENTRY daDKCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1374,7 +1374,7 @@ static MUI_ENTRY daDKInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1433,7 +1433,7 @@ static MUI_ENTRY daDKFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1478,7 +1478,7 @@ static MUI_ENTRY daDKBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1537,7 +1537,7 @@ static MUI_ENTRY daDKBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1561,7 +1561,7 @@ static MUI_ENTRY daDKKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1620,7 +1620,7 @@ static MUI_ENTRY daDKLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1680,7 +1680,7 @@ static MUI_ENTRY daDKPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1712,7 +1712,7 @@ static MUI_ENTRY daDKSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1760,7 +1760,7 @@ static MUI_ENTRY daDKDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1812,7 +1812,7 @@ static MUI_ENTRY daDKRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index c0198d2c454..37a5d99652b 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -8,7 +8,7 @@ static MUI_ENTRY deDESetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY deDELanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY deDEIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY deDELicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY deDEDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY deDERepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY deDEUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY deDEComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY deDEFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY deDEQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -831,7 +831,7 @@ static MUI_ENTRY deDEDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY deDESuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -935,7 +935,7 @@ static MUI_ENTRY deDEBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -988,7 +988,7 @@ static MUI_ENTRY deDESelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1068,7 +1068,7 @@ static MUI_ENTRY deDEChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1190,7 +1190,7 @@ static MUI_ENTRY deDEConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1298,7 +1298,7 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1343,7 +1343,7 @@ static MUI_ENTRY deDECheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1374,7 +1374,7 @@ static MUI_ENTRY deDEInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1433,7 +1433,7 @@ static MUI_ENTRY deDEFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1478,7 +1478,7 @@ static MUI_ENTRY deDEBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1537,7 +1537,7 @@ static MUI_ENTRY deDEBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1561,7 +1561,7 @@ static MUI_ENTRY deDEKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1620,7 +1620,7 @@ static MUI_ENTRY deDELayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1680,7 +1680,7 @@ static MUI_ENTRY deDEPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1712,7 +1712,7 @@ static MUI_ENTRY deDESelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1760,7 +1760,7 @@ static MUI_ENTRY deDEDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1812,7 +1812,7 @@ static MUI_ENTRY deDERegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 1fa9350ed77..f342bb3892c 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1090,7 +1090,7 @@ static MUI_ENTRY elGRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1552,7 +1552,7 @@ static MUI_ENTRY elGRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 68e6c71fdc8..00684f410cf 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -5,7 +5,7 @@ static MUI_ENTRY enUSSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY enUSLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY enUSWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -183,7 +183,7 @@ static MUI_ENTRY enUSIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -270,7 +270,7 @@ static MUI_ENTRY enUSLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -413,7 +413,7 @@ static MUI_ENTRY enUSDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -520,7 +520,7 @@ static MUI_ENTRY enUSRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -593,7 +593,7 @@ static MUI_ENTRY enUSUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -673,7 +673,7 @@ static MUI_ENTRY enUSComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -732,7 +732,7 @@ static MUI_ENTRY enUSFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -777,7 +777,7 @@ static MUI_ENTRY enUSQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -829,7 +829,7 @@ static MUI_ENTRY enUSDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -888,7 +888,7 @@ static MUI_ENTRY enUSSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -940,7 +940,7 @@ static MUI_ENTRY enUSBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -993,7 +993,7 @@ static MUI_ENTRY enUSSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1073,7 +1073,7 @@ static MUI_ENTRY enUSChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1195,7 +1195,7 @@ static MUI_ENTRY enUSConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1303,7 +1303,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1341,7 +1341,7 @@ static MUI_ENTRY enUSCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1372,7 +1372,7 @@ static MUI_ENTRY enUSInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1431,7 +1431,7 @@ static MUI_ENTRY enUSFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1476,7 +1476,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1535,7 +1535,7 @@ static MUI_ENTRY enUSBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY enUSKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1618,7 +1618,7 @@ static MUI_ENTRY enUSLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1678,7 +1678,7 @@ static MUI_ENTRY enUSPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1710,7 +1710,7 @@ static MUI_ENTRY enUSSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1758,7 +1758,7 @@ static MUI_ENTRY enUSDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1810,7 +1810,7 @@ static MUI_ENTRY enUSRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 4a4de26de9f..d3c8ccc591f 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -10,7 +10,7 @@ static MUI_ENTRY esESSetupInitPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -48,7 +48,7 @@ static MUI_ENTRY esESLanguagePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -100,7 +100,7 @@ static MUI_ENTRY esESWelcomePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -188,7 +188,7 @@ static MUI_ENTRY esESIntroPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -275,7 +275,7 @@ static MUI_ENTRY esESLicensePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -418,7 +418,7 @@ static MUI_ENTRY esESDevicePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -525,7 +525,7 @@ static MUI_ENTRY esESRepairPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -598,7 +598,7 @@ static MUI_ENTRY esESUpgradePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -678,7 +678,7 @@ static MUI_ENTRY esESComputerPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -737,7 +737,7 @@ static MUI_ENTRY esESFlushPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -782,7 +782,7 @@ static MUI_ENTRY esESQuitPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -834,7 +834,7 @@ static MUI_ENTRY esESDisplayPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -893,7 +893,7 @@ static MUI_ENTRY esESSuccessPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -945,7 +945,7 @@ static MUI_ENTRY esESBootPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -998,7 +998,7 @@ static MUI_ENTRY esESSelectPartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1079,7 +1079,7 @@ static MUI_ENTRY esESChangeSystemPartition[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1201,7 +1201,7 @@ static MUI_ENTRY esESConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1309,7 +1309,7 @@ static MUI_ENTRY esESFormatPartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1347,7 +1347,7 @@ static MUI_ENTRY esESCheckFSEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1378,7 +1378,7 @@ static MUI_ENTRY esESInstallDirectoryEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1437,7 +1437,7 @@ static MUI_ENTRY esESFileCopyEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1482,7 +1482,7 @@ static MUI_ENTRY esESBootLoaderEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1541,7 +1541,7 @@ static MUI_ENTRY etESBootLoaderInstallPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1565,7 +1565,7 @@ static MUI_ENTRY esESKeyboardSettingsEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1624,7 +1624,7 @@ static MUI_ENTRY esESLayoutSettingsEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1684,7 +1684,7 @@ static MUI_ENTRY esESPrepareCopyEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1716,7 +1716,7 @@ static MUI_ENTRY esESSelectFSEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1764,7 +1764,7 @@ static MUI_ENTRY esESDeletePartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1816,7 +1816,7 @@ static MUI_ENTRY esESRegistryEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 74cfef2850b..8d8b2ff2afd 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -8,7 +8,7 @@ static MUI_ENTRY etEESetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY etEELanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY etEEWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY etEEIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY etEELicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY etEEDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY etEERepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -595,7 +595,7 @@ static MUI_ENTRY etEEUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -675,7 +675,7 @@ static MUI_ENTRY etEEComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY etEEFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -779,7 +779,7 @@ static MUI_ENTRY etEEQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -831,7 +831,7 @@ static MUI_ENTRY etEEDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY etEESuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -942,7 +942,7 @@ static MUI_ENTRY etEEBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -995,7 +995,7 @@ static MUI_ENTRY etEESelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1076,7 +1076,7 @@ static MUI_ENTRY etEEChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1198,7 +1198,7 @@ static MUI_ENTRY etEEConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1306,7 +1306,7 @@ static MUI_ENTRY etEEFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1344,7 +1344,7 @@ static MUI_ENTRY etEECheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1375,7 +1375,7 @@ static MUI_ENTRY etEEInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1434,7 +1434,7 @@ static MUI_ENTRY etEEFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1479,7 +1479,7 @@ static MUI_ENTRY etEEBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1538,7 +1538,7 @@ static MUI_ENTRY etEEBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1562,7 +1562,7 @@ static MUI_ENTRY etEEKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1621,7 +1621,7 @@ static MUI_ENTRY etEELayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1681,7 +1681,7 @@ static MUI_ENTRY etEEPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1713,7 +1713,7 @@ static MUI_ENTRY etEESelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1761,7 +1761,7 @@ static MUI_ENTRY etEEDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1813,7 +1813,7 @@ static MUI_ENTRY etEERegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index ce81e9c254a..b5006d449c0 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -6,7 +6,7 @@ static MUI_ENTRY euESSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -44,7 +44,7 @@ static MUI_ENTRY euESLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -96,7 +96,7 @@ static MUI_ENTRY euESWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -184,7 +184,7 @@ static MUI_ENTRY euESIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -271,7 +271,7 @@ static MUI_ENTRY euESLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -414,7 +414,7 @@ static MUI_ENTRY euESDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -521,7 +521,7 @@ static MUI_ENTRY euESRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -594,7 +594,7 @@ static MUI_ENTRY euESUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -674,7 +674,7 @@ static MUI_ENTRY euESComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -733,7 +733,7 @@ static MUI_ENTRY euESFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -778,7 +778,7 @@ static MUI_ENTRY euESQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -830,7 +830,7 @@ static MUI_ENTRY euESDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -889,7 +889,7 @@ static MUI_ENTRY euESSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -941,7 +941,7 @@ static MUI_ENTRY euESBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -994,7 +994,7 @@ static MUI_ENTRY euESSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1074,7 +1074,7 @@ static MUI_ENTRY euESChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1196,7 +1196,7 @@ static MUI_ENTRY euESConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1304,7 +1304,7 @@ static MUI_ENTRY euESFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1342,7 +1342,7 @@ static MUI_ENTRY euESCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1373,7 +1373,7 @@ static MUI_ENTRY euESInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1432,7 +1432,7 @@ static MUI_ENTRY euESFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1477,7 +1477,7 @@ static MUI_ENTRY euESBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1536,7 +1536,7 @@ static MUI_ENTRY euESBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1560,7 +1560,7 @@ static MUI_ENTRY euESKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1619,7 +1619,7 @@ static MUI_ENTRY euESLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1679,7 +1679,7 @@ static MUI_ENTRY euESPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1711,7 +1711,7 @@ static MUI_ENTRY euESSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1759,7 +1759,7 @@ static MUI_ENTRY euESDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1811,7 +1811,7 @@ static MUI_ENTRY euESRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 67af9facf62..623feb8ce8c 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -8,7 +8,7 @@ static MUI_ENTRY frFRSetupInitPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY frFRLanguagePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY frFRIntroPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY frFRLicensePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -429,7 +429,7 @@ static MUI_ENTRY frFRDevicePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -536,7 +536,7 @@ static MUI_ENTRY frFRRepairPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -616,7 +616,7 @@ static MUI_ENTRY frFRUpgradePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -696,7 +696,7 @@ static MUI_ENTRY frFRComputerPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -755,7 +755,7 @@ static MUI_ENTRY frFRFlushPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -800,7 +800,7 @@ static MUI_ENTRY frFRQuitPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -852,7 +852,7 @@ static MUI_ENTRY frFRDisplayPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -911,7 +911,7 @@ static MUI_ENTRY frFRSuccessPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -963,7 +963,7 @@ static MUI_ENTRY frFRBootPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1016,7 +1016,7 @@ static MUI_ENTRY frFRSelectPartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1096,7 +1096,7 @@ static MUI_ENTRY frFRChangeSystemPartition[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1218,7 +1218,7 @@ static MUI_ENTRY frFRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1340,7 +1340,7 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1378,7 +1378,7 @@ static MUI_ENTRY frFRCheckFSEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1409,7 +1409,7 @@ static MUI_ENTRY frFRInstallDirectoryEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1468,7 +1468,7 @@ static MUI_ENTRY frFRFileCopyEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1513,7 +1513,7 @@ static MUI_ENTRY frFRBootLoaderEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1572,7 +1572,7 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1596,7 +1596,7 @@ static MUI_ENTRY frFRKeyboardSettingsEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1655,7 +1655,7 @@ static MUI_ENTRY frFRLayoutSettingsEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1715,7 +1715,7 @@ static MUI_ENTRY frFRPrepareCopyEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1747,7 +1747,7 @@ static MUI_ENTRY frFRSelectFSEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1795,7 +1795,7 @@ static MUI_ENTRY frFRDeletePartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1847,7 +1847,7 @@ static MUI_ENTRY frFRRegistryEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 2d92861355c..87f80381526 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -9,7 +9,7 @@ static MUI_ENTRY heILSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -47,7 +47,7 @@ static MUI_ENTRY heILLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -99,7 +99,7 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -215,7 +215,7 @@ static MUI_ENTRY heILIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -295,7 +295,7 @@ static MUI_ENTRY heILLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -438,7 +438,7 @@ static MUI_ENTRY heILDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -545,7 +545,7 @@ static MUI_ENTRY heILRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -618,7 +618,7 @@ static MUI_ENTRY heILUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -698,7 +698,7 @@ static MUI_ENTRY heILComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -757,7 +757,7 @@ static MUI_ENTRY heILFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -802,7 +802,7 @@ static MUI_ENTRY heILQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -854,7 +854,7 @@ static MUI_ENTRY heILDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -913,7 +913,7 @@ static MUI_ENTRY heILSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -965,7 +965,7 @@ static MUI_ENTRY heILBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1018,7 +1018,7 @@ static MUI_ENTRY heILSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1098,7 +1098,7 @@ static MUI_ENTRY heILChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1220,7 +1220,7 @@ static MUI_ENTRY heILConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1328,7 +1328,7 @@ static MUI_ENTRY heILFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1366,7 +1366,7 @@ static MUI_ENTRY heILCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1397,7 +1397,7 @@ static MUI_ENTRY heILInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1456,7 +1456,7 @@ static MUI_ENTRY heILFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1501,7 +1501,7 @@ static MUI_ENTRY heILBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1560,7 +1560,7 @@ static MUI_ENTRY heILBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1584,7 +1584,7 @@ static MUI_ENTRY heILKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1643,7 +1643,7 @@ static MUI_ENTRY heILLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1703,7 +1703,7 @@ static MUI_ENTRY heILPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1735,7 +1735,7 @@ static MUI_ENTRY heILSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1783,7 +1783,7 @@ static MUI_ENTRY heILDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1835,7 +1835,7 @@ static MUI_ENTRY heILRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index 37363875436..b8994387f3e 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -8,7 +8,7 @@ static MUI_ENTRY hrHRSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY hrHRLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY hrHRWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -186,7 +186,7 @@ static MUI_ENTRY hrHRIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -280,7 +280,7 @@ static MUI_ENTRY hrHRLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -423,7 +423,7 @@ static MUI_ENTRY hrHRDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -530,7 +530,7 @@ static MUI_ENTRY hrHRRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -603,7 +603,7 @@ static MUI_ENTRY hrHRUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -683,7 +683,7 @@ static MUI_ENTRY hrHRComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -742,7 +742,7 @@ static MUI_ENTRY hrHRFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -787,7 +787,7 @@ static MUI_ENTRY hrHRQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -839,7 +839,7 @@ static MUI_ENTRY hrHRDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -898,7 +898,7 @@ static MUI_ENTRY hrHRSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -950,7 +950,7 @@ static MUI_ENTRY hrHRBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1003,7 +1003,7 @@ static MUI_ENTRY hrHRSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1083,7 +1083,7 @@ static MUI_ENTRY hrHRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1205,7 +1205,7 @@ static MUI_ENTRY hrHRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1313,7 +1313,7 @@ static MUI_ENTRY hrHRFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1358,7 +1358,7 @@ static MUI_ENTRY hrHRCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1389,7 +1389,7 @@ static MUI_ENTRY hrHRInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1448,7 +1448,7 @@ static MUI_ENTRY hrHRFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1493,7 +1493,7 @@ static MUI_ENTRY hrHRBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY hrHRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1583,7 +1583,7 @@ static MUI_ENTRY hrHRKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1642,7 +1642,7 @@ static MUI_ENTRY hrHRLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY hrHRPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1734,7 +1734,7 @@ static MUI_ENTRY hrHRSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1782,7 +1782,7 @@ static MUI_ENTRY hrHRDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1834,7 +1834,7 @@ static MUI_ENTRY hrHRRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 3d2548f24b2..55639b01e21 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -8,7 +8,7 @@ static MUI_ENTRY huHUSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY huHULanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213", + " Windivs 2k3 Service Pack 2 telep\241t\213", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY huHUWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY huHUIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY huHULicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -422,7 +422,7 @@ static MUI_ENTRY huHUDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -523,7 +523,7 @@ static MUI_ENTRY huHURepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -596,7 +596,7 @@ static MUI_ENTRY huHUUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -676,7 +676,7 @@ static MUI_ENTRY huHUComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -735,7 +735,7 @@ static MUI_ENTRY huHUFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -787,7 +787,7 @@ static MUI_ENTRY huHUQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -839,7 +839,7 @@ static MUI_ENTRY huHUDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY huHUSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY huHUBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY huHUSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY huHUConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1197,7 +1197,7 @@ static MUI_ENTRY huHUFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1235,7 +1235,7 @@ static MUI_ENTRY huHUCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1266,7 +1266,7 @@ static MUI_ENTRY huHUInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1325,7 +1325,7 @@ static MUI_ENTRY huHUFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1370,7 +1370,7 @@ static MUI_ENTRY huHUBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1429,7 +1429,7 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1453,7 +1453,7 @@ static MUI_ENTRY huHUKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1512,7 +1512,7 @@ static MUI_ENTRY huHULayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1572,7 +1572,7 @@ static MUI_ENTRY huHUPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1604,7 +1604,7 @@ static MUI_ENTRY huHUSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1653,7 +1653,7 @@ static MUI_ENTRY huHUDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1705,7 +1705,7 @@ static MUI_ENTRY huHURegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index d7a408e085d..ae4f9dbd3b1 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -5,7 +5,7 @@ static MUI_ENTRY idIDSetupInitPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY idIDLanguagePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY idIDWelcomePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -183,7 +183,7 @@ static MUI_ENTRY idIDIntroPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -270,7 +270,7 @@ static MUI_ENTRY idIDLicensePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -413,7 +413,7 @@ static MUI_ENTRY idIDDevicePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -520,7 +520,7 @@ static MUI_ENTRY idIDRepairPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -593,7 +593,7 @@ static MUI_ENTRY idIDUpgradePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -673,7 +673,7 @@ static MUI_ENTRY idIDComputerPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -732,7 +732,7 @@ static MUI_ENTRY idIDFlushPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -777,7 +777,7 @@ static MUI_ENTRY idIDQuitPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -829,7 +829,7 @@ static MUI_ENTRY idIDDisplayPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -888,7 +888,7 @@ static MUI_ENTRY idIDSuccessPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -940,7 +940,7 @@ static MUI_ENTRY idIDBootPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -993,7 +993,7 @@ static MUI_ENTRY idIDSelectPartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1073,7 +1073,7 @@ static MUI_ENTRY idIDChangeSystemPartition[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1195,7 +1195,7 @@ static MUI_ENTRY idIDConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1303,7 +1303,7 @@ static MUI_ENTRY idIDFormatPartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1341,7 +1341,7 @@ static MUI_ENTRY idIDCheckFSEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1372,7 +1372,7 @@ static MUI_ENTRY idIDInstallDirectoryEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1431,7 +1431,7 @@ static MUI_ENTRY idIDFileCopyEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1476,7 +1476,7 @@ static MUI_ENTRY idIDBootLoaderEntries[] = { 4, 3, - "Penyetelan Windivs 2k3 Service Pack 1 ", + "Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1535,7 +1535,7 @@ static MUI_ENTRY idIDBootLoaderInstallPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY idIDKeyboardSettingsEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1618,7 +1618,7 @@ static MUI_ENTRY idIDLayoutSettingsEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1678,7 +1678,7 @@ static MUI_ENTRY idIDPrepareCopyEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1710,7 +1710,7 @@ static MUI_ENTRY idIDSelectFSEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1758,7 +1758,7 @@ static MUI_ENTRY idIDDeletePartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1810,7 +1810,7 @@ static MUI_ENTRY idIDRegistryEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index e3ce2311578..15f49114be6 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -5,7 +5,7 @@ static MUI_ENTRY itITSetupInitPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY itITLanguagePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -182,7 +182,7 @@ static MUI_ENTRY itITIntroPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -269,7 +269,7 @@ static MUI_ENTRY itITLicensePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -412,7 +412,7 @@ static MUI_ENTRY itITDevicePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -519,7 +519,7 @@ static MUI_ENTRY itITRepairPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -592,7 +592,7 @@ static MUI_ENTRY itITUpgradePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -672,7 +672,7 @@ static MUI_ENTRY itITComputerPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -731,7 +731,7 @@ static MUI_ENTRY itITFlushPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -776,7 +776,7 @@ static MUI_ENTRY itITQuitPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -828,7 +828,7 @@ static MUI_ENTRY itITDisplayPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -887,7 +887,7 @@ static MUI_ENTRY itITSuccessPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -939,7 +939,7 @@ static MUI_ENTRY itITBootPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -992,7 +992,7 @@ static MUI_ENTRY itITBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1016,7 +1016,7 @@ static MUI_ENTRY itITSelectPartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1096,7 +1096,7 @@ static MUI_ENTRY itITChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1218,7 +1218,7 @@ static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1333,7 +1333,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1371,7 +1371,7 @@ static MUI_ENTRY itITCheckFSEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1402,7 +1402,7 @@ static MUI_ENTRY itITInstallDirectoryEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1461,7 +1461,7 @@ static MUI_ENTRY itITFileCopyEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1506,7 +1506,7 @@ static MUI_ENTRY itITBootLoaderEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1565,7 +1565,7 @@ static MUI_ENTRY itITKeyboardSettingsEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1624,7 +1624,7 @@ static MUI_ENTRY itITLayoutSettingsEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1684,7 +1684,7 @@ static MUI_ENTRY itITPrepareCopyEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1716,7 +1716,7 @@ static MUI_ENTRY itITSelectFSEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1764,7 +1764,7 @@ static MUI_ENTRY itITDeletePartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1816,7 +1816,7 @@ static MUI_ENTRY itITRegistryEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index da23497bd71..7c4cb5a1249 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -8,7 +8,7 @@ static MUI_ENTRY jaJPSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY jaJPLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY jaJPWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY jaJPIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY jaJPLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY jaJPDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY jaJPRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -595,7 +595,7 @@ static MUI_ENTRY jaJPUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -675,7 +675,7 @@ static MUI_ENTRY jaJPComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY jaJPFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -779,7 +779,7 @@ static MUI_ENTRY jaJPQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -831,7 +831,7 @@ static MUI_ENTRY jaJPDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY jaJPSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -942,7 +942,7 @@ static MUI_ENTRY jaJPBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -995,7 +995,7 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1076,7 +1076,7 @@ static MUI_ENTRY jaJPChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1198,7 +1198,7 @@ static MUI_ENTRY jaJPConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1306,7 +1306,7 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1344,7 +1344,7 @@ static MUI_ENTRY jaJPCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1375,7 +1375,7 @@ static MUI_ENTRY jaJPInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1434,7 +1434,7 @@ static MUI_ENTRY jaJPFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1479,7 +1479,7 @@ static MUI_ENTRY jaJPBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1538,7 +1538,7 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1562,7 +1562,7 @@ static MUI_ENTRY jaJPKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1621,7 +1621,7 @@ static MUI_ENTRY jaJPLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1681,7 +1681,7 @@ static MUI_ENTRY jaJPPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1713,7 +1713,7 @@ static MUI_ENTRY jaJPSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1761,7 +1761,7 @@ static MUI_ENTRY jaJPDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1813,7 +1813,7 @@ static MUI_ENTRY jaJPRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 3336b2436a2..d2657172356 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -17,7 +17,7 @@ static MUI_ENTRY ltLTSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -55,7 +55,7 @@ static MUI_ENTRY ltLTLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -107,7 +107,7 @@ static MUI_ENTRY ltLTWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -194,7 +194,7 @@ static MUI_ENTRY ltLTIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -281,7 +281,7 @@ static MUI_ENTRY ltLTLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -424,7 +424,7 @@ static MUI_ENTRY ltLTDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -531,7 +531,7 @@ static MUI_ENTRY ltLTRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -604,7 +604,7 @@ static MUI_ENTRY ltLTUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -684,7 +684,7 @@ static MUI_ENTRY ltLTComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -743,7 +743,7 @@ static MUI_ENTRY ltLTFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -788,7 +788,7 @@ static MUI_ENTRY ltLTQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -840,7 +840,7 @@ static MUI_ENTRY ltLTDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -899,7 +899,7 @@ static MUI_ENTRY ltLTSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -951,7 +951,7 @@ static MUI_ENTRY ltLTBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1004,7 +1004,7 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1084,7 +1084,7 @@ static MUI_ENTRY ltLTChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1206,7 +1206,7 @@ static MUI_ENTRY ltLTConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1314,7 +1314,7 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1352,7 +1352,7 @@ static MUI_ENTRY ltLTCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1383,7 +1383,7 @@ static MUI_ENTRY ltLTInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1442,7 +1442,7 @@ static MUI_ENTRY ltLTFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1487,7 +1487,7 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1546,7 +1546,7 @@ static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1570,7 +1570,7 @@ static MUI_ENTRY ltLTKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1629,7 +1629,7 @@ static MUI_ENTRY ltLTLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1689,7 +1689,7 @@ static MUI_ENTRY ltLTPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1721,7 +1721,7 @@ static MUI_ENTRY ltLTSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1769,7 +1769,7 @@ static MUI_ENTRY ltLTDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1821,7 +1821,7 @@ static MUI_ENTRY ltLTRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 94babf77d3c..fe0bd4bd99e 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -5,7 +5,7 @@ static MUI_ENTRY msMYSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY msMYLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY msMYWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -182,7 +182,7 @@ static MUI_ENTRY msMYIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -269,7 +269,7 @@ static MUI_ENTRY msMYLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -412,7 +412,7 @@ static MUI_ENTRY msMYDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -519,7 +519,7 @@ static MUI_ENTRY msMYRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -592,7 +592,7 @@ static MUI_ENTRY msMYUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -672,7 +672,7 @@ static MUI_ENTRY msMYComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -731,7 +731,7 @@ static MUI_ENTRY msMYFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -776,7 +776,7 @@ static MUI_ENTRY msMYQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -828,7 +828,7 @@ static MUI_ENTRY msMYDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -887,7 +887,7 @@ static MUI_ENTRY msMYSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -939,7 +939,7 @@ static MUI_ENTRY msMYBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -992,7 +992,7 @@ static MUI_ENTRY msMYSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1065,7 +1065,7 @@ static MUI_ENTRY msMYChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1187,7 +1187,7 @@ static MUI_ENTRY msMYConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1295,7 +1295,7 @@ static MUI_ENTRY msMYFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1333,7 +1333,7 @@ static MUI_ENTRY msMYCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1364,7 +1364,7 @@ static MUI_ENTRY msMYInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1423,7 +1423,7 @@ static MUI_ENTRY msMYFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1468,7 +1468,7 @@ static MUI_ENTRY msMYBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1527,7 +1527,7 @@ static MUI_ENTRY msMYBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1551,7 +1551,7 @@ static MUI_ENTRY msMYKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1610,7 +1610,7 @@ static MUI_ENTRY msMYLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1670,7 +1670,7 @@ static MUI_ENTRY msMYPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY msMYSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1750,7 +1750,7 @@ static MUI_ENTRY msMYDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1802,7 +1802,7 @@ static MUI_ENTRY msMYRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index bb62ef48a59..fd5e39fd207 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -13,7 +13,7 @@ static MUI_ENTRY nlNLSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -51,7 +51,7 @@ static MUI_ENTRY nlNLLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -103,7 +103,7 @@ static MUI_ENTRY nlNLWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -197,7 +197,7 @@ static MUI_ENTRY nlNLIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -284,7 +284,7 @@ static MUI_ENTRY nlNLLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -427,7 +427,7 @@ static MUI_ENTRY nlNLDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -527,7 +527,7 @@ static MUI_ENTRY nlNLRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -607,7 +607,7 @@ static MUI_ENTRY nlNLUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -687,7 +687,7 @@ static MUI_ENTRY nlNLComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -746,7 +746,7 @@ static MUI_ENTRY nlNLFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -791,7 +791,7 @@ static MUI_ENTRY nlNLQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -843,7 +843,7 @@ static MUI_ENTRY nlNLDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -902,7 +902,7 @@ static MUI_ENTRY nlNLSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -954,7 +954,7 @@ static MUI_ENTRY nlNLBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1007,7 +1007,7 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1088,7 +1088,7 @@ static MUI_ENTRY nlNLChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1210,7 +1210,7 @@ static MUI_ENTRY nlNLConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1318,7 +1318,7 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1356,7 +1356,7 @@ static MUI_ENTRY nlNLCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1387,7 +1387,7 @@ static MUI_ENTRY nlNLInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1446,7 +1446,7 @@ static MUI_ENTRY nlNLFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1491,7 +1491,7 @@ static MUI_ENTRY nlNLBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1550,7 +1550,7 @@ static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1574,7 +1574,7 @@ static MUI_ENTRY nlNLkeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1633,7 +1633,7 @@ static MUI_ENTRY nlNLLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1693,7 +1693,7 @@ static MUI_ENTRY nlNLPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1725,7 +1725,7 @@ static MUI_ENTRY nlNLSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1773,7 +1773,7 @@ static MUI_ENTRY nlNLDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1825,7 +1825,7 @@ static MUI_ENTRY nlNLRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 5be7ebbf227..08a1889d317 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -18,7 +18,7 @@ static MUI_ENTRY plPLSetupInitPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -56,7 +56,7 @@ static MUI_ENTRY plPLLanguagePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -108,7 +108,7 @@ static MUI_ENTRY plPLWelcomePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -195,7 +195,7 @@ static MUI_ENTRY plPLIntroPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -282,7 +282,7 @@ static MUI_ENTRY plPLLicensePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -425,7 +425,7 @@ static MUI_ENTRY plPLDevicePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -532,7 +532,7 @@ static MUI_ENTRY plPLRepairPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -605,7 +605,7 @@ static MUI_ENTRY plPLUpgradePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -685,7 +685,7 @@ static MUI_ENTRY plPLComputerPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -744,7 +744,7 @@ static MUI_ENTRY plPLFlushPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -789,7 +789,7 @@ static MUI_ENTRY plPLQuitPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -841,7 +841,7 @@ static MUI_ENTRY plPLDisplayPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -900,7 +900,7 @@ static MUI_ENTRY plPLSuccessPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -952,7 +952,7 @@ static MUI_ENTRY plPLBootPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1005,7 +1005,7 @@ static MUI_ENTRY plPLSelectPartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1085,7 +1085,7 @@ static MUI_ENTRY plPLChangeSystemPartition[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1207,7 +1207,7 @@ static MUI_ENTRY plPLConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1315,7 +1315,7 @@ static MUI_ENTRY plPLFormatPartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1353,7 +1353,7 @@ static MUI_ENTRY plPLCheckFSEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1384,7 +1384,7 @@ static MUI_ENTRY plPLInstallDirectoryEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1443,7 +1443,7 @@ static MUI_ENTRY plPLFileCopyEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1488,7 +1488,7 @@ static MUI_ENTRY plPLBootLoaderEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1547,7 +1547,7 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1571,7 +1571,7 @@ static MUI_ENTRY plPLKeyboardSettingsEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1630,7 +1630,7 @@ static MUI_ENTRY plPLLayoutSettingsEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1690,7 +1690,7 @@ static MUI_ENTRY plPLPrepareCopyEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1722,7 +1722,7 @@ static MUI_ENTRY plPLSelectFSEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1770,7 +1770,7 @@ static MUI_ENTRY plPLDeletePartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1822,7 +1822,7 @@ static MUI_ENTRY plPLRegistryEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 92d550b0317..9cacca96af8 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -8,7 +8,7 @@ static MUI_ENTRY ptBRSetupInitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY ptBRLanguagePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY ptBRWelcomePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY ptBRIntroPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY ptBRLicensePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY ptBRDevicePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -515,7 +515,7 @@ static MUI_ENTRY ptBRRepairPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -588,7 +588,7 @@ static MUI_ENTRY ptBRUpgradePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -668,7 +668,7 @@ static MUI_ENTRY ptBRComputerPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY ptBRFlushPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY ptBRQuitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY ptBRDisplayPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY ptBRSuccessPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY ptBRBootPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY ptBRSelectPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1090,7 +1090,7 @@ static MUI_ENTRY ptBRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1212,7 +1212,7 @@ static MUI_ENTRY ptBRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1320,7 +1320,7 @@ static MUI_ENTRY ptBRFormatPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1358,7 +1358,7 @@ static MUI_ENTRY ptBRCheckFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1389,7 +1389,7 @@ static MUI_ENTRY ptBRInstallDirectoryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1448,7 +1448,7 @@ static MUI_ENTRY ptBRFileCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1493,7 +1493,7 @@ static MUI_ENTRY ptBRBootLoaderEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1552,7 +1552,7 @@ static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1576,7 +1576,7 @@ static MUI_ENTRY ptBRKeyboardSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1635,7 +1635,7 @@ static MUI_ENTRY ptBRLayoutSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY ptBRPrepareCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1741,7 +1741,7 @@ static MUI_ENTRY ptBRSelectFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1789,7 +1789,7 @@ static MUI_ENTRY ptBRDeletePartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1848,7 +1848,7 @@ static MUI_ENTRY ptBRRegistryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index e3d03be0a09..7879269172d 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -8,7 +8,7 @@ static MUI_ENTRY ptPTSetupInitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY ptPTLanguagePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY ptPTWelcomePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY ptPTIntroPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY ptPTLicensePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY ptPTDevicePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -515,7 +515,7 @@ static MUI_ENTRY ptPTRepairPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -588,7 +588,7 @@ static MUI_ENTRY ptPTUpgradePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -668,7 +668,7 @@ static MUI_ENTRY ptPTComputerPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY ptPTFlushPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY ptPTQuitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY ptPTDisplayPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY ptPTSuccessPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY ptPTBootPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1090,7 +1090,7 @@ static MUI_ENTRY ptPTChangeSystemPartition[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1212,7 +1212,7 @@ static MUI_ENTRY ptPTConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1320,7 +1320,7 @@ static MUI_ENTRY ptPTFormatPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1358,7 +1358,7 @@ static MUI_ENTRY ptPTCheckFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1389,7 +1389,7 @@ static MUI_ENTRY ptPTInstallDirectoryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1448,7 +1448,7 @@ static MUI_ENTRY ptPTFileCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1493,7 +1493,7 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1552,7 +1552,7 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1576,7 +1576,7 @@ static MUI_ENTRY ptPTKeyboardSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1635,7 +1635,7 @@ static MUI_ENTRY ptPTLayoutSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY ptPTPrepareCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1741,7 +1741,7 @@ static MUI_ENTRY ptPTSelectFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1789,7 +1789,7 @@ static MUI_ENTRY ptPTDeletePartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1848,7 +1848,7 @@ static MUI_ENTRY ptPTRegistryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index c95d144b880..361c78f574f 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -107,7 +107,7 @@ static MUI_ENTRY roROWelcomePageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -222,7 +222,7 @@ static MUI_ENTRY roROIntroPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -302,7 +302,7 @@ static MUI_ENTRY roROLicensePageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -466,7 +466,7 @@ static MUI_ENTRY roRODevicePageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -581,7 +581,7 @@ static MUI_ENTRY roRORepairPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY roROComputerPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -793,7 +793,7 @@ static MUI_ENTRY roROFlushPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY roROQuitPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY roRODisplayPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY roROSuccessPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY roROBootPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1054,7 +1054,7 @@ static MUI_ENTRY roROSelectPartitionEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1134,7 +1134,7 @@ static MUI_ENTRY roROChangeSystemPartition[] = { 4, 3, - " Instalare 2k3 Service Pack 1 Windivs ", + " Instalare 2k3 Service Pack 2 Windivs ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1364,7 +1364,7 @@ static MUI_ENTRY roROFormatPartitionEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1395,7 +1395,7 @@ static MUI_ENTRY roROCheckFSEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1426,7 +1426,7 @@ static MUI_ENTRY roROInstallDirectoryEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1485,7 +1485,7 @@ static MUI_ENTRY roROFileCopyEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1523,7 +1523,7 @@ static MUI_ENTRY roROBootLoaderEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1582,7 +1582,7 @@ static MUI_ENTRY roROBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1606,7 +1606,7 @@ static MUI_ENTRY roROKeyboardSettingsEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC, }, @@ -1665,7 +1665,7 @@ static MUI_ENTRY roROLayoutSettingsEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1725,7 +1725,7 @@ static MUI_ENTRY roROPrepareCopyEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1757,7 +1757,7 @@ static MUI_ENTRY roROSelectFSEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1811,7 +1811,7 @@ static MUI_ENTRY roRODeletePartitionEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1863,7 +1863,7 @@ static MUI_ENTRY roRORegistryEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 48fc90b0279..2b86dcbc863 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1096,7 +1096,7 @@ static MUI_ENTRY ruRUChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index c5a60154bf0..4ad0dcacbb8 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -14,7 +14,7 @@ static MUI_ENTRY skSKSetupInitPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -52,7 +52,7 @@ static MUI_ENTRY skSKLanguagePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -104,7 +104,7 @@ static MUI_ENTRY skSKWelcomePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -191,7 +191,7 @@ static MUI_ENTRY skSKIntroPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -278,7 +278,7 @@ static MUI_ENTRY skSKLicensePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -421,7 +421,7 @@ static MUI_ENTRY skSKDevicePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -528,7 +528,7 @@ static MUI_ENTRY skSKRepairPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -601,7 +601,7 @@ static MUI_ENTRY skSKUpgradePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -681,7 +681,7 @@ static MUI_ENTRY skSKComputerPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -740,7 +740,7 @@ static MUI_ENTRY skSKFlushPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -785,7 +785,7 @@ static MUI_ENTRY skSKQuitPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -837,7 +837,7 @@ static MUI_ENTRY skSKDisplayPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -896,7 +896,7 @@ static MUI_ENTRY skSKSuccessPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -948,7 +948,7 @@ static MUI_ENTRY skSKBootPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY skSKSelectPartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY skSKChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1204,7 +1204,7 @@ static MUI_ENTRY skSKConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1312,7 +1312,7 @@ static MUI_ENTRY skSKFormatPartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1350,7 +1350,7 @@ static MUI_ENTRY skSKCheckFSEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1381,7 +1381,7 @@ static MUI_ENTRY skSKInstallDirectoryEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1440,7 +1440,7 @@ static MUI_ENTRY skSKFileCopyEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1485,7 +1485,7 @@ static MUI_ENTRY skSKBootLoaderEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1544,7 +1544,7 @@ static MUI_ENTRY skSKBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1568,7 +1568,7 @@ static MUI_ENTRY skSKKeyboardSettingsEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1627,7 +1627,7 @@ static MUI_ENTRY skSKLayoutSettingsEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1687,7 +1687,7 @@ static MUI_ENTRY skSKPrepareCopyEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1719,7 +1719,7 @@ static MUI_ENTRY skSKSelectFSEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1767,7 +1767,7 @@ static MUI_ENTRY skSKDeletePartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1819,7 +1819,7 @@ static MUI_ENTRY skSKRegistryEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 28b59bd0698..726b951dc40 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -12,7 +12,7 @@ static MUI_ENTRY sqALSetupInitPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -50,7 +50,7 @@ static MUI_ENTRY sqALLanguagePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -102,7 +102,7 @@ static MUI_ENTRY sqALWelcomePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -189,7 +189,7 @@ static MUI_ENTRY sqALIntroPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -276,7 +276,7 @@ static MUI_ENTRY sqALLicensePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -419,7 +419,7 @@ static MUI_ENTRY sqALDevicePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -526,7 +526,7 @@ static MUI_ENTRY sqALRepairPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -599,7 +599,7 @@ static MUI_ENTRY sqALUpgradePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -679,7 +679,7 @@ static MUI_ENTRY sqALComputerPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -738,7 +738,7 @@ static MUI_ENTRY sqALFlushPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -783,7 +783,7 @@ static MUI_ENTRY sqALQuitPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -835,7 +835,7 @@ static MUI_ENTRY sqALDisplayPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -894,7 +894,7 @@ static MUI_ENTRY sqALSuccessPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -946,7 +946,7 @@ static MUI_ENTRY sqALBootPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -999,7 +999,7 @@ static MUI_ENTRY sqALSelectPartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1080,7 +1080,7 @@ static MUI_ENTRY sqALChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1202,7 +1202,7 @@ static MUI_ENTRY sqALConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1310,7 +1310,7 @@ static MUI_ENTRY sqALFormatPartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1348,7 +1348,7 @@ static MUI_ENTRY sqALCheckFSEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1379,7 +1379,7 @@ static MUI_ENTRY sqALInstallDirectoryEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1438,7 +1438,7 @@ static MUI_ENTRY sqALFileCopyEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1483,7 +1483,7 @@ static MUI_ENTRY sqALBootLoaderEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1542,7 +1542,7 @@ static MUI_ENTRY sqALBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1566,7 +1566,7 @@ static MUI_ENTRY sqALKeyboardSettingsEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1625,7 +1625,7 @@ static MUI_ENTRY sqALLayoutSettingsEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1685,7 +1685,7 @@ static MUI_ENTRY sqALPrepareCopyEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1717,7 +1717,7 @@ static MUI_ENTRY sqALSelectFSEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1765,7 +1765,7 @@ static MUI_ENTRY sqALDeletePartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1817,7 +1817,7 @@ static MUI_ENTRY sqALRegistryEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 9c47f77a613..909de767990 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -14,7 +14,7 @@ static MUI_ENTRY svSESetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -52,7 +52,7 @@ static MUI_ENTRY svSELanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -104,7 +104,7 @@ static MUI_ENTRY svSEWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -191,7 +191,7 @@ static MUI_ENTRY svSEIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -278,7 +278,7 @@ static MUI_ENTRY svSELicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -421,7 +421,7 @@ static MUI_ENTRY svSEDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -528,7 +528,7 @@ static MUI_ENTRY svSERepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -601,7 +601,7 @@ static MUI_ENTRY svSEUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -681,7 +681,7 @@ static MUI_ENTRY svSEComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -740,7 +740,7 @@ static MUI_ENTRY svSEFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -785,7 +785,7 @@ static MUI_ENTRY svSEQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -837,7 +837,7 @@ static MUI_ENTRY svSEDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -896,7 +896,7 @@ static MUI_ENTRY svSESuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -948,7 +948,7 @@ static MUI_ENTRY svSEBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY svSESelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY svSEChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1204,7 +1204,7 @@ static MUI_ENTRY svSEConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1312,7 +1312,7 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1350,7 +1350,7 @@ static MUI_ENTRY svSECheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1381,7 +1381,7 @@ static MUI_ENTRY svSEInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1440,7 +1440,7 @@ static MUI_ENTRY svSEFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1485,7 +1485,7 @@ static MUI_ENTRY svSEBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1544,7 +1544,7 @@ static MUI_ENTRY svSEBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1568,7 +1568,7 @@ static MUI_ENTRY svSEKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1627,7 +1627,7 @@ static MUI_ENTRY svSELayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1687,7 +1687,7 @@ static MUI_ENTRY svSEPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1719,7 +1719,7 @@ static MUI_ENTRY svSESelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1767,7 +1767,7 @@ static MUI_ENTRY svSEDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1819,7 +1819,7 @@ static MUI_ENTRY svSERegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 8f4b7004569..19e254e3a76 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -10,7 +10,7 @@ static MUI_ENTRY trTRSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -48,7 +48,7 @@ static MUI_ENTRY trTRLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -100,7 +100,7 @@ static MUI_ENTRY trTRWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -187,7 +187,7 @@ static MUI_ENTRY trTRIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -274,7 +274,7 @@ static MUI_ENTRY trTRLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -410,7 +410,7 @@ static MUI_ENTRY trTRDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -518,7 +518,7 @@ static MUI_ENTRY trTRRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -591,7 +591,7 @@ static MUI_ENTRY trTRUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -671,7 +671,7 @@ static MUI_ENTRY trTRComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -730,7 +730,7 @@ static MUI_ENTRY trTRFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -775,7 +775,7 @@ static MUI_ENTRY trTRQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -827,7 +827,7 @@ static MUI_ENTRY trTRDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -886,7 +886,7 @@ static MUI_ENTRY trTRSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -938,7 +938,7 @@ static MUI_ENTRY trTRBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -984,7 +984,7 @@ static MUI_ENTRY trTRSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1064,7 +1064,7 @@ static MUI_ENTRY trTRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1186,7 +1186,7 @@ static MUI_ENTRY trTRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1287,7 +1287,7 @@ static MUI_ENTRY trTRFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1325,7 +1325,7 @@ static MUI_ENTRY trTRCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1356,7 +1356,7 @@ static MUI_ENTRY trTRInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1408,7 +1408,7 @@ static MUI_ENTRY trTRFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1453,7 +1453,7 @@ static MUI_ENTRY trTRBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1512,7 +1512,7 @@ static MUI_ENTRY trTRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1536,7 +1536,7 @@ static MUI_ENTRY trTRKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1595,7 +1595,7 @@ static MUI_ENTRY trTRLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1655,7 +1655,7 @@ static MUI_ENTRY trTRPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1687,7 +1687,7 @@ static MUI_ENTRY trTRSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1735,7 +1735,7 @@ static MUI_ENTRY trTRDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1787,7 +1787,7 @@ static MUI_ENTRY trTRRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 67748e72cea..47341f1e49a 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -13,7 +13,7 @@ static MUI_ENTRY ukUASetupInitPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -51,7 +51,7 @@ static MUI_ENTRY ukUALanguagePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -103,7 +103,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -190,7 +190,7 @@ static MUI_ENTRY ukUAIntroPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -277,7 +277,7 @@ static MUI_ENTRY ukUALicensePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -420,7 +420,7 @@ static MUI_ENTRY ukUADevicePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -527,7 +527,7 @@ static MUI_ENTRY ukUARepairPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -600,7 +600,7 @@ static MUI_ENTRY ukUAUpgradePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -680,7 +680,7 @@ static MUI_ENTRY ukUAComputerPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -739,7 +739,7 @@ static MUI_ENTRY ukUAFlushPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -784,7 +784,7 @@ static MUI_ENTRY ukUAQuitPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -836,7 +836,7 @@ static MUI_ENTRY ukUADisplayPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -895,7 +895,7 @@ static MUI_ENTRY ukUASuccessPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -947,7 +947,7 @@ static MUI_ENTRY ukUABootPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1000,7 +1000,7 @@ static MUI_ENTRY ukUASelectPartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1081,7 +1081,7 @@ static MUI_ENTRY ukUAChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1203,7 +1203,7 @@ static MUI_ENTRY ukUAConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1311,7 +1311,7 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1349,7 +1349,7 @@ static MUI_ENTRY ukUACheckFSEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1380,7 +1380,7 @@ static MUI_ENTRY ukUAInstallDirectoryEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1439,7 +1439,7 @@ static MUI_ENTRY ukUAFileCopyEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1484,7 +1484,7 @@ static MUI_ENTRY ukUABootLoaderEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1543,7 +1543,7 @@ static MUI_ENTRY ukUABootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1567,7 +1567,7 @@ static MUI_ENTRY ukUAKeyboardSettingsEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1626,7 +1626,7 @@ static MUI_ENTRY ukUALayoutSettingsEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1686,7 +1686,7 @@ static MUI_ENTRY ukUAPrepareCopyEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1718,7 +1718,7 @@ static MUI_ENTRY ukUASelectFSEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1766,7 +1766,7 @@ static MUI_ENTRY ukUADeletePartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1818,7 +1818,7 @@ static MUI_ENTRY ukUARegistryEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index ebcfa767090..9f12fd09549 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -545,6 +545,9 @@ void CDefView::UpdateStatusbar() WCHAR szPartText[MAX_PATH] = {0}; UINT cSelectedItems; + if (!m_ListView) + return; + cSelectedItems = m_ListView.GetSelectedCount(); if (cSelectedItems) { @@ -884,6 +887,8 @@ PCUITEMID_CHILD CDefView::_PidlByItem(LVITEM& lvItem) */ int CDefView::LV_FindItemByPidl(PCUITEMID_CHILD pidl) { + ASSERT(m_ListView); + int cItems = m_ListView.GetItemCount(); for (int i = 0; i(arg); /* in a commdlg This works as a filemask*/ - if (pThis->IncludeObject(pidl) == S_OK) + if (pThis->IncludeObject(pidl) == S_OK && pThis->m_ListView) pThis->LV_AddItem(pidl); SHFree(pidl); @@ -1482,6 +1497,8 @@ UINT CDefView::GetSelections() TRACE("-- Items selected =%u\n", m_cidl); + ASSERT(m_ListView); + UINT i = 0; int lvIndex = -1; while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) @@ -1734,11 +1751,12 @@ LRESULT CDefView::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled TRACE("%p width=%u height=%u\n", this, wWidth, wHeight); + // WM_SIZE can come before WM_CREATE + if (!m_ListView) + return 0; + /* Resize the ListView to fit our window */ - if (m_ListView) - { - ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); - } + ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); _DoFolderViewCB(SFVM_SIZE, 0, 0); @@ -2313,6 +2331,10 @@ static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE */ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + // The change notify can come before WM_CREATE. + if (!m_ListView) + return FALSE; + HANDLE hChange = (HANDLE)wParam; DWORD dwProcID = (DWORD)lParam; PIDLIST_ABSOLUTE *Pidls; @@ -2658,6 +2680,12 @@ HRESULT WINAPI CDefView::SelectItem(PCUITEMID_CHILD pidl, UINT uFlags) TRACE("(%p)->(pidl=%p, 0x%08x) stub\n", this, pidl, uFlags); + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } + i = LV_FindItemByPidl(pidl); if (i == -1) return S_OK; @@ -2866,6 +2894,12 @@ HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) HRESULT STDMETHODCALLTYPE CDefView::GetItemPosition(PCUITEMID_CHILD pidl, POINT *ppt) { + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } + int lvIndex = LV_FindItemByPidl(pidl); if (lvIndex == -1 || ppt == NULL) return E_INVALIDARG; @@ -2879,7 +2913,10 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt) TRACE("(%p)->(%p)\n", this, ppt); if (!m_ListView) + { + ERR("!m_ListView\n"); return S_FALSE; + } if (ppt) { @@ -2942,6 +2979,8 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags) HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags) { + ASSERT(m_ListView); + /* Reset the selection */ m_ListView.SetItemState(-1, 0, LVIS_SELECTED); @@ -3099,6 +3138,11 @@ HRESULT STDMETHODCALLTYPE CDefView::AutoArrange() HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item) { TRACE("(%p)->(%p %p)\n", this, pidl, item); + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } *item = LV_AddItem(pidl); return (int)*item >= 0 ? S_OK : E_OUTOFMEMORY; } @@ -3111,11 +3155,13 @@ HRESULT STDMETHODCALLTYPE CDefView::GetObject(PITEMID_CHILD *pidl, UINT item) HRESULT STDMETHODCALLTYPE CDefView::RemoveObject(PITEMID_CHILD pidl, UINT *item) { - TRACE("(%p)->(%p %p)\n", this, pidl, item); if (!m_ListView) + { + ERR("!m_ListView\n"); return E_FAIL; + } if (pidl) { diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp index 63db5adbb69..0693b451869 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosserver.bmp and b/dll/win32/shell32/res/bitmaps/reactosserver.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp index 1e6000e2bd3..6ef29d7ba0c 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp and b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp differ diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp index 6649e4d4841..618182708b1 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp @@ -804,7 +804,7 @@ void printUsage() void deleteDriverFiles() { TCHAR SysDir[MAX_PATH]; - unsigned int len; + size_t len; if (GetSystemDirectory(SysDir, sizeof(SysDir))==0) { PrintLastError("GetSystemDirectory()"); return; diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index 0740e8437ae..7a68624d7ec 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/ntoskrnl/inbv/resources/logo.bmp b/ntoskrnl/inbv/resources/logo.bmp index 99b2feb0b77..a223470892e 100644 Binary files a/ntoskrnl/inbv/resources/logo.bmp and b/ntoskrnl/inbv/resources/logo.bmp differ diff --git a/ntoskrnl/inbv/resources/progress.bmp b/ntoskrnl/inbv/resources/progress.bmp index 225fe02efc9..053d632d9f1 100644 Binary files a/ntoskrnl/inbv/resources/progress.bmp and b/ntoskrnl/inbv/resources/progress.bmp differ diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index a5dd04560d3..01ac9318ae7 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2668,7 +2668,7 @@ MmSetExecuteOptions(IN ULONG ExecuteOptions) CurrentProcess->Flags.ImageDispatchEnable = TRUE; } - /* These are turned on by default if no-execution is also eanbled */ + /* These are turned on by default if no-execution is also enabled */ if (CurrentProcess->Flags.ExecuteEnable) { CurrentProcess->Flags.ExecuteDispatchEnable = TRUE; diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 03b481b0140..212c5ffae1f 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -55,12 +55,9 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$:-Wno-microsoft>") add_compile_options(-Wno-pragma-pack) add_compile_options(-fno-associative-math) - - if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) - # disable "libcall optimization" - # see https://mudongliang.github.io/2020/12/02/undefined-reference-to-stpcpy.html - add_compile_options(-fno-builtin-stpcpy) - endif() + # disable "libcall optimization" + # see https://mudongliang.github.io/2020/12/02/undefined-reference-to-stpcpy.html + add_compile_options(-fno-builtin-stpcpy) set(CMAKE_LINK_DEF_FILE_FLAG "") set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ea5ef0efbef..34f6cb81727 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -266,7 +266,7 @@ function(set_image_base MODULE IMAGE_BASE) endfunction() function(set_module_type_toolchain MODULE TYPE) - # Set the PE image version numbers from the NT OS version Windivs is based on + # Set the PE image version numbers from the NT OS version ReactOS is based on target_link_options(${MODULE} PRIVATE "/VERSION:5.01") if((TYPE STREQUAL win32dll) OR (TYPE STREQUAL win32ocx) OR (TYPE STREQUAL cpl)) @@ -312,7 +312,7 @@ function(fixup_load_config _target) # msvc knows how to generate a load_config so no hacks here endfunction() -function(generate_import_lib _libname _dllname _spec_file) +function(generate_import_lib _libname _dllname _spec_file __version_arg) set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) @@ -320,7 +320,7 @@ function(generate_import_lib _libname _dllname _spec_file) # Generate the def and asm stub files add_custom_command( OUTPUT ${_asm_stubs_file} ${_def_file} - COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms ${__version_arg} -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) # Compile the generated asm stub file @@ -363,7 +363,7 @@ if(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") set(SPEC2DEF_ARCH arm) elseif(ARCH STREQUAL "arm64") - add_definitions(/D__arm64__) + add_definitions(/D__arm64__) set(SPEC2DEF_ARCH arm64) else() set(SPEC2DEF_ARCH i386) @@ -386,6 +386,8 @@ function(spec2def _dllname _spec_file) if(__spec2def_VERSION) set(__version_arg "--version=0x${__spec2def_VERSION}") + else() + set(__version_arg "--version=${DLL_EXPORT_VERSION}") endif() # Generate exports def and C stubs file for the DLL @@ -395,7 +397,7 @@ function(spec2def _dllname _spec_file) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB) - generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) + generate_import_lib(lib${_file} ${_dllname} ${_spec_file} "${__version_arg}") if(__spec2def_NO_PRIVATE_WARNINGS) set_property(TARGET lib${_file} APPEND PROPERTY STATIC_LIBRARY_OPTIONS /ignore:4104) endif() @@ -409,21 +411,15 @@ endmacro() # PSEH workaround set(PSEH_LIB "pseh") -# Use a full path for the x86 version of ml when using x64 VS. -# It's not a problem when using the DDK/WDK because, in x64 mode, -# both the x86 and x64 versions of ml are available. -if(ARCH STREQUAL "amd64") - if((MSVC_VERSION LESS_EQUAL 1900) AND (DEFINED ENV{VCINSTALLDIR})) +# Setup MASM/ML for compiling 16-bit x86 ASM code on x86 or non-x86 ports. +if(NOT ARCH STREQUAL "i386") + if((MSVC_VERSION EQUAL 1900) AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) elseif(DEFINED ENV{VCToolsInstallDir}) - set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/HostX86/x86/ml.exe) + set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/Host$ENV{VSCMD_ARG_HOST_ARCH}/x86/ml.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() -elseif(ARCH STREQUAL "arm") - set(CMAKE_ASM16_COMPILER armasm.exe) -elseif(ARCH STREQUAL "arm64") - set(CMAKE_ASM16_COMPILER armasm64.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() @@ -446,11 +442,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) - if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") - set(_asm16_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_temp_file}) - else() - set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) - endif() + set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) add_custom_command( OUTPUT ${_object_file} diff --git a/sdk/include/reactos/ui/CWaitCursor.h b/sdk/include/reactos/ui/CWaitCursor.h new file mode 100644 index 00000000000..38bc74d614d --- /dev/null +++ b/sdk/include/reactos/ui/CWaitCursor.h @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS headers + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Wait cursor management + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ + */ + +#pragma once + +class CWaitCursor +{ +public: + CWaitCursor() + { + if (s_nLock++ == 0) + { + if (!s_hWaitCursor) + s_hWaitCursor = ::LoadCursor(NULL, IDC_WAIT); + s_hOldCursor = ::SetCursor(s_hWaitCursor); + } + else + { + ::SetCursor(s_hWaitCursor); + } + } + ~CWaitCursor() + { + if (--s_nLock == 0) + { + ::SetCursor(s_hOldCursor); + s_hOldCursor = NULL; + } + } + + CWaitCursor(const CWaitCursor&) = delete; + CWaitCursor& operator=(const CWaitCursor&) = delete; + void *operator new(size_t) = delete; + void operator delete(void*) = delete; + + static BOOL IsWaiting() + { + return s_nLock > 0; + } + + static void Restore() + { + ::SetCursor(s_hWaitCursor); + } + +protected: + static LONG s_nLock; + static HCURSOR s_hOldCursor; + static HCURSOR s_hWaitCursor; +}; + +DECLSPEC_SELECTANY LONG CWaitCursor::s_nLock = 0; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hOldCursor = NULL; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hWaitCursor = NULL; diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 6025772505f..cd8e663bb0b 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,12 +9,12 @@ endif() set(KERNEL_VERSION_MAJOR "5") set(KERNEL_VERSION_MINOR "2") set(KERNEL_VERSION_PATCH_LEVEL "3790") -set(KERNEL_VERSION_PATCH_NUMBER "71") +set(KERNEL_VERSION_PATCH_NUMBER "95") set(COPYRIGHT_YEAR "2023") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases. -set(KERNEL_VERSION_BUILD_TYPE "wins2k3-sp1") +set(KERNEL_VERSION_BUILD_TYPE "wins2k3-sp2") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_VERSION_PATCH_LEVEL}.${KERNEL_VERSION_PATCH_NUMBER}-${WINARCH}") if(NOT KERNEL_VERSION_BUILD_TYPE STREQUAL "") diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 4fbfb48749b..d851b3f38ac 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -1,15 +1,4 @@ -if(MSVC) - if(MSVC_VERSION LESS 1900) - add_definitions(-Dsnprintf=_snprintf) - - # Add this definition for WDK only, VS 9 doesn't like that - if(DEFINED ENV{DDKBUILDENV}) - add_definitions(-Dvsnprintf=_vsnprintf) - endif() - endif() -endif() - FLEX_TARGET(p_scanner parser.l ${CMAKE_CURRENT_BINARY_DIR}/parser.yy.c) BISON_TARGET(p_parser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.tab.c COMPILE_FLAGS "-p parser_") ADD_FLEX_BISON_DEPENDENCY(p_scanner p_parser) diff --git a/sdk/tools/wpp/CMakeLists.txt b/sdk/tools/wpp/CMakeLists.txt index 11999c26949..5fbb26fa616 100644 --- a/sdk/tools/wpp/CMakeLists.txt +++ b/sdk/tools/wpp/CMakeLists.txt @@ -1,22 +1,9 @@ if(MSVC) - if(MSVC_VERSION LESS 1900) - add_definitions( - -Dsnprintf=_snprintf - -Dstrtoull=_strtoui64 - -Dstrtoll=_strtoi64) - - # Add this definition for WDK only, VS 9 doesn't like that - if(DEFINED ENV{DDKBUILDENV}) - add_definitions(-Dvsnprintf=_vsnprintf) - endif() - endif() - # Disable warnings add_compile_options( /wd4146 # "unary minus operator applied to unsigned type, result still unsigned" /wd4244) # "'=': conversion from 'a' to 'b', possible loss of data" - endif() if(CMAKE_CROSSCOMPILING) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 01740c9c23e..3b9bd6c0e7c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3685,20 +3685,7 @@ static BOOL FASTCALL MENU_MouseMove(MTRACKER *pmt, PMENU PtMenu, UINT Flags) UINT Index = NO_SELECTED_ITEM; if ( PtMenu ) - { - if (IS_SYSTEM_MENU(PtMenu)) - { - Index = 0; - //// ReactOS only HACK: CORE-2338 - // Windows tracks mouse moves to the system menu but does not open it. - // Only keyboard tracking can do that. - // - TRACE("SystemMenu\n"); - return TRUE; // Stay inside the Loop! - } - else - MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); - } + MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); if (Index == NO_SELECTED_ITEM) { diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 69291c50adb..bcf19e62616 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -285,6 +285,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) } else /* SC_SIZE */ { + RECTL_vSetEmptyRect(&pwnd->InternalPos.NormalRect); if (!thickframe) return; if (hittest && (syscommand != SC_MOUSEMENU)) { diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index e587c73a58d..81b26ad1859 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2189,7 +2189,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, pti = GetW32ThreadInfo(); if (pti == NULL || pti->rpdesk == NULL) { - ERR("Thread is not attached to a desktop! Cannot create window!\n"); + ERR("Thread is not attached to a desktop! Cannot create window (%wZ)\n", ClassName); return NULL; // There is nothing to cleanup. } WinSta = pti->rpdesk->rpwinstaParent; @@ -2224,7 +2224,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, } else if ((Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { - ERR("Cannot create a child window without a parent!\n"); + ERR("Cannot create a child window (%wZ) without a parent\n", ClassName); EngSetLastError(ERROR_TLW_WITH_WSCHILD); goto cleanup; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } @@ -2244,12 +2244,12 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, if (hWndParent && !ParentWindow) { - ERR("Got invalid parent window handle\n"); + ERR("Got invalid parent window handle for %wZ\n", ClassName); goto cleanup; } else if (hWndOwner && !OwnerWindow) { - ERR("Got invalid owner window handle\n"); + ERR("Got invalid owner window handle for %wZ\n", ClassName); ParentWindow = NULL; goto cleanup; } @@ -2288,7 +2288,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, dwVer ); if(!Window) { - ERR("IntCreateWindow failed!\n"); + ERR("IntCreateWindow(%wZ) failed\n", ClassName); goto cleanup; } @@ -2414,7 +2414,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Result = co_IntSendMessage(UserHMGetHandle(Window), WM_NCCREATE, 0, (LPARAM) Cs); if (!Result) { - ERR("co_UserCreateWindowEx(): NCCREATE message failed\n"); + ERR("co_UserCreateWindowEx(%wZ): NCCREATE message failed\n", ClassName); goto cleanup; } @@ -2474,7 +2474,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Result = co_IntSendMessage(UserHMGetHandle(Window), WM_CREATE, 0, (LPARAM) Cs); if (Result == (LRESULT)-1) { - ERR("co_UserCreateWindowEx(): WM_CREATE message failed\n"); + ERR("co_UserCreateWindowEx(%wZ): WM_CREATE message failed\n", ClassName); goto cleanup; } @@ -2565,7 +2565,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, co_IntUserManualGuiCheck(TRUE); } - TRACE("co_UserCreateWindowEx(): Created window %p\n", hWnd); + TRACE("co_UserCreateWindowEx(%wZ): Created window %p\n", ClassName, hWnd); ret = Window; cleanup: diff --git a/win32ss/user/user32/resources/oic_reactos.ico b/win32ss/user/user32/resources/oic_reactos.ico index 8b44f79c629..463b6351298 100644 Binary files a/win32ss/user/user32/resources/oic_reactos.ico and b/win32ss/user/user32/resources/oic_reactos.ico differ