Ros-diffs February 2023

ros-diffs@reactos.org

16 participants
97 discussions

[reactos] 01/01: [BROWSEUI] Don't show file names in Relevance column in search results (#5072)

by Atharva Kulkarni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f6f24d0f6d31d29dd9ff… commit 2f6f24d0f6d31d29dd9ff3df258262535480de00 Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Tue Feb 14 01:19:45 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 13 20:49:45 2023 +0100 [BROWSEUI] Don't show file names in Relevance column in search results (#5072) * Dont show file names in Relevance column * Define new column names * Update CompareIDs to use newer defines --- dll/win32/browseui/resource.h | 4 ++++ dll/win32/browseui/shellfind/CFindFolder.cpp | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index 8b4318ffcb4..9a80d85e045 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -180,3 +180,7 @@ #define IDS_PARSE_ADDR_ERR_TITLE 9600 #define IDS_PARSE_ADDR_ERR_TEXT 9601 + +#define COL_NAME_INDEX 0 +#define COL_LOCATION_INDEX 1 +#define COL_RELEVANCE_INDEX 2 diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 63ff66247c4..faa71f4c528 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -671,11 +671,17 @@ STDMETHODIMP CFindFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELL if (!pidl) return SHSetStrRet(&pDetails->str, _AtlBaseModule.GetResourceInstance(), g_ColumnDefs[iColumn].iResource); - if (iColumn == 1) + if (iColumn == COL_LOCATION_INDEX) { return SHSetStrRet(&pDetails->str, _ILGetPath(pidl)); } + if (iColumn == COL_RELEVANCE_INDEX) + { + // TODO: Fill once the relevance is calculated + return SHSetStrRet(&pDetails->str, ""); + } + return GetDisplayNameOf(pidl, SHGDN_NORMAL, &pDetails->str); } @@ -716,11 +722,11 @@ STDMETHODIMP CFindFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PC WORD wColumn = LOWORD(lParam); switch (wColumn) { - case 0: // Name + case COL_NAME_INDEX: // Name break; - case 1: // Path + case COL_LOCATION_INDEX: // Path return MAKE_COMPARE_HRESULT(StrCmpW(_ILGetPath(pidl1), _ILGetPath(pidl2))); - case 2: // Relevance + case COL_RELEVANCE_INDEX: // Relevance return E_NOTIMPL; default: // Default columns wColumn -= _countof(g_ColumnDefs) - 1;

1 year, 7 months

[reactos] 01/01: [EXPLORER] Fix crash on backspace while editing a label in the folder panel (#5059)

by Atharva Kulkarni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a777cc2cc4768bd251908… commit a777cc2cc4768bd25190863d4aeef7cbd356841c Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Tue Feb 14 01:15:39 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 13 20:45:39 2023 +0100 [EXPLORER] Fix crash on backspace while editing a label in the folder panel (#5059) While editing a label, accelerator events should not be propagated. --- dll/win32/browseui/explorerband.cpp | 8 ++++++++ dll/win32/browseui/explorerband.h | 1 + 2 files changed, 9 insertions(+) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 83b5d8c3396..dcab4f4455b 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -149,6 +149,7 @@ CExplorerBand::CExplorerBand() , m_fVisible(FALSE) , m_bNavigating(FALSE) , m_dwBandID(0) + , m_isEditing(FALSE) , m_pidlCurrent(NULL) { } @@ -1217,6 +1218,9 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO() HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) { + if (m_isEditing) + return S_FALSE; + if (lpMsg->hwnd == m_hWnd) { TranslateMessage(lpMsg); @@ -1314,7 +1318,10 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME) && theResult) + { *theResult = 0; + m_isEditing = TRUE; + } return S_OK; } case TVN_ENDLABELEDITW: @@ -1323,6 +1330,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); HRESULT hr; + m_isEditing = FALSE; if (theResult) *theResult = 0; if (dispInfo->item.pszText) diff --git a/dll/win32/browseui/explorerband.h b/dll/win32/browseui/explorerband.h index a4d5aa98666..6e48e944053 100644 --- a/dll/win32/browseui/explorerband.h +++ b/dll/win32/browseui/explorerband.h @@ -60,6 +60,7 @@ private: BOOL m_bNavigating; BOOL m_bFocused; DWORD m_dwBandID; + BOOL m_isEditing; HIMAGELIST m_hImageList; HTREEITEM m_hRoot; HTREEITEM m_oldSelected;

1 year, 7 months

[reactos] 01/01: [DESK] Update Hungarian (hu-HU) translation (#5060)

by Tibor Lajos Füzi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e60c0f6970002a96c3042… commit e60c0f6970002a96c30426b981ce0b1599380b84 Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Mon Feb 13 15:29:45 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 13 15:29:45 2023 +0100 [DESK] Update Hungarian (hu-HU) translation (#5060) --- dll/cpl/desk/lang/hu-HU.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 29da6e1970d..7b210b5dd6d 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -28,7 +28,7 @@ BEGIN PUSHBUTTON "&Színek...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Elrendezés", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 + PUSHBUTTON "&Asztal testreszabása...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -156,23 +156,23 @@ END IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 - CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + GROUPBOX "Asztali ikonok", IDC_STATIC, 6, 4, 212, 40 + CONTROL "&Dokumentumok", IDC_ICONS_MYDOCS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 - CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + CONTROL "&Hálózati helyek", IDC_ICONS_MYNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 - CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + CONTROL "&Számítógép", IDC_ICONS_MYCOMP, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 - CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + CONTROL "&Internet böngésző", IDC_ICONS_INTERNET, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, 6, 60, 212, 56 - PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 - PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 + PUSHBUTTON "I&koncsere...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "&Alapértelmezett", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -235,7 +235,7 @@ END STRINGTABLE BEGIN - IDS_DESKTOP_ITEMS "Desktop Items" + IDS_DESKTOP_ITEMS "Asztali elemek" END STRINGTABLE

1 year, 7 months

[reactos] 01/01: [NTUSER] Missing "X" on "Folder" pane when Right Click > Explore from Desktop icons & Rapps toolbar errors (#5068)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57eb2a6bf469383848a55… commit 57eb2a6bf469383848a559feedc1eed7fc13dd5c Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Feb 13 08:27:40 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 13 15:27:40 2023 +0100 [NTUSER] Missing "X" on "Folder" pane when Right Click > Explore from Desktop icons & Rapps toolbar errors (#5068) Fix for right-clicking on 'My Computer' and selecting 'explore' and there is no 'X' for the title bar in the Folders pane Also fixes Rapps missing toolbar combo box and edit box controls that were not displayed. This is a complete revert of #4995 (commit 7866eb2) while still retaining its fixes. CORE-18830, CORE-18817 Co-authored-by: I_Kill_Bugs --- win32ss/user/ntuser/winpos.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index c0251ccc6a5..f95da850077 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1979,7 +1979,7 @@ co_WinPosSetWindowPos( Window->state |= WNDS_SENDNCPAINT; } - if (!(WinPos.flags & SWP_NOREDRAW)) + if (!(WinPos.flags & SWP_NOREDRAW) && ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE)) { /* Determine the new visible region */ VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, @@ -2100,8 +2100,7 @@ co_WinPosSetWindowPos( } /* We need to redraw what wasn't visible before or force a redraw */ - if ((WinPos.flags & (SWP_FRAMECHANGED | SWP_SHOWWINDOW)) || - (((WinPos.flags & SWP_AGG_NOGEOMETRYCHANGE) != SWP_AGG_NOGEOMETRYCHANGE) && VisAfter != NULL)) + if (VisAfter != NULL) { PREGION DirtyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (DirtyRgn)

1 year, 7 months

[reactos] 01/01: [NOTEPAD] Fix and improve DoSaveFile (#5066)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97db8a258dc49de5bf8cb… commit 97db8a258dc49de5bf8cba8c432a9d37be5eacc0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 13 08:32:09 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 13 08:32:09 2023 +0900 [NOTEPAD] Fix and improve DoSaveFile (#5066) - Use EM_GETHANDLE to get the text. - Check zero size and handle it elegantly. CORE-18832 --- base/applications/notepad/dialog.c | 41 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 06618147121..8233082be1b 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -4,6 +4,7 @@ * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2002 Andriy Palamarchuk + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -332,48 +333,46 @@ GetPrintingRect(HDC hdc, RECT margins) static BOOL DoSaveFile(VOID) { - BOOL bRet = TRUE; + BOOL bRet = FALSE; HANDLE hFile; - LPTSTR pTemp; - DWORD size; + DWORD cchText; - hFile = CreateFile(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(hFile == INVALID_HANDLE_VALUE) + hFile = CreateFileW(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) { ShowLastError(); return FALSE; } - size = GetWindowTextLength(Globals.hEdit) + 1; - pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(*pTemp)); - if (!pTemp) + cchText = GetWindowTextLengthW(Globals.hEdit); + if (cchText <= 0) { - CloseHandle(hFile); - ShowLastError(); - return FALSE; + bRet = TRUE; } - size = GetWindowText(Globals.hEdit, pTemp, size); - - if (size) + else { - if (!WriteText(hFile, (LPWSTR)pTemp, size, Globals.encFile, Globals.iEoln)) + HLOCAL hLocal = (HLOCAL)SendMessageW(Globals.hEdit, EM_GETHANDLE, 0, 0); + LPWSTR pszText = LocalLock(hLocal); + if (pszText) { - ShowLastError(); - bRet = FALSE; + bRet = WriteText(hFile, pszText, cchText, Globals.encFile, Globals.iEoln); + if (!bRet) + ShowLastError(); + + LocalUnlock(hLocal); } else { - SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); - bRet = TRUE; + ShowLastError(); } } CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, pTemp); if (bRet) { + SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SetFileName(Globals.szFileName); }

1 year, 7 months

[reactos] 01/01: Fix Wine Internet Explorer Print hang (#5064)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a050be089509335047128… commit a050be0895093350471280c93cf5dd047a25b2c8 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Feb 12 12:17:55 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 12 19:17:55 2023 +0100 Fix Wine Internet Explorer Print hang (#5064) When using wine internet explorer it crashes if you click print even if you click cancel, this fixes that issue. nsIWebBrowserPrint_Print apparently causes issues for unknown reasons. JIRA issue: CORE-16884 By returning S_OK print doesn't cause a crash. Use ERR and S_OK return before hitting nsIWebBrowserPrint_Print --- dll/win32/mshtml/olecmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/mshtml/olecmd.c b/dll/win32/mshtml/olecmd.c index 96b3f4bb6b7..6c419f8761f 100644 --- a/dll/win32/mshtml/olecmd.c +++ b/dll/win32/mshtml/olecmd.c @@ -241,6 +241,13 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, return S_OK; } +#ifdef __REACTOS__ + // returning here fixes CORE-16884. Maybe use this until printing works. + ERR("Aborting print, to work around CORE-16884\n"); + nsIWebBrowserPrint_Release(nsprint); + return S_OK; +#endif + nsres = nsIWebBrowserPrint_GetGlobalPrintSettings(nsprint, &settings); if(NS_FAILED(nsres)) ERR("GetCurrentPrintSettings failed: %08x\n", nsres);

1 year, 7 months

[reactos] 01/01: [RAPPS] Fix Installed Apps information display (#4973)

by Rexx J. Larsson

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b5d917699912194ee71d… commit 3b5d917699912194ee71dc96f2c6a4836cf0c288 Author: Rexx J. Larsson <hello(a)rexx.icu> AuthorDate: Sun Feb 12 16:15:51 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 12 16:15:51 2023 +0100 [RAPPS] Fix Installed Apps information display (#4973) This fixes hyperlinks highlighting the text before it. CORE-18397 --- base/applications/rapps/installed.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 7162f471b50..054bcf1736d 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -148,7 +148,7 @@ BOOL CInstalledApplicationInfo::GetApplicationRegString(LPCWSTR lpKeyName, ATL:: dwSize = min(dwAllocated, dwSize); // CString takes care of zero-terminating it - String.ReleaseBuffer(dwSize / sizeof(WCHAR)); + String.ReleaseBuffer(); if (Result != ERROR_SUCCESS) { @@ -164,7 +164,7 @@ BOOL CInstalledApplicationInfo::GetApplicationRegString(LPCWSTR lpKeyName, ATL:: if (dwLen > 0) { BOOL bSuccess = ExpandEnvironmentStringsW(String, Tmp.GetBuffer(dwLen), dwLen) == dwLen; - Tmp.ReleaseBuffer(dwLen - 1); + Tmp.ReleaseBuffer(); if (bSuccess) { String = Tmp;

1 year, 7 months

[reactos] 01/01: [NTUSER] Delete temporary workarounds in co_IntSetScrollInfo() (#4985)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ad57373701686876c604… commit 5ad57373701686876c604f3bd58fbb2e449d5d81 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Feb 12 00:35:27 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 12 00:35:27 2023 +0100 [NTUSER] Delete temporary workarounds in co_IntSetScrollInfo() (#4985) fixes JIRA issue: CORE-18050 improves the code by removing ancient hacks (the static variables) reduces testbot failures VBox: https://reactos.org/testman/compare.php?ids=85831,85832 LGTM (-2 failures in user32:scroll for both bots) KVM: https://reactos.org/testman/compare.php?ids=85829,85833 LGTM (-2 failures in user32:scroll for both bots) co-authored by Doug-Lyons --- win32ss/user/ntuser/scrollbar.c | 60 +++++------------------------------------ 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 3763ac5c494..e52b70a21da 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -488,20 +488,15 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) UINT new_flags; INT action = 0; PSBDATA pSBData; - DWORD OldPos = 0, CurrentPos = 0; + DWORD OldPos = 0; BOOL bChangeParams = FALSE; /* Don't show/hide scrollbar if params don't change */ UINT MaxPage; int MaxPos; - /* [0] = SB_HORZ, [1] = SB_VERT, [2] = SB_CTL */ - static PWND PrevHwnd[3] = { 0 }; - static DWORD PrevPos[3] = { 0 }; - static DWORD PrevMax[3] = { 0 }; - static INT PrevAction[3] = { 0 }; BOOL bVisible; ASSERT_REFS_CO(Window); - if(!SBID_IS_VALID(nBar)) /* Assures nBar is 0, 1, or 2 */ + if(!SBID_IS_VALID(nBar)) { EngSetLastError(ERROR_INVALID_PARAMETER); ERR("Trying to set scrollinfo for unknown scrollbar type %d\n", nBar); @@ -548,9 +543,9 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) /* Set the scroll pos */ if (lpsi->fMask & SIF_POS) { + OldPos = Info->nPos; if (Info->nPos != lpsi->nPos) { - OldPos = Info->nPos; Info->nPos = lpsi->nPos; pSBData->pos = lpsi->nPos; } @@ -645,16 +640,6 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) } //done: - if ((Window != PrevHwnd[nBar]) || (action != PrevAction[nBar])) - { - if ((action == SA_SSI_SHOW) && (PrevAction[nBar] == SA_SSI_HIDE)) - { - co_UserShowScrollBar(Window, nBar, TRUE, TRUE); - } - } - if ((action != PrevAction[nBar]) && action != 0) - PrevAction[nBar] = action; - if ( action & SA_SSI_HIDE ) { co_UserShowScrollBar(Window, nBar, FALSE, FALSE); @@ -685,7 +670,6 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) { if (!(Info->fMask & SIF_THEMED)) /* Not Using Themes */ { - TRACE("Not using themes.\n"); if (action & SA_SSI_REPAINT_ARROWS) { // Redraw the entire bar. @@ -702,50 +686,18 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) IntRefeshScrollInterior(Window, nBar, psbi); } } - else /* Using Themes */ + else /* Using Themes */ { RECTL UpdateRect = psbi->rcScrollBar; - TRACE("Using themes.\n"); UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; - /* Just paint the interior and not the arrows. */ - if (!(action & SA_SSI_REPAINT_ARROWS)) - { - if (nBar == SB_HORZ) - { - UpdateRect.left += psbi->dxyLineButton; - UpdateRect.right -= psbi->dxyLineButton; - } - if (nBar == SB_VERT) - { - UpdateRect.top += psbi->dxyLineButton; - UpdateRect.bottom -= psbi->dxyLineButton; - } - } - CurrentPos = lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; - /* Check for changes to Window or CurrentPos or lpsi->nMax */ - if ((Window != PrevHwnd[nBar]) || (CurrentPos != PrevPos[nBar]) || - (lpsi->nMax != PrevMax[nBar])) - { + if (bChangeParams || (OldPos != pSBData->pos)) co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); - PrevHwnd[nBar] = Window; - PrevPos[nBar] = CurrentPos; - PrevMax[nBar] = lpsi->nMax; - } } - } // FIXME: Arrows -/* else if( action & SA_SSI_REPAINT_ARROWS ) - { - RECTL UpdateRect = psbi->rcScrollBar; - UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; - UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; - co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); } -*/ } + } if (bChangeParams && (nBar == SB_HORZ || nBar == SB_VERT) && (lpsi->fMask & SIF_DISABLENOSCROLL)) {

1 year, 7 months

[reactos] 01/01: [BROWSEUI] Update de-DE.rc German translation

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a38d19ebce7eae86a4931… commit a38d19ebce7eae86a49311611115cb4c9de74dcc Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 11 21:35:57 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Feb 11 21:35:57 2023 +0100 [BROWSEUI] Update de-DE.rc German translation German accelerator for "&Datei" collided with "A&dresse". Fix by switching to what MS uses in german XPSP3. see the before-state with the [BROWSEUI] collision here: https://jira.reactos.org/secure/attachment/65116/ros.png Please note that in current master head the accelerators in [BROWSEUI] filebrowser are generally broken for other reasons. So this commit will not entirely fix CORE-18824 Also update to new-style header (inspired by es-ES.rc) and https://reactos.org/wiki/Coding_Style and add a missing translation. --- dll/win32/browseui/lang/de-DE.rc | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 2670095c0e8..02020fd4843 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -1,19 +1,8 @@ /* - * Copyright 2009 Andrew Hill - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS Win32 BrowseUI + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2023 Joachim Henze <Joachim.Henze(a)reactos.org> */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -306,7 +295,7 @@ END STRINGTABLE BEGIN IDS_SEARCHLABEL "Suchen" - IDS_ADDRESSBANDLABEL "A&dresse" + IDS_ADDRESSBANDLABEL "Adre&sse" END STRINGTABLE @@ -360,5 +349,5 @@ END STRINGTABLE BEGIN IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." + IDS_PARSE_ADDR_ERR_TEXT "'%1' kann nicht gefunden werden." END

1 year, 7 months

[reactos] 01/01: [SYSSETUP] Fix a space-typo in IDS_WZD_PASSWORDEMPTY for *.rc (#5049)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc54ecd779eeb178ceeed… commit cc54ecd779eeb178ceeed1777cb1776f50c43593 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sat Feb 11 21:09:47 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 11 21:09:47 2023 +0100 [SYSSETUP] Fix a space-typo in IDS_WZD_PASSWORDEMPTY for *.rc (#5049) Also update any existing old-school-headers to more compact newstyle. --- dll/win32/syssetup/lang/da-DK.rc | 23 ++++++----------------- dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/en-GB.rc | 2 +- dll/win32/syssetup/lang/en-US.rc | 23 ++++++----------------- dll/win32/syssetup/lang/fi-FI.rc | 23 ++++++----------------- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 23 ++++++----------------- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 23 ++++++----------------- dll/win32/syssetup/lang/sv-SE.rc | 23 ++++++----------------- dll/win32/syssetup/lang/th-TH.rc | 23 ++++++----------------- dll/win32/syssetup/lang/uk-UA.rc | 4 ++-- 13 files changed, 49 insertions(+), 126 deletions(-) diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 68dd8941f2a..0c76f80322f 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Danish resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 2bf8ae5c3f6..758afb2ebc2 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Για να συνεχίσει η εγκατάσταση, πρέπει να εισάγετε το όνομά σας." IDS_WZD_SETCOMPUTERNAME "Η εγκατάσταση απέτυχε να ορίσει το όνομα του υπολογιστή σας." IDS_WZD_COMPUTERNAME "Για να συνεχίσει η εγκατάσταση, πρέπει να εισάγετε το όνομά του υπολογιστή." - IDS_WZD_PASSWORDEMPTY "Πρέπει να εισάγετε έναν κωδικό πρόσβασης !" + IDS_WZD_PASSWORDEMPTY "Πρέπει να εισάγετε έναν κωδικό πρόσβασης!" IDS_WZD_PASSWORDMATCH "Οι κωδικοί πρόσβασης που εισαγάγατε δεν είναι ίδιοι. Εισάγετε ξανά τον κωδικό προσβασης." IDS_WZD_PASSWORDCHAR "Ο κωδικός πρόσβασης που εισαγάγατε περιέχει μη έγκυρους χαρακτήρες. Παρακαλώ εισάγετε έναν άλλο κωδικό πρόσβασης." IDS_WZD_LOCALTIME "Η εγκατάσταση απέτυχε να ρυθμίσει την ώρα του υπολογιστή σας." diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index 645db548e77..cac3c294b4f 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 153bb0be53b..c4606839be8 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 3530dac77e2..277d6c66f9f 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 42a9e548d6b..88b9575c2e6 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 0af48b7ad99..d3c16f093e4 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "La procedura di installazione non può proseguire se non indicate il vostro nome." IDS_WZD_SETCOMPUTERNAME "La procedura di installazione non ha potuto impostare il nome del computer." IDS_WZD_COMPUTERNAME "La procedura di installazione non può proseguire se non indicate il nome del computer." - IDS_WZD_PASSWORDEMPTY "E' obbligatorio impostare la password !" + IDS_WZD_PASSWORDEMPTY "E' obbligatorio impostare la password!" IDS_WZD_PASSWORDMATCH "Le due password digitate non corrispondono. Digitate di nuovo le password." IDS_WZD_PASSWORDCHAR "La password contiene caratteri non validi. Digitate una password diversa." IDS_WZD_LOCALTIME "La procedura di installazione non ha potuto impostare l'ora locale." diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 4b91d334e95..a5152697c96 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Lithuanian resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 19bebcee246..dc68051a598 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -213,7 +213,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 1bdd0c1242f..7d339527e0f 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Ndërtimi nuk mund të vazhdojë deri sa të shkruani emrin tuaj." IDS_WZD_SETCOMPUTERNAME "Ndërtuesi dështoj për të vendosur emrin e kompjuterit." IDS_WZD_COMPUTERNAME "Ndërtuesi nuk mund të vazhdojë deri sa të shkruani emrin e kompjuterit tuaj." - IDS_WZD_PASSWORDEMPTY "Ju duhet të fusni një fjalëkalim !" + IDS_WZD_PASSWORDEMPTY "Ju duhet të fusni një fjalëkalim!" IDS_WZD_PASSWORDMATCH "Fjalëkalimet që shkruat nuk përputhet. Ju lutem shkruani fjalëkalimin e dëshiruar përsëri." IDS_WZD_PASSWORDCHAR "Fjalëkalimi që dhatë përmban shenja të pavlefshme. Ju lutemi shkruani një fjalëkalim të qartë." IDS_WZD_LOCALTIME "Ndërtuesi nuk ishte në gjendje për të vendosur kohën lokale." diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index ada1f682b8e..ca4f4eb697f 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Swedish resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 85e0f6c3d90..33ae67d0d12 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -1,20 +1,9 @@ /* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Thai resource file + * TRANSLATORS: Copyright 2004 Filip Navara + * Copyright 2004 Eric Kohl */ LANGUAGE LANG_THAI, SUBLANG_DEFAULT @@ -232,7 +221,7 @@ BEGIN IDS_WZD_NAME "Setup cannot continue until you enter your name." IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDEMPTY "You must enter a password!" IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index b06863d0c87..c3e57b46e63 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS System Setup Library * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Ukraianian resource file + * PURPOSE: Ukrainian resource file * TRANSLATORS: Copyright 2007 Artem Reznikov <temarez(a)yandex.ru> * Copyright 2010-2011 Igor Paliychuk <mansonigor(a)gmail.com> * Copyright 2018-2021 Yaroslav Kibysh <yanet.prod(a)gmail.com> @@ -222,7 +222,7 @@ BEGIN IDS_WZD_NAME "Для продовження встановлення необхідно ввести ваше ім'я." IDS_WZD_SETCOMPUTERNAME "Програмі інсталяції не вдалося встановити ім'я комп'ютера." IDS_WZD_COMPUTERNAME "Для продовження встановлення необхідно ввести ім'я комп'ютера." - IDS_WZD_PASSWORDEMPTY "Ви маєте ввести пароль !" + IDS_WZD_PASSWORDEMPTY "Ви маєте ввести пароль!" IDS_WZD_PASSWORDMATCH "Паролі, які ви ввели, не співпадають. Будь ласка введіть потрібний пароль знову." IDS_WZD_PASSWORDCHAR "Пароль, який ви ввели, містить заборонені символи. Будь ласка введіть інший пароль." IDS_WZD_LOCALTIME "Програмі інсталяції не вдалося встановити місцевий час."

1 year, 7 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2023