Ros-diffs

ros-diffs@reactos.org

10 participants
80994 discussions

[reactos] 01/05: [FREELDR] Minimally reformat include/fs/iso.h

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d99a70597628cfbca3bb… commit 5d99a70597628cfbca3bb051720c4dbef6acc9db Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 17:43:42 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 25 12:56:46 2024 +0200 [FREELDR] Minimally reformat include/fs/iso.h --- boot/freeldr/freeldr/include/fs/iso.h | 128 +++++++++++++++++----------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs/iso.h b/boot/freeldr/freeldr/include/fs/iso.h index 8786e8d5dd2..765f49b1fe5 100644 --- a/boot/freeldr/freeldr/include/fs/iso.h +++ b/boot/freeldr/freeldr/include/fs/iso.h @@ -20,82 +20,80 @@ #pragma once #include <pshpack1.h> -struct _DIR_RECORD +typedef struct _DIR_RECORD { - UCHAR RecordLength; // 1 - UCHAR ExtAttrRecordLength; // 2 - ULONG ExtentLocationL; // 3-6 - ULONG ExtentLocationM; // 7-10 - ULONG DataLengthL; // 11-14 - ULONG DataLengthM; // 15-18 - UCHAR Year; // 19 - UCHAR Month; // 20 - UCHAR Day; // 21 - UCHAR Hour; // 22 - UCHAR Minute; // 23 - UCHAR Second; // 24 - UCHAR TimeZone; // 25 - UCHAR FileFlags; // 26 - UCHAR FileUnitSize; // 27 - UCHAR InterleaveGapSize; // 28 - ULONG VolumeSequenceNumber; // 29-32 - UCHAR FileIdLength; // 33 - UCHAR FileId[1]; // 34 -}; -typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD; + UCHAR RecordLength; // 1 + UCHAR ExtAttrRecordLength; // 2 + ULONG ExtentLocationL; // 3-6 + ULONG ExtentLocationM; // 7-10 + ULONG DataLengthL; // 11-14 + ULONG DataLengthM; // 15-18 + UCHAR Year; // 19 + UCHAR Month; // 20 + UCHAR Day; // 21 + UCHAR Hour; // 22 + UCHAR Minute; // 23 + UCHAR Second; // 24 + UCHAR TimeZone; // 25 + UCHAR FileFlags; // 26 + UCHAR FileUnitSize; // 27 + UCHAR InterleaveGapSize; // 28 + ULONG VolumeSequenceNumber; // 29-32 + UCHAR FileIdLength; // 33 + UCHAR FileId[1]; // 34 +} DIR_RECORD, *PDIR_RECORD; -/* Volume Descriptor header*/ -struct _VD_HEADER +/* Volume Descriptor header */ +typedef struct _VD_HEADER { - UCHAR VdType; // 1 - UCHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 -}; -typedef struct _VD_HEADER VD_HEADER, *PVD_HEADER; + UCHAR VdType; // 1 + UCHAR StandardId[5]; // 2-6 + UCHAR VdVersion; // 7 +} VD_HEADER, *PVD_HEADER; -/* Primary Volume Descriptor */ -struct _PVD +/* + * Primary Volume Descriptor + * See also cdfs/cd.h RAW_ISO_VD + */ +typedef struct _PVD { - UCHAR VdType; // 1 - CHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 - UCHAR unused0; // 8 - CHAR SystemId[32]; // 9-40 - CHAR VolumeId[32]; // 41-72 - UCHAR unused1[8]; // 73-80 - ULONG VolumeSpaceSizeL; // 81-84 - ULONG VolumeSpaceSizeM; // 85-88 - UCHAR unused2[32]; // 89-120 - ULONG VolumeSetSize; // 121-124 - ULONG VolumeSequenceNumber; // 125-128 - ULONG LogicalBlockSize; // 129-132 - ULONG PathTableSizeL; // 133-136 - ULONG PathTableSizeM; // 137-140 - ULONG LPathTablePos; // 141-144 - ULONG LOptPathTablePos; // 145-148 - ULONG MPathTablePos; // 149-152 - ULONG MOptPathTablePos; // 153-156 - DIR_RECORD RootDirRecord; // 157-190 - CHAR VolumeSetIdentifier[128]; // 191-318 - CHAR PublisherIdentifier[128]; // 319-446 + UCHAR VdType; // 1 + CHAR StandardId[5]; // 2-6 + UCHAR VdVersion; // 7 + UCHAR unused0; // 8 + CHAR SystemId[32]; // 9-40 + CHAR VolumeId[32]; // 41-72 + UCHAR unused1[8]; // 73-80 + ULONG VolumeSpaceSizeL; // 81-84 + ULONG VolumeSpaceSizeM; // 85-88 + UCHAR unused2[32]; // 89-120 + ULONG VolumeSetSize; // 121-124 + ULONG VolumeSequenceNumber; // 125-128 + ULONG LogicalBlockSize; // 129-132 + ULONG PathTableSizeL; // 133-136 + ULONG PathTableSizeM; // 137-140 + ULONG LPathTablePos; // 141-144 + ULONG LOptPathTablePos; // 145-148 + ULONG MPathTablePos; // 149-152 + ULONG MOptPathTablePos; // 153-156 + DIR_RECORD RootDirRecord; // 157-190 + CHAR VolumeSetIdentifier[128]; // 191-318 + CHAR PublisherIdentifier[128]; // 319-446 - /* more data ... */ - -}; + /* more data ... */ +} PVD, *PPVD; #include <poppack.h> -typedef struct _PVD PVD, *PPVD; - -typedef struct +typedef struct _ISO_FILE_INFO { - ULONG FileStart; // File start sector - ULONG FileSize; // File size - ULONG FilePointer; // File pointer - BOOLEAN Directory; - ULONG DriveNumber; -} ISO_FILE_INFO, * PISO_FILE_INFO; + ULONG FileStart; // File start sector + ULONG FileSize; // File size + ULONG FilePointer; // File pointer + BOOLEAN Directory; + ULONG DriveNumber; +} ISO_FILE_INFO, *PISO_FILE_INFO; const DEVVTBL* IsoMount(ULONG DeviceId);

3 months, 2 weeks

[reactos] 01/01: [WIN32K] Fix protection of USER heap

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db419efbf26c78e39fb57… commit db419efbf26c78e39fb57bcaf4f9e4d915d0c96e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 26 10:31:18 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 24 13:32:28 2024 +0300 [WIN32K] Fix protection of USER heap Create the section with PAGE_READWRITE, not PAGE_EXECUTE_READWRITE and map in user mode with PAGE_READONLY, not PAGE_EXECUTE_READ. Original commit was ea5261f in 2006. The comments suggest that back then the heap code had issues with it, which is not the case anymore. --- win32ss/user/ntuser/desktop.c | 2 +- win32ss/user/ntuser/usrheap.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index ab8e87daa88..645717a7b1f 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -3262,7 +3262,7 @@ IntMapDesktopView(IN PDESKTOP pdesk) &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) { ERR("Failed to map desktop\n"); diff --git a/win32ss/user/ntuser/usrheap.c b/win32ss/user/ntuser/usrheap.c index f668331b374..b3515c5a76b 100644 --- a/win32ss/user/ntuser/usrheap.c +++ b/win32ss/user/ntuser/usrheap.c @@ -81,7 +81,7 @@ IntUserHeapCommitRoutine( &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) return Status; @@ -97,7 +97,7 @@ IntUserHeapCommitRoutine( 0, CommitSize, MEM_COMMIT, - PAGE_EXECUTE_READ); + PAGE_READONLY); if (NT_SUCCESS(Status)) { @@ -139,7 +139,7 @@ IntUserHeapCreate(IN PVOID SectionObject, &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) return NULL; @@ -148,7 +148,7 @@ IntUserHeapCreate(IN PVOID SectionObject, 0, &ViewSize, MEM_COMMIT, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); MmUnmapViewOfSection(PsGetCurrentProcess(), MappedView); @@ -193,7 +193,7 @@ UserCreateHeap(OUT PVOID *SectionObject, SECTION_ALL_ACCESS, NULL, &SizeHeap, - PAGE_EXECUTE_READWRITE, /* Would prefer PAGE_READWRITE, but thanks to RTL heaps... */ + PAGE_READWRITE, SEC_RESERVE | 1, NULL, NULL); @@ -315,7 +315,7 @@ MapGlobalUserHeap(IN PEPROCESS Process, &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) { ERR_CH(UserProcess, "MapGlobalUserHeap - Failed to map the global heap! 0x%x\n", Status);

3 months, 2 weeks

[reactos] 01/01: [NETID] Fix header in Romanian (ro-RO) translation (#7357)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9139d0fab14803e750d76… commit 9139d0fab14803e750d76216b1b0ccda197d5b7b Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Sep 21 19:40:52 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 21 19:40:52 2024 +0300 [NETID] Fix header in Romanian (ro-RO) translation (#7357) --- dll/win32/netid/lang/ro-RO.rc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc index ef3f5a1e489..c4666836baf 100644 --- a/dll/win32/netid/lang/ro-RO.rc +++ b/dll/win32/netid/lang/ro-RO.rc @@ -1,8 +1,9 @@ /* - * FILE: dll/win32/netid/lang/ro-RO.rc - * ReactOS Project (https://reactos.org) - * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + * PROJECT: ReactOS Network ID Page + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

3 months, 2 weeks

[reactos] 01/01: [USETUP] Fix handling of 0 sized files in the cab

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=469d4dbbab3ae55b87e71… commit 469d4dbbab3ae55b87e71b583f234fdee0598db9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Sep 2 14:47:17 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 20 14:08:13 2024 +0300 [USETUP] Fix handling of 0 sized files in the cab --- base/setup/usetup/spapisup/cabinet.c | 76 ++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index 414008163a5..52c35ed1888 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -1104,6 +1104,48 @@ CabinetExtractFile( } } + if (!ConvertDosDateTimeToFileTime(Search->File->FileDate, + Search->File->FileTime, + &FileTime)) + { + DPRINT1("DosDateTimeToFileTime() failed\n"); + Status = CAB_STATUS_CANNOT_WRITE; + goto CloseDestFile; + } + + NtStatus = NtQueryInformationFile(DestFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(NtStatus)) + { + DPRINT("NtQueryInformationFile() failed (%x)\n", NtStatus); + } + else + { + memcpy(&FileBasic.LastAccessTime, &FileTime, sizeof(FILETIME)); + + NtStatus = NtSetInformationFile(DestFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(NtStatus)) + { + DPRINT("NtSetInformationFile() failed (%x)\n", NtStatus); + } + } + + SetAttributesOnFile(Search->File, DestFile); + + /* Nothing more to do for 0 sized files */ + if (Search->File->FileSize == 0) + { + Status = CAB_STATUS_SUCCESS; + goto CloseDestFile; + } + MaxDestFileSize.QuadPart = Search->File->FileSize; NtStatus = NtCreateSection(&DestFileSection, SECTION_ALL_ACCESS, @@ -1139,40 +1181,6 @@ CabinetExtractFile( } CurrentDestBuffer = DestFileBuffer; - if (!ConvertDosDateTimeToFileTime(Search->File->FileDate, - Search->File->FileTime, - &FileTime)) - { - DPRINT1("DosDateTimeToFileTime() failed\n"); - Status = CAB_STATUS_CANNOT_WRITE; - goto UnmapDestFile; - } - - NtStatus = NtQueryInformationFile(DestFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("NtQueryInformationFile() failed (%x)\n", NtStatus); - } - else - { - memcpy(&FileBasic.LastAccessTime, &FileTime, sizeof(FILETIME)); - - NtStatus = NtSetInformationFile(DestFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("NtSetInformationFile() failed (%x)\n", NtStatus); - } - } - - SetAttributesOnFile(Search->File, DestFile); } /* Call extract event handler */

3 months, 2 weeks

[reactos] 01/01: [GDIPLUS] Fix for gdiplus/graphics.c regression with GCC 8.4.0 from 4.7.2(#7348)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e128cbc6807e60249660d… commit e128cbc6807e60249660d78f3b68a0f92ced6c96 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Sep 19 14:54:49 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 19 14:54:49 2024 -0500 [GDIPLUS] Fix for gdiplus/graphics.c regression with GCC 8.4.0 from 4.7.2(#7348) Affects ribbon bar when running Super Finder XT 1.6.3.2 from rapps. Change four REAL variables to DOUBLE to improve precision. CORE-19456 --- dll/win32/gdiplus/graphics.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/gdiplus/graphics.c b/dll/win32/gdiplus/graphics.c index 199b20442b2..dae43623da6 100644 --- a/dll/win32/gdiplus/graphics.c +++ b/dll/win32/gdiplus/graphics.c @@ -3264,7 +3264,11 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (do_resampling) { +#ifdef __REACTOS__ // CORE-19456 + DOUBLE delta_xx, delta_xy, delta_yx, delta_yy; +#else REAL delta_xx, delta_xy, delta_yx, delta_yy; +#endif /* Transform the bits as needed to the destination. */ dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top));

3 months, 2 weeks

[reactos] 01/01: [SHELL32] Use the correct flags with ListView's GetNextItem()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=058a67cb4a7eef2858536… commit 058a67cb4a7eef2858536528c1659eadd23d0b6a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 19 17:25:36 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 19 18:44:37 2024 +0200 [SHELL32] Use the correct flags with ListView's GetNextItem() LVIS_* -> LVNI_* --- dll/win32/shell32/CDefView.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index a963f55e044..3344ebfe0e5 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -2045,7 +2045,7 @@ UINT CDefView::GetSelections() UINT i = 0; int lvIndex = -1; - while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) + while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) { m_apidl[i] = _PidlByItem(lvIndex); i++; @@ -2212,10 +2212,10 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b if (hFocus == m_ListView.m_hWnd || m_ListView.IsChild(hFocus)) { // Is there an item focused and selected? - lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED|LVIS_FOCUSED); + lvIndex = m_ListView.GetNextItem(-1, LVNI_SELECTED | LVNI_FOCUSED); // If not, find the first selected item if (lvIndex < 0) - lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED); + lvIndex = m_ListView.GetNextItem(-1, LVNI_SELECTED); } // We got something

3 months, 2 weeks

[reactos] 01/01: [SHELL32] Don't leak SetProp (#7347)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4815873fedae35c100cc… commit d4815873fedae35c100cccf953d654b0a1d701f5 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Sep 18 21:48:58 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 18 21:48:58 2024 +0200 [SHELL32] Don't leak SetProp (#7347) --- dll/win32/shell32/brfolder.cpp | 4 ++-- dll/win32/shell32/shlfileop.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/brfolder.cpp b/dll/win32/shell32/brfolder.cpp index 4a7b19b7116..d328cf340e8 100644 --- a/dll/win32/shell32/brfolder.cpp +++ b/dll/win32/shell32/brfolder.cpp @@ -681,7 +681,7 @@ BrFolder_OnInitDialog(HWND hWnd, BrFolder *info) LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; info->hWnd = hWnd; - SetPropW(hWnd, L"__WINE_BRSFOLDERDLG_INFO", info); + SetWindowLongPtrW(hWnd, DWLP_USER, (LONG_PTR)info); if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) FIXME("flags BIF_NEWDIALOGSTYLE partially implemented\n"); @@ -1225,7 +1225,7 @@ BrFolderDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg == WM_INITDIALOG) return BrFolder_OnInitDialog(hWnd, (BrFolder *)lParam); - BrFolder *info = (BrFolder *)GetPropW(hWnd, L"__WINE_BRSFOLDERDLG_INFO"); + BrFolder *info = (BrFolder *)GetWindowLongPtrW(hWnd, DWLP_USER); if (!info) return 0; diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 9600add7517..b68417bf1ac 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -135,7 +135,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) /* this will remap the rect to dialog coords */ MapWindowPoints(GetDlgItem(hDlg, IDC_YESTOALL_MESSAGE), hDlg, (LPPOINT)&r, 2); hOldFont = (HFONT)SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDC_YESTOALL_MESSAGE, WM_GETFONT, 0, 0)); - DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, L"WINE_CONFIRM"), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); + DrawTextW(hdc, (LPWSTR)GetWindowLongPtrW(hDlg, DWLP_USER), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); SelectObject(hdc, hOldFont); EndPaint(hDlg, &ps); @@ -153,7 +153,7 @@ static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) SetWindowTextW(hDlg, info->lpszCaption); ShowWindow(GetDlgItem(hDlg, IDC_YESTOALL_MESSAGE), SW_HIDE); - SetPropW(hDlg, L"WINE_CONFIRM", info->lpszText); + SetWindowLongPtrW(hDlg, DWLP_USER, (LONG_PTR)info->lpszText); SendDlgItemMessageW(hDlg, IDC_YESTOALL_ICON, STM_SETICON, (WPARAM)info->hIcon, 0); /* compute the text height and resize the dialog */

3 months, 3 weeks

[reactos] 01/01: [LICCPA] Fix header in Romanian (ro-RO) translation (#7349)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=042a025835a75f1eb60ad… commit 042a025835a75f1eb60ad670a481aebac91b7625 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Sep 18 14:32:14 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 18 14:32:14 2024 +0300 [LICCPA] Fix header in Romanian (ro-RO) translation (#7349) Addendum to e8c7597b17a. --- dll/cpl/liccpa/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/liccpa/lang/ro-RO.rc b/dll/cpl/liccpa/lang/ro-RO.rc index e655ea4df75..38147a4353e 100644 --- a/dll/cpl/liccpa/lang/ro-RO.rc +++ b/dll/cpl/liccpa/lang/ro-RO.rc @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Exploitation System + * PROJECT: ReactOS License Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com>

3 months, 3 weeks

[reactos] 09/09: [RAPPS] Change the "Welcome" text with a suitable explanatory one in APPWIZ-mode (#6655)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e598589410e30707b6a6… commit 4e598589410e30707b6a69000ed4ebed857237b3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 16 18:26:09 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:51 2024 +0200 [RAPPS] Change the "Welcome" text with a suitable explanatory one in APPWIZ-mode (#6655) - Delete CAppRichEdit::SetWelcomeText() and move its implementation inside CAppInfoDisplay::SetWelcomeText(). - Make CAppInfoDisplay::SetWelcomeText() select a suitable text, depending on normal mode or APPWIZ mode. - IDS_WELCOME_TITLE: Remove the double \n\n from the resources, and add them programmatically instead. --- base/applications/rapps/appview.cpp | 52 +++++++++++++++++++----------- base/applications/rapps/include/appview.h | 6 ++-- base/applications/rapps/include/resource.h | 3 ++ base/applications/rapps/lang/bg-BG.rc | 4 +++ base/applications/rapps/lang/cs-CZ.rc | 6 +++- base/applications/rapps/lang/de-DE.rc | 6 +++- base/applications/rapps/lang/en-US.rc | 6 +++- base/applications/rapps/lang/es-ES.rc | 6 +++- base/applications/rapps/lang/et-EE.rc | 6 +++- base/applications/rapps/lang/fr-FR.rc | 6 +++- base/applications/rapps/lang/he-IL.rc | 6 +++- base/applications/rapps/lang/hu-HU.rc | 6 +++- base/applications/rapps/lang/id-ID.rc | 6 +++- base/applications/rapps/lang/it-IT.rc | 6 +++- base/applications/rapps/lang/ja-JP.rc | 6 +++- base/applications/rapps/lang/no-NO.rc | 6 +++- base/applications/rapps/lang/pl-PL.rc | 6 +++- base/applications/rapps/lang/pt-BR.rc | 6 +++- base/applications/rapps/lang/pt-PT.rc | 6 +++- base/applications/rapps/lang/ro-RO.rc | 6 +++- base/applications/rapps/lang/ru-RU.rc | 6 +++- base/applications/rapps/lang/sk-SK.rc | 6 +++- base/applications/rapps/lang/sq-AL.rc | 6 +++- base/applications/rapps/lang/sv-SE.rc | 6 +++- base/applications/rapps/lang/tr-TR.rc | 6 +++- base/applications/rapps/lang/uk-UA.rc | 6 +++- base/applications/rapps/lang/zh-CN.rc | 6 +++- base/applications/rapps/lang/zh-HK.rc | 6 +++- base/applications/rapps/lang/zh-TW.rc | 6 +++- 29 files changed, 167 insertions(+), 48 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index e101416c94d..c0f18107c1e 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -313,21 +313,6 @@ CAppRichEdit::InsertTextWithString(UINT StringID, const CStringW &Text, DWORD Te LoadAndInsertText(StringID, Text, TextFlags); } } - -VOID -CAppRichEdit::SetWelcomeText() -{ - CStringW szText; - - szText.LoadStringW(IDS_WELCOME_TITLE); - SetText(szText, CFE_BOLD); - - szText.LoadStringW(IDS_WELCOME_TEXT); - InsertText(szText, 0); - - szText.LoadStringW(IDS_WELCOME_URL); - InsertText(szText, CFM_LINK); -} // **** CAppRichEdit **** int @@ -985,12 +970,41 @@ CAppInfoDisplay::ShowAppInfo(CAppInfo *Info) Info->ShowAppInfo(RichEdit); } -VOID -CAppInfoDisplay::SetWelcomeText() +void +CAppInfoDisplay::SetWelcomeText(bool bAppwiz) { + CStringW szText; + ScrnshotPrev->DisplayEmpty(); ResizeChildren(); - RichEdit->SetWelcomeText(); + + // Display the standard banner in normal mode, or + // the specific "Add/Remove Programs" in APPWIZ-mode. + if (!bAppwiz) + { + szText.LoadStringW(IDS_WELCOME_TITLE); + RichEdit->SetText(szText, CFE_BOLD); + RichEdit->InsertText(L"\n\n", 0); + + szText.LoadStringW(IDS_WELCOME_TEXT); + RichEdit->InsertText(szText, 0); + + szText.LoadStringW(IDS_WELCOME_URL); + RichEdit->InsertText(szText, CFM_LINK); + } + else + { + szText.LoadStringW(IDS_APPWIZ_TITLE); + RichEdit->SetText(szText, CFE_BOLD); + RichEdit->InsertText(L"\n\n", 0); + + szText.LoadStringW(IDS_APPWIZ_TEXT1); + RichEdit->InsertText(szText, 0); + RichEdit->InsertText(L"\n", 0); + + szText.LoadStringW(IDS_APPWIZ_TEXT2); + RichEdit->InsertText(szText, 0); + } } VOID @@ -2006,7 +2020,7 @@ CApplicationView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) return FALSE; } ApplicationViewType = AppType; - m_AppsInfo->SetWelcomeText(); + m_AppsInfo->SetWelcomeText(m_MainWindow->m_bAppwizMode); HMENU hMenu = ::GetMenu(m_hWnd); switch (AppType) diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index c53a6e81954..d457d45c799 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -89,8 +89,6 @@ class CAppRichEdit : public CUiWindow<CRichEdit> LoadAndInsertText(UINT uStringID, DWORD StringFlags); VOID InsertTextWithString(UINT StringID, const CStringW &Text, DWORD TextFlags); - VOID - SetWelcomeText(); }; int @@ -178,8 +176,8 @@ class CAppInfoDisplay : public CUiWindow<CWindowImpl<CAppInfoDisplay>> VOID ShowAppInfo(CAppInfo *Info); - VOID - SetWelcomeText(); + void + SetWelcomeText(bool bAppwiz); VOID OnCommand(WPARAM wParam, LPARAM lParam); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index d40efdbf22f..790a9ae87e1 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -93,6 +93,9 @@ #define IDS_WELCOME_TITLE 102 #define IDS_WELCOME_TEXT 103 #define IDS_WELCOME_URL 104 +#define IDS_APPWIZ_TITLE 105 +#define IDS_APPWIZ_TEXT1 106 +#define IDS_APPWIZ_TEXT2 107 /* Strings */ #define IDS_SEARCH_TEXT 110 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4e81b1fb12a..c69ad32e4b5 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -175,6 +175,10 @@ BEGIN IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства" IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 1828881d347..41d01040fb1 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -173,9 +173,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Správce aplikací" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n" + IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!" IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index debb91aa730..3fedb68171f 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS-Anwendungsmanager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n" + IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!" IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 2d6c4c47073..968360d3b13 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" + IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 5607ab12582..60e047b0f2c 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Administrador de aplicaciones de ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n" + IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS." IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 41afa63d9e9..6af7f201d00 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS'i Rakenduste Haldur" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n" + IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!" IDS_WELCOME_TEXT "Vali vasakult teema, siis vali paremalt rakendusi mida soovid installida või desinstallida.\nReactOS'i veebileht: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index d7f1d27d3ac..0a7baf2bb76 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Gestionnaire d'applications ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n" + IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !" IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Ajout/Suppression de programmes" // "Ajouter/Supprimer des Programmes" + IDS_APPWIZ_TEXT1 "Choisissez ""Applications"" ou ""Mises à jour"" pour voir la liste des programmes ou des mises à jour installés sur votre système." + IDS_APPWIZ_TEXT2 "Pour supprimer un programme, ou modifier ses composants installés, sélectionnez-le dans la liste et cliquez sur ""Désinstaller"" ou ""Modifier""." END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index db9ce84b5e9..0090533fe18 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -177,9 +177,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "מנהל היישומים של ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n" + IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!" IDS_WELCOME_TEXT "בחר קטגוריה בצד שמאל, לאחר מכן בחר יישום להתקנה או להסרה.\nהאתר של ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index 639cf42a0ad..5fa6c502db5 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Alkalmazáskezelő" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!\n\n" + IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!" IDS_WELCOME_TEXT "Bal oldalon válasszon kategóriát, majd válasszon egy telepíteni vagy eltávolítani kívánt alkalmazást.\nReactOS weboldal: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index f6835f3d3a2..92942ec2325 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Manajer Aplikasi ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n" + IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!" IDS_WELCOME_TEXT "pilih kategori di sisi kiri, kemudian pilih aplikasi untuk dipasang atau dibongkar.\nSitus Web ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 5c48de6b6e1..a80578d2dcc 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Gestione applicazioni" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Benvenuto!\n\n" + IDS_WELCOME_TITLE "Benvenuto!" IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 9464fb4b159..c17ffd03f8d 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS アプリマネージャ" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "ReactOS アプリマネージャへようこそ!\n\n" + IDS_WELCOME_TITLE "ReactOS アプリマネージャへようこそ!" IDS_WELCOME_TEXT "左側からカテゴリを選択し、インストールまたはアンインストールするアプリを選んでください。\nReactOS ウェブサイト: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 2a9ef665c69..bb2393102e6 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS programbehandler" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n" + IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!" IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 335dc0d42e1..d4ff8f18ad4 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Menedżer aplikacji ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n" + IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!" IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by ją zainstalować lub odinstalować.\nStrona projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 6e4a4b5d3f5..02be0fcd5f0 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Central de Aplicativos ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n" + IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 570a6b32d71..aea5ccc3491 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Central de aplicações ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!\n\n" + IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, de seguida escolha uma aplicação para instalar ou desinstalar.\nWeb Site ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index db22084ea2e..48d63040990 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Managerul de aplicații ReactOS" IDS_APP_AUTHORS "Marcă înregistrată 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!\n\n" + IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!" IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 4a5eae46484..bf4919daf42 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -177,9 +177,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Менеджер приложений ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n" + IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!" IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index b6bcd5f8888..79d38ea468a 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Manažér aplikácií systému ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" + IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!" IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 0a12626f575..9d40291659b 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n" + IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!" IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 8c0ac57527b..92e142cf9bc 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS programhanterare" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n" + IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!" IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 636fd683b09..e6fbdc062b2 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Uygulama Yöneticisi" IDS_APP_AUTHORS "Telif Hakkı: 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n" + IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz." IDS_WELCOME_TEXT "Solda bir kategori seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un İnternet sitesi: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 9da6dc8d859..9836138bcca 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Менеджер додатків ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n" + IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!" IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 5926483f471..b2ba23b0853 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -176,9 +176,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程序管理器" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n" + IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！" IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站：" IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 6ef6abbfab9..a1959f2d605 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -173,9 +173,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" + IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！" IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 94aec57090d..2c8badd2915 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -173,9 +173,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" + IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！" IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE

3 months, 3 weeks

[reactos] 08/09: [RAPPS] Don't display the "Selected" apps count in APPWIZ mode (#6655)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aecdd0840b61fa39d108… commit 5aecdd0840b61fa39d108c9e24ed74b4fbe4df74 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 15 21:12:36 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:50 2024 +0200 [RAPPS] Don't display the "Selected" apps count in APPWIZ mode (#6655) The count makes sense only in normal mode, where we can select many apps for bulk-install. Split the IDS_APPS_COUNT string into it and IDS_APPS_SELECT_COUNT, and append the number of selected apps only when we aren't in APPWIZ mode. --- base/applications/rapps/gui.cpp | 10 +++++++++- base/applications/rapps/include/resource.h | 2 +- base/applications/rapps/lang/bg-BG.rc | 3 ++- base/applications/rapps/lang/cs-CZ.rc | 3 ++- base/applications/rapps/lang/de-DE.rc | 3 ++- base/applications/rapps/lang/en-US.rc | 3 ++- base/applications/rapps/lang/es-ES.rc | 3 ++- base/applications/rapps/lang/et-EE.rc | 3 ++- base/applications/rapps/lang/fr-FR.rc | 5 +++-- base/applications/rapps/lang/he-IL.rc | 3 ++- base/applications/rapps/lang/hu-HU.rc | 3 ++- base/applications/rapps/lang/id-ID.rc | 3 ++- base/applications/rapps/lang/it-IT.rc | 3 ++- base/applications/rapps/lang/ja-JP.rc | 3 ++- base/applications/rapps/lang/no-NO.rc | 3 ++- base/applications/rapps/lang/pl-PL.rc | 3 ++- base/applications/rapps/lang/pt-BR.rc | 3 ++- base/applications/rapps/lang/pt-PT.rc | 3 ++- base/applications/rapps/lang/ro-RO.rc | 3 ++- base/applications/rapps/lang/ru-RU.rc | 3 ++- base/applications/rapps/lang/sk-SK.rc | 3 ++- base/applications/rapps/lang/sq-AL.rc | 3 ++- base/applications/rapps/lang/sv-SE.rc | 3 ++- base/applications/rapps/lang/tr-TR.rc | 3 ++- base/applications/rapps/lang/uk-UA.rc | 3 ++- base/applications/rapps/lang/zh-CN.rc | 3 ++- base/applications/rapps/lang/zh-HK.rc | 3 ++- base/applications/rapps/lang/zh-TW.rc | 3 ++- 28 files changed, 63 insertions(+), 29 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 1b7050583bd..3ce58a00553 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -608,8 +608,16 @@ CMainWindow::UpdateStatusBarText() if (m_StatusBar) { CStringW szBuffer; + szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount()); + + // Append the number of selected apps if not in APPWIZ-mode. + if (!m_bAppwizMode) + { + CStringW szBuffer2; + szBuffer2.Format(IDS_APPS_SELECT_COUNT, m_Selected.GetCount()); + szBuffer += szBuffer2; + } - szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount(), m_Selected.GetCount()); m_StatusBar->SetText(szBuffer); } } diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index b18b1a8f13a..d40efdbf22f 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -97,7 +97,7 @@ /* Strings */ #define IDS_SEARCH_TEXT 110 #define IDS_APPS_COUNT 111 -// 112 - Reserved +#define IDS_APPS_SELECT_COUNT 112 #define IDS_INSTALLED 113 #define IDS_AVAILABLEFORINST 114 #define IDS_UPDATES 115 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 64188ba9a0c..4e81b1fb12a 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Търсене…" - IDS_APPS_COUNT "Брой приложения: %d; Selected: %d" + IDS_APPS_COUNT "Брой приложения: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Сложено" IDS_AVAILABLEFORINST "Налично за слагане" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index a2052037e88..1828881d347 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -181,7 +181,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Hledat…" - IDS_APPS_COUNT "Počet aplikací: %d; Vybráno: %d" + IDS_APPS_COUNT "Počet aplikací: %d" + IDS_APPS_SELECT_COUNT "; Vybráno: %d" IDS_INSTALLED "Nainstalováno" IDS_AVAILABLEFORINST "Lze instalovat" IDS_UPDATES "Aktualizace" diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index ecdb14d10bf..debb91aa730 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Suche…" - IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d" + IDS_APPS_COUNT "Anzahl der Anwendungen: %d" + IDS_APPS_SELECT_COUNT "; ausgewählt: %d" IDS_INSTALLED "Installiert" IDS_AVAILABLEFORINST "Zur Installation verfügbar" IDS_UPDATES "Aktualisierungen" diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 3771af9f8c3..2d6c4c47073 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Search…" - IDS_APPS_COUNT "Applications count: %d; Selected: %d" + IDS_APPS_COUNT "Applications count: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Installed" IDS_AVAILABLEFORINST "Available for installation" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 45155731f41..5607ab12582 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Buscar…" - IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d" + IDS_APPS_COUNT "Nº de aplicaciones: %d" + IDS_APPS_SELECT_COUNT "; Selecionadas: %d" IDS_INSTALLED "Instaladas" IDS_AVAILABLEFORINST "Disponible para su instalación" IDS_UPDATES "Actualizaciones" diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index b5b13e3f2e8..41afa63d9e9 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Otsi…" - IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d" + IDS_APPS_COUNT "Rakenduste arv: %d" + IDS_APPS_SELECT_COUNT "; Valitud: %d" IDS_INSTALLED "Installitud" IDS_AVAILABLEFORINST "Installimiseks saadaval" IDS_UPDATES "Uuendused" diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 0689bc8a2e8..d7f1d27d3ac 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Chercher…" - IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d" + IDS_APPS_COUNT "Nombre d'applications : %d" + IDS_APPS_SELECT_COUNT " ; Sélectionnées : %d" IDS_INSTALLED "Installé" IDS_AVAILABLEFORINST "Disponible pour installation" IDS_UPDATES "Mises à jour" @@ -262,5 +263,5 @@ END STRINGTABLE BEGIN - IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?" + IDS_INSTGEN_CONFIRMUNINST "Êtes-vous sûr de vouloir désinstaller %s ?" END diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 7484f2851dd..db9ce84b5e9 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -185,7 +185,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "חיפוש…" - IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d" + IDS_APPS_COUNT "ספירת יישומים: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "מותקן" IDS_AVAILABLEFORINST "זמין להתקנה" IDS_UPDATES "עדכונים" diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index c363849ba5c..639cf42a0ad 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Keresés…" - IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d" + IDS_APPS_COUNT "Alkalmazások száma: %d" + IDS_APPS_SELECT_COUNT "; Kijelölve: %d" IDS_INSTALLED "Telepített" IDS_AVAILABLEFORINST "Telepíthető alkalmazások" IDS_UPDATES "Frissítések" diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 40c76f29bc5..f6835f3d3a2 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Cari…" - IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d" + IDS_APPS_COUNT "Jumlah aplikasi: %d" + IDS_APPS_SELECT_COUNT "; Terpilih: %d" IDS_INSTALLED "Terpasang" IDS_AVAILABLEFORINST "Tersedia untuk pemasangan" IDS_UPDATES "Pembaruan" diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 3a070dddeb6..5c48de6b6e1 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Cerca…" - IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d" + IDS_APPS_COUNT "Numero applicazioni: %d" + IDS_APPS_SELECT_COUNT "; Selezionate: %d" IDS_INSTALLED "Installato" IDS_AVAILABLEFORINST "Disponibile per l'installazione" IDS_UPDATES "Aggiornamenti" diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 9f27fe1e83f..9464fb4b159 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "検索..." - IDS_APPS_COUNT "アプリ数: %d; Selected: %d" + IDS_APPS_COUNT "アプリ数: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "インストール済み" IDS_AVAILABLEFORINST "インストール可能" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index cd0c697303e..2a9ef665c69 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Søk…" - IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d" + IDS_APPS_COUNT "Program oppsummering: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Installert" IDS_AVAILABLEFORINST "Tilgjengelig for installasjon" IDS_UPDATES "Oppdateringer" diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index a94ca836fa6..335dc0d42e1 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Szukaj…" - IDS_APPS_COUNT "Liczba aplikacji: %d; Wybranych: %d" + IDS_APPS_COUNT "Liczba aplikacji: %d" + IDS_APPS_SELECT_COUNT "; Wybranych: %d" IDS_INSTALLED "Zainstalowane" IDS_AVAILABLEFORINST "Dostępne" IDS_UPDATES "Uaktualnienia" diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 5faeecb25ac..6e4a4b5d3f5 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Procurar…" - IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d" + IDS_APPS_COUNT "Número de aplicativos: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Atualizações" diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 838404bd603..570a6b32d71 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Procurar…" - IDS_APPS_COUNT "Número de aplicações: %d; Seleccionadas: %d" + IDS_APPS_COUNT "Número de aplicações: %d" + IDS_APPS_SELECT_COUNT "; Seleccionadas: %d" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Actualizações" diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index e3b82afc6ac..db22084ea2e 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Căutare…" - IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" + IDS_APPS_COUNT "Numărul de programe: %d" + IDS_APPS_SELECT_COUNT "; Selectate: %d" IDS_INSTALLED "Instalate" IDS_AVAILABLEFORINST "Disponibile pentru instalare" IDS_UPDATES "Actualizări" diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index ab531a57c47..4a5eae46484 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -185,7 +185,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Поиск…" - IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d" + IDS_APPS_COUNT "Количество приложений: %d" + IDS_APPS_SELECT_COUNT "; Выбрано: %d" IDS_INSTALLED "Установленные" IDS_AVAILABLEFORINST "Доступно для установки" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index bd85218ce8f..b6bcd5f8888 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Hľadať…" - IDS_APPS_COUNT "Počet programov: %d; Selected: %d" + IDS_APPS_COUNT "Počet programov: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Nainštalované" IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie" IDS_UPDATES "Aktualizácie" diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 4ffb5c7b8d1..0a12626f575 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Kerko…" - IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d" + IDS_APPS_COUNT "Numrimi Aplicacioneve: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Instaluar" IDS_AVAILABLEFORINST "Te vlefshem per instalim" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index ced598e23f7..8c0ac57527b 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Sök…" - IDS_APPS_COUNT "Programantal: %d; Selected: %d" + IDS_APPS_COUNT "Programantal: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Installerat" IDS_AVAILABLEFORINST "Tillgängliga for installation" IDS_UPDATES "Uppdateringar" diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index ddd0b4d9775..636fd683b09 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Ara…" - IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d" + IDS_APPS_COUNT "Uygulama Sayısı: %d" + IDS_APPS_SELECT_COUNT "; Seçili: %d" IDS_INSTALLED "Kurulanlar" IDS_AVAILABLEFORINST "Kurulabilir Uygulamalar" IDS_UPDATES "Güncelleştirmeler" diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index d43a7e746e9..9da6dc8d859 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Пошук…" - IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d" + IDS_APPS_COUNT "Kількість додатків: %d" + IDS_APPS_SELECT_COUNT "; Обрано: %d" IDS_INSTALLED "Встановлені" IDS_AVAILABLEFORINST "Доступні для встановлення" IDS_UPDATES "Оновлення" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index e2c09b22533..5926483f471 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -184,7 +184,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "搜索…" - IDS_APPS_COUNT "程序数量：%d；已选：%d" + IDS_APPS_COUNT "程序数量：%d" + IDS_APPS_SELECT_COUNT "；已选：%d" IDS_INSTALLED "已安装" IDS_AVAILABLEFORINST "可安装" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 44e44955f06..6ef6abbfab9 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -181,7 +181,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "搜尋..." - IDS_APPS_COUNT "程式數量：%d；已選：%d" + IDS_APPS_COUNT "程式數量：%d" + IDS_APPS_SELECT_COUNT "；已選：%d" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 8a4f7277802..94aec57090d 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -181,7 +181,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "搜尋..." - IDS_APPS_COUNT "程式數量：%d；已選：%d" + IDS_APPS_COUNT "程式數量：%d" + IDS_APPS_SELECT_COUNT "；已選：%d" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新"

3 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs