ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2023
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
26 participants
189 discussions
Start a n
N
ew thread
[reactos] 01/01: [RAPPS] Main toolbar: Tooltip strings refactoring (#5007)
by Thamatip Chitpong
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec974d8a817528616286c…
commit ec974d8a817528616286c91ef839dedaf18b2478 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Sat Jul 8 06:02:10 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 8 02:02:10 2023 +0300 [RAPPS] Main toolbar: Tooltip strings refactoring (#5007) - Use ATL CString - Remove duplicated tooltip strings --- base/applications/rapps/appview.cpp | 40 ++++++++-------- base/applications/rapps/include/appview.h | 7 --- base/applications/rapps/include/resource.h | 75 ++++++++++++++---------------- base/applications/rapps/lang/bg-BG.rc | 5 +- base/applications/rapps/lang/cs-CZ.rc | 5 +- base/applications/rapps/lang/de-DE.rc | 5 +- base/applications/rapps/lang/en-US.rc | 5 +- base/applications/rapps/lang/es-ES.rc | 5 +- base/applications/rapps/lang/et-EE.rc | 5 +- base/applications/rapps/lang/fr-FR.rc | 5 +- base/applications/rapps/lang/he-IL.rc | 5 +- base/applications/rapps/lang/hu-HU.rc | 5 +- base/applications/rapps/lang/id-ID.rc | 5 +- base/applications/rapps/lang/it-IT.rc | 5 +- base/applications/rapps/lang/ja-JP.rc | 5 +- base/applications/rapps/lang/no-NO.rc | 5 +- base/applications/rapps/lang/pl-PL.rc | 5 +- base/applications/rapps/lang/pt-BR.rc | 5 +- base/applications/rapps/lang/pt-PT.rc | 5 +- base/applications/rapps/lang/ro-RO.rc | 5 +- base/applications/rapps/lang/ru-RU.rc | 5 +- base/applications/rapps/lang/sk-SK.rc | 5 +- base/applications/rapps/lang/sq-AL.rc | 5 +- base/applications/rapps/lang/sv-SE.rc | 5 +- base/applications/rapps/lang/tr-TR.rc | 5 +- base/applications/rapps/lang/uk-UA.rc | 5 +- base/applications/rapps/lang/zh-CN.rc | 5 +- base/applications/rapps/lang/zh-HK.rc | 5 +- base/applications/rapps/lang/zh-TW.rc | 5 +- 29 files changed, 83 insertions(+), 169 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 3157f7634e2..cfe2683ec13 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -56,12 +56,6 @@ CMainToolbar::InitImageList() CMainToolbar::CMainToolbar() : m_iToolbarHeight(24), m_dButtonsWidthMax(0) { - memset(szInstallBtn, 0, sizeof(szInstallBtn)); - memset(szUninstallBtn, 0, sizeof(szUninstallBtn)); - memset(szModifyBtn, 0, sizeof(szModifyBtn)); - memset(szSelectAll, 0, sizeof(szSelectAll)); - memset(szRefreshBtn, 0, sizeof(szRefreshBtn)); - memset(szUpdateDbBtn, 0, sizeof(szUpdateDbBtn)); } VOID @@ -104,23 +98,31 @@ CMainToolbar::OnGetDispInfo(LPTOOLTIPTEXT lpttt) HWND CMainToolbar::Create(HWND hwndParent) { + CStringW szInstallBtn; + CStringW szUninstallBtn; + CStringW szModifyBtn; + CStringW szSelectAllBtn; + CStringW szRefreshBtn; + CStringW szUpdateDbBtn; + + /* Load tooltip strings */ + szInstallBtn.LoadStringW(IDS_TOOLTIP_INSTALL); + szUninstallBtn.LoadStringW(IDS_TOOLTIP_UNINSTALL); + szModifyBtn.LoadStringW(IDS_TOOLTIP_MODIFY); + szSelectAllBtn.LoadStringW(IDS_TOOLTIP_SELECT_ALL); + szRefreshBtn.LoadStringW(IDS_TOOLTIP_REFRESH); + szUpdateDbBtn.LoadStringW(IDS_TOOLTIP_UPDATE_DB); + /* Create buttons */ TBBUTTON Buttons[] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szInstallBtn}, - {1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szUninstallBtn}, - {2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szModifyBtn}, - {3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szSelectAll}, + {0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szInstallBtn.GetString()}, + {1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szUninstallBtn.GetString()}, + {2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szModifyBtn.GetString()}, + {3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szSelectAllBtn.GetString()}, {-1, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, - {4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szRefreshBtn}, - {5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szUpdateDbBtn}}; - - LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn)); - LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn)); - LoadStringW(hInst, IDS_MODIFY, szModifyBtn, _countof(szModifyBtn)); - LoadStringW(hInst, IDS_SELECT_ALL, szSelectAll, _countof(szSelectAll)); - LoadStringW(hInst, IDS_TOOLTIP_REFRESH, szRefreshBtn, _countof(szRefreshBtn)); - LoadStringW(hInst, IDS_TOOLTIP_UPDATE_DB, szUpdateDbBtn, _countof(szUpdateDbBtn)); + {4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szRefreshBtn.GetString()}, + {5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szUpdateDbBtn.GetString()}}; m_hWnd = CreateWindowExW( 0, TOOLBARCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST, 0, 0, 0, 0, diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index b563f2966e2..919ff982ce7 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -275,13 +275,6 @@ class CMainToolbar : public CUiWindow<CToolbar<>> const INT m_iToolbarHeight; DWORD m_dButtonsWidthMax; - WCHAR szInstallBtn[MAX_STR_LEN]; - WCHAR szUninstallBtn[MAX_STR_LEN]; - WCHAR szModifyBtn[MAX_STR_LEN]; - WCHAR szSelectAll[MAX_STR_LEN]; - WCHAR szRefreshBtn[MAX_STR_LEN]; - WCHAR szUpdateDbBtn[MAX_STR_LEN]; - VOID AddImageToImageList(HIMAGELIST hImageList, UINT ImageIndex); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index c8a4e536644..f9fa07a2df3 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -91,50 +91,47 @@ /* Strings */ #define IDS_APPTITLE 100 #define IDS_SEARCH_TEXT 101 -#define IDS_INSTALL 102 -#define IDS_UNINSTALL 103 -#define IDS_MODIFY 104 -#define IDS_APPS_COUNT 105 -#define IDS_WELCOME_TITLE 106 -#define IDS_WELCOME_TEXT 107 -#define IDS_WELCOME_URL 108 -#define IDS_INSTALLED 109 -#define IDS_AVAILABLEFORINST 110 -#define IDS_UPDATES 111 -#define IDS_APPLICATIONS 112 -#define IDS_CHOOSE_FOLDER_TEXT 113 -#define IDS_CHOOSE_FOLDER_ERROR 114 -#define IDS_URL_INVALID 115 -#define IDS_APP_REG_REMOVE 116 -#define IDS_INFORMATION 117 -#define IDS_UNABLE_TO_REMOVE 118 -#define IDS_UNABLE_TO_DOWNLOAD 119 -#define IDS_UNABLE_TO_DOWNLOAD2 120 -#define IDS_UNABLE_TO_QUERY_CERT 121 -#define IDS_INTEG_CHECK_TITLE 122 -#define IDS_INTEG_CHECK_FAIL 123 -#define IDS_INTERRUPTED_DOWNLOAD 124 -#define IDS_UNABLE_TO_WRITE 125 -#define IDS_SELECT_ALL 126 -#define IDS_INSTALL_SELECTED 127 -#define IDS_UNABLE_TO_INSTALL 128 -#define IDS_SELECTEDFORINST 129 -#define IDS_MISMATCH_CERT_INFO 130 -#define IDS_UNABLE_PATH 131 -#define IDS_APP_AUTHORS 132 -#define IDS_APP_DISPLAY_DETAILS 133 -#define IDS_APP_DISPLAY_LIST 134 -#define IDS_APP_DISPLAY_TILE 135 -#define IDS_NO_SEARCH_RESULTS 136 +#define IDS_APPS_COUNT 102 +#define IDS_WELCOME_TITLE 103 +#define IDS_WELCOME_TEXT 104 +#define IDS_WELCOME_URL 105 +#define IDS_INSTALLED 106 +#define IDS_AVAILABLEFORINST 107 +#define IDS_UPDATES 108 +#define IDS_APPLICATIONS 109 +#define IDS_CHOOSE_FOLDER_TEXT 110 +#define IDS_CHOOSE_FOLDER_ERROR 111 +#define IDS_URL_INVALID 112 +#define IDS_APP_REG_REMOVE 113 +#define IDS_INFORMATION 114 +#define IDS_UNABLE_TO_REMOVE 115 +#define IDS_UNABLE_TO_DOWNLOAD 116 +#define IDS_UNABLE_TO_DOWNLOAD2 117 +#define IDS_UNABLE_TO_QUERY_CERT 118 +#define IDS_INTEG_CHECK_TITLE 119 +#define IDS_INTEG_CHECK_FAIL 120 +#define IDS_INTERRUPTED_DOWNLOAD 121 +#define IDS_UNABLE_TO_WRITE 122 +#define IDS_INSTALL_SELECTED 123 +#define IDS_UNABLE_TO_INSTALL 124 +#define IDS_SELECTEDFORINST 125 +#define IDS_MISMATCH_CERT_INFO 126 +#define IDS_UNABLE_PATH 127 +#define IDS_APP_AUTHORS 128 +#define IDS_APP_DISPLAY_DETAILS 129 +#define IDS_APP_DISPLAY_LIST 130 +#define IDS_APP_DISPLAY_TILE 131 +#define IDS_NO_SEARCH_RESULTS 132 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 #define IDS_TOOLTIP_UNINSTALL 201 #define IDS_TOOLTIP_MODIFY 202 -#define IDS_TOOLTIP_SETTINGS 203 -#define IDS_TOOLTIP_REFRESH 204 -#define IDS_TOOLTIP_EXIT 205 -#define IDS_TOOLTIP_UPDATE_DB 206 +#define IDS_TOOLTIP_SELECT_ALL 203 +#define IDS_TOOLTIP_SETTINGS 204 +#define IDS_TOOLTIP_REFRESH 205 +#define IDS_TOOLTIP_EXIT 206 +#define IDS_TOOLTIP_UPDATE_DB 207 /* Columns info */ #define IDS_APP_NAME 250 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4a33f85238a..b17281ab2c6 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Слагане" IDS_TOOLTIP_UNINSTALL "Махане" IDS_TOOLTIP_MODIFY "Промяна" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Настройки" IDS_TOOLTIP_REFRESH "Опресняване" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "Управителят за приложения на РеактОС" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Търсене" - IDS_INSTALL "Слагане" - IDS_UNINSTALL "Махане" - IDS_MODIFY "Промяна" IDS_APPS_COUNT "Брой приложения: %d; Selected: %d" IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства" IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 8c7bbcdc390..7cac512ee8b 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalovat" IDS_TOOLTIP_UNINSTALL "Odinstalovat" IDS_TOOLTIP_MODIFY "Změnit" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Nastavení" IDS_TOOLTIP_REFRESH "Obnovit" IDS_TOOLTIP_UPDATE_DB "Aktualizovat databázi" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "ReactOS Správce aplikací" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Hledat…" - IDS_INSTALL "Instalovat" - IDS_UNINSTALL "Odinstalovat" - IDS_MODIFY "Změnit" IDS_APPS_COUNT "Počet aplikací: %d; Selected: %d" IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n" IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index f07f2bc90e9..6dfd989fcee 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Installieren" IDS_TOOLTIP_UNINSTALL "Deinstallieren" IDS_TOOLTIP_MODIFY "Ändern" + IDS_TOOLTIP_SELECT_ALL "Alle/Keine" IDS_TOOLTIP_SETTINGS "Einstellungen" IDS_TOOLTIP_REFRESH "Aktualisieren" IDS_TOOLTIP_UPDATE_DB "Datenbank aktualisieren" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "ReactOS-Anwendungsmanager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Suche…" - IDS_INSTALL "Installieren" - IDS_UNINSTALL "Deinstallieren" - IDS_MODIFY "Ändern" IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d" IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n" IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Das Paket hat die Integritätsprüfung nicht bestanden. Mögliche Ursachen sind Übertragungsfehler, Datenbankfehler oder Manipulation durch einen Angreifer. Sie sollten die Software nicht ausführen." IDS_INTERRUPTED_DOWNLOAD "Übertragung unterbrochen. Prüfen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_WRITE "Schreibfehler. Prüfen Sie die Kapazität des Datenträgers!" - IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" IDS_SELECTEDFORINST "Zur Installation ausgewählt" IDS_MISMATCH_CERT_INFO "Das verwendete Zertifikat ist unbekannt:\nTitel: %s\nAussteller: %s\nMöchten Sie trotzdem fortfahren?" diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index aa7f0dfbc73..8b00e4a6462 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -119,6 +119,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Install" IDS_TOOLTIP_UNINSTALL "Uninstall" IDS_TOOLTIP_MODIFY "Modify" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Settings" IDS_TOOLTIP_REFRESH "Refresh" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -191,9 +192,6 @@ BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Search…" - IDS_INSTALL "Install" - IDS_UNINSTALL "Uninstall" - IDS_MODIFY "Modify" IDS_APPS_COUNT "Applications count: %d; Selected: %d" IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " @@ -216,7 +214,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index b4fad1177c5..c748dea0c06 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -118,6 +118,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalar" IDS_TOOLTIP_UNINSTALL "Desinstalar" IDS_TOOLTIP_MODIFY "Modificar" + IDS_TOOLTIP_SELECT_ALL "Selecccionar/Deseleccionar todo" IDS_TOOLTIP_SETTINGS "Ajustes" IDS_TOOLTIP_REFRESH "Recargar" IDS_TOOLTIP_UPDATE_DB "Actualizar el listado desde Internet" @@ -190,9 +191,6 @@ BEGIN IDS_APPTITLE "Administrador de aplicaciones de ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Buscar…" - IDS_INSTALL "Instalar" - IDS_UNINSTALL "Desinstalar" - IDS_MODIFY "Modificar" IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d" IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n" 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: " @@ -215,7 +213,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobación de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Compruebe la conexión a Internet." IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." - IDS_SELECT_ALL "Selecccionar/Deseleccionar todo" IDS_INSTALL_SELECTED "Instalar selección" IDS_SELECTEDFORINST "Seleccionados para instalar" IDS_MISMATCH_CERT_INFO "El certificado que usa es desconocido:\nSujeto: %s\nEmisor: %s\n¿Quiere continuar a pesar de ello?" diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index a5fbebd1b07..9f0ba295c1f 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Installi" IDS_TOOLTIP_UNINSTALL "Desinstalli" IDS_TOOLTIP_MODIFY "Muuda" + IDS_TOOLTIP_SELECT_ALL "Vali/Tühista kõik" IDS_TOOLTIP_SETTINGS "Sätted" IDS_TOOLTIP_REFRESH "Värskenda" IDS_TOOLTIP_UPDATE_DB "Uuenda andmebaasi" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "ReactOS'i Rakenduste Haldur" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Otsi…" - IDS_INSTALL "Installi" - IDS_UNINSTALL "Desinstalli" - IDS_MODIFY "Muuda" IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d" IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n" IDS_WELCOME_TEXT "Vali vasakult teema, siis vali paremalt rakendusi mida soovid installida või desinstallida.\nReactOS'i veebileht: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Pakend ei läbinud tervikluse testi, pakend võib olla vigane või omavoliliselt muudetud olla keset allalaadimist. Tarkvara kasutamist ei ole soovitatud." IDS_INTERRUPTED_DOWNLOAD "Allalaadimist katkestati. Kontrolli interneti ühendust." IDS_UNABLE_TO_WRITE "Kettale kirjutamine ebaõnnetus. Ketas võib täis olla." - IDS_SELECT_ALL "Vali/Tühista kõik" IDS_INSTALL_SELECTED "Installi valitud" IDS_SELECTEDFORINST "Installimiseks valitud" IDS_MISMATCH_CERT_INFO "Kasutatud sertifikaat on tundmatu:\nSubject: %s\nIssuer: %s\nKas soovid siiski jätkata?" diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 6ac994cd10b..60187b1c2ef 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Installer" IDS_TOOLTIP_UNINSTALL "Désinstaller" IDS_TOOLTIP_MODIFY "Modifier" + IDS_TOOLTIP_SELECT_ALL "Sélectionner/Désélectionner tout" IDS_TOOLTIP_SETTINGS "Configuration" IDS_TOOLTIP_REFRESH "Rafraîchir" IDS_TOOLTIP_UPDATE_DB "Mettre à jour la base" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "Gestionnaire d'applications ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Chercher…" - IDS_INSTALL "Installer" - IDS_UNINSTALL "Désinstaller" - IDS_MODIFY "Modifier" IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d" IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n" IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Le contrôle d'intégrité du paquet a échoué, il se peut qu'il ait été corrompu ou altéré au cours du téléchargement. L'exécution du programme n'est pas recommandée." IDS_INTERRUPTED_DOWNLOAD "Le téléchargement a été interrompu. Vérifiez votre connexion à Internet." IDS_UNABLE_TO_WRITE "Impossible d'écrire sur le disque. Votre disque pourrait être plein." - IDS_SELECT_ALL "Sélectionner/Désélectionner tout" IDS_INSTALL_SELECTED "Installer la sélection" IDS_SELECTEDFORINST "Sélectionnées pour installation" IDS_MISMATCH_CERT_INFO "Certificat inconnu:\nSujet: %s\nEmetteur: %s\nVoulez-vous continuer ?" diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 3557ca23bb2..dda4f59930d 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -121,6 +121,7 @@ BEGIN IDS_TOOLTIP_INSTALL "התקנה" IDS_TOOLTIP_UNINSTALL "הסרה" IDS_TOOLTIP_MODIFY "שינוי" + IDS_TOOLTIP_SELECT_ALL "בחר הכול/בטל בחירת הכול" IDS_TOOLTIP_SETTINGS "הגדרות" IDS_TOOLTIP_REFRESH "רענון" IDS_TOOLTIP_UPDATE_DB "עדכון מסד נתונים" @@ -193,9 +194,6 @@ BEGIN IDS_APPTITLE "מנהל היישומים של ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "חיפוש…" - IDS_INSTALL "התקנה" - IDS_UNINSTALL "הסרה" - IDS_MODIFY "שינוי" IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d" IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n" IDS_WELCOME_TEXT "בחר קטגוריה בצד שמאל, לאחר מכן בחר יישום להתקנה או להסרה.\nהאתר של ReactOS: " @@ -218,7 +216,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "בחר הכול/בטל בחירת הכול" IDS_INSTALL_SELECTED "התקן נבחרים" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index d87fd86a067..3b6b60c96eb 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Telepítés" IDS_TOOLTIP_UNINSTALL "Eltávolítás" IDS_TOOLTIP_MODIFY "Módosítás" + IDS_TOOLTIP_SELECT_ALL "Összes kijelölése/kijelölés megszüntetése" IDS_TOOLTIP_SETTINGS "Beállítások" IDS_TOOLTIP_REFRESH "Frissítés" IDS_TOOLTIP_UPDATE_DB "Adatbázis frissítése" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "ReactOS Alkalmazáskezelő" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Keresés…" - IDS_INSTALL "Telepítés" - IDS_UNINSTALL "Eltávolítás" - IDS_MODIFY "Módosítás" IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d" IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!\n\n" 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: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "A csomag nem ment át az épség-ellenőrzésen, lehet hogy megsérült a letöltés közben, vagy megváltoztatták. A program futtatása nem ajánlott." IDS_INTERRUPTED_DOWNLOAD "Megszakadt a letöltés. Ellenőrizze az internet kapcsolatot." IDS_UNABLE_TO_WRITE "Nem lehet írni a lemezre. Lehet hogy megtelt." - IDS_SELECT_ALL "Összes kijelölése/kijelölés megszüntetése" IDS_INSTALL_SELECTED "Kijelöltek telepítése" IDS_SELECTEDFORINST "Telepítésre kijelölve" IDS_MISMATCH_CERT_INFO "A használt tanúsítvány ismeretlen:\nTárgy: %s\nKibocsátó: %s\nBiztosan folytatja?" diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index dc0f7a79b00..639c5fa5ba3 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Pasang" IDS_TOOLTIP_UNINSTALL "Bongkar" IDS_TOOLTIP_MODIFY "Ubah" + IDS_TOOLTIP_SELECT_ALL "Pilih Semua/Balik" IDS_TOOLTIP_SETTINGS "Pengaturan" IDS_TOOLTIP_REFRESH "Segarkan" IDS_TOOLTIP_UPDATE_DB "Perbarui Database" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "Manajer Aplikasi ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Cari…" - IDS_INSTALL "Pasang" - IDS_UNINSTALL "Bongkar" - IDS_MODIFY "Ubah" IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d" IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n" IDS_WELCOME_TEXT "pilih kategori di sisi kiri, kemudian pilih aplikasi untuk dipasang atau dibongkar.\nSitus Web ReactOS: " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Paket tersebut tidak lulus pemeriksaan integritas, bisa jadi rusak atau terkena gangguan ketika mengunduh. Menjalankan perangkat lunak ini tidak disarankan." IDS_INTERRUPTED_DOWNLOAD "Pengunduhan terganggu. Mengecek sambungan ke internet." IDS_UNABLE_TO_WRITE "Tidak bisa menulis ke cakram. Cakram mungkin penuh." - IDS_SELECT_ALL "Pilih Semua/Balik" IDS_INSTALL_SELECTED "Pasang terpilih" IDS_SELECTEDFORINST "dipilih untuk pemasangan" IDS_MISMATCH_CERT_INFO "Sertifikat yang dipakai tidak dikenal:\nSubyek: %s\nIssuer: %s\nYakin ingin lanjut?" diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index f71b45f0569..ef44294f996 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Installa" IDS_TOOLTIP_UNINSTALL "Rimuovi" IDS_TOOLTIP_MODIFY "Modifica" + IDS_TOOLTIP_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_TOOLTIP_SETTINGS "Impostazioni" IDS_TOOLTIP_REFRESH "Aggiorna" IDS_TOOLTIP_UPDATE_DB "Aggiorna Database" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "ReactOS Gestione applicazioni" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Cerca…" - IDS_INSTALL "Installa" - IDS_UNINSTALL "Rimuovi" - IDS_MODIFY "Modifica" IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d" IDS_WELCOME_TITLE "Benvenuto!\n\n" IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata." IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento è stato interrotto. Verificare la connessione a Internet." IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." - IDS_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_INSTALL_SELECTED "Installa le selezionate" IDS_SELECTEDFORINST "Selezionate per l'installazione" IDS_MISMATCH_CERT_INFO "Il certificato in uso è sconosciuto:\nSoggetto: %s\nEmittente: %s\nVuoi continuare comunque?" diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 22a1474c6f2..879be81df75 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "インストール" IDS_TOOLTIP_UNINSTALL "アンインストール" IDS_TOOLTIP_MODIFY "変更" + IDS_TOOLTIP_SELECT_ALL "すべて選択/非選択" IDS_TOOLTIP_SETTINGS "設定" IDS_TOOLTIP_REFRESH "更新" IDS_TOOLTIP_UPDATE_DB "データベースの更新" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "ReactOS アプリ マネージャ" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "検索..." - IDS_INSTALL "インストール" - IDS_UNINSTALL "アンインストール" - IDS_MODIFY "変更" IDS_APPS_COUNT "アプリ数: %d; Selected: %d" IDS_WELCOME_TITLE "ReactOS アプリ マネージャへようこそ!\n\n" IDS_WELCOME_TEXT "左側からカテゴリを選択し、インストールまたはアンインストールするアプリを選んでください。\nReactOS ウェブ サイト: " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "このパッケージは構成チェックに失格しました。おそらく壊れているか、インストール中に破損したと考えられます。このソフトを実行するのはお勧めできません。" IDS_INTERRUPTED_DOWNLOAD "ダウンロードは中断しました。インターネット接続を確認して下さい。" IDS_UNABLE_TO_WRITE "ディスクへの書き込みができません。容量を確認して下さい。" - IDS_SELECT_ALL "すべて選択/非選択" IDS_INSTALL_SELECTED "選択をインストール" IDS_SELECTEDFORINST "インストールを選択済み" IDS_MISMATCH_CERT_INFO "証明書は未知のものです:\nSubject: %s\nIssuer: %s\nそれでも続けますか?" diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index a9dece48282..cb2bdea2119 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Installere" IDS_TOOLTIP_UNINSTALL "Avinstallere" IDS_TOOLTIP_MODIFY "Rediger" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Innstillinger" IDS_TOOLTIP_REFRESH "Oppdatere" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "ReactOS programbehandler" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Søk…" - IDS_INSTALL "Installere" - IDS_UNINSTALL "Avinstallere" - IDS_MODIFY "Endre" IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d" IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n" IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index d2bf8aeb54e..c0807aa6f02 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -118,6 +118,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instaluj" IDS_TOOLTIP_UNINSTALL "Odinstaluj" IDS_TOOLTIP_MODIFY "Modyfikuj" + IDS_TOOLTIP_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_TOOLTIP_SETTINGS "Ustawienia" IDS_TOOLTIP_REFRESH "Odśwież" IDS_TOOLTIP_UPDATE_DB "Aktualizuj bazę programów" @@ -190,9 +191,6 @@ BEGIN IDS_APPTITLE "Menedżer aplikacji ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Szukaj…" - IDS_INSTALL "Instaluj" - IDS_UNINSTALL "Odinstaluj" - IDS_MODIFY "Modyfikuj" IDS_APPS_COUNT "Liczba aplikacji: %d; Wybranych: %d" IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n" IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by ją zainstalować lub odinstalować.\nStrona projektu ReactOS: " @@ -215,7 +213,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Pakiet nie przeszedł kontroli integralności, mógł zostać uszkodzony lub naruszony podczas pobierania. Uruchamianie tego programu nie jest zalecane." IDS_INTERRUPTED_DOWNLOAD "Pobieranie zostało przerwane. Sprawdź połączenie z siecią" IDS_UNABLE_TO_WRITE "Nie można zapisać na dysku. Dysk może być pełny." - IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_INSTALL_SELECTED "Instaluj Zaznaczone" IDS_SELECTEDFORINST "Wybrane do instalacji" IDS_MISMATCH_CERT_INFO "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?" diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 269dd99d9e4..e5bad444569 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalar" IDS_TOOLTIP_UNINSTALL "Desinstalar" IDS_TOOLTIP_MODIFY "Modificar" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Configurações" IDS_TOOLTIP_REFRESH "Atualizar" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "Central de Aplicativos ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Procurar…" - IDS_INSTALL "Instalar" - IDS_UNINSTALL "Desinstalar" - IDS_MODIFY "Modificar" IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d" IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index b10eeab7032..2a4ebd00b5c 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalar" IDS_TOOLTIP_UNINSTALL "Desinstalar" IDS_TOOLTIP_MODIFY "Modificar" + IDS_TOOLTIP_SELECT_ALL "Selec./Deselec. todos" IDS_TOOLTIP_SETTINGS "Definições" IDS_TOOLTIP_REFRESH "Actualizar" IDS_TOOLTIP_UPDATE_DB "Actualizar Base de dados" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "Central de aplicações ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Procurar…" - IDS_INSTALL "Instalar" - IDS_UNINSTALL "Desinstalar" - IDS_MODIFY "Modificar" IDS_APPS_COUNT "Número de aplicações: %d; Seleccionadas: %d" IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!\n\n" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, de seguida escolha uma aplicação para instalar ou desinstalar.\nWeb Site ReactOS: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "O pacote não passou na verificação de integridade, pode ter sido corrompido ou adulterado durante o download. A execução do software não é recomendada." IDS_INTERRUPTED_DOWNLOAD "O download foi interrompido. Verifique a ligação com a Internet." IDS_UNABLE_TO_WRITE "Não é possível gravar no disco. O disco pode estar cheio." - IDS_SELECT_ALL "Selec./Deselec. todos" IDS_INSTALL_SELECTED "Instalar selecção" IDS_SELECTEDFORINST "Seleccionados para instalação" IDS_MISMATCH_CERT_INFO "O certificado usado é desconhecido:\nAssunto: %s\nEmissor: %s\nDeseja continuar mesmo assim?" diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index bb8a6972954..38b7ee5da75 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -117,6 +117,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalează" IDS_TOOLTIP_UNINSTALL "Dezinstalează" IDS_TOOLTIP_MODIFY "Modifică" + IDS_TOOLTIP_SELECT_ALL "Selectează/Deselectează Toate" IDS_TOOLTIP_SETTINGS "Preferințe" IDS_TOOLTIP_REFRESH "Împrospătează" IDS_TOOLTIP_UPDATE_DB "Actualizează baza de date" @@ -189,9 +190,6 @@ BEGIN IDS_APPTITLE "Gestionar de programe" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Căutare…" - IDS_INSTALL "Instalează" - IDS_UNINSTALL "Dezinstalează" - IDS_MODIFY "Modifică" IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n" 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: " @@ -214,7 +212,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet." IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate." - IDS_SELECT_ALL "Selectează/Deselectează Toate" IDS_INSTALL_SELECTED "Instalează selecționate" IDS_SELECTEDFORINST "Selectate pentru instalare" IDS_MISMATCH_CERT_INFO "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?" diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 97d8b419148..2d8aceb1c86 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -109,6 +109,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Установить" IDS_TOOLTIP_UNINSTALL "Удалить" IDS_TOOLTIP_MODIFY "Изменить" + IDS_TOOLTIP_SELECT_ALL "Выбрать все" IDS_TOOLTIP_SETTINGS "Параметры" IDS_TOOLTIP_REFRESH "Обновить" IDS_TOOLTIP_UPDATE_DB "Обновить базу данных" @@ -181,9 +182,6 @@ BEGIN IDS_APPTITLE "Менеджер приложений ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Поиск…" - IDS_INSTALL "Установить" - IDS_UNINSTALL "Удалить" - IDS_MODIFY "Изменить" IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d" IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n" IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: " @@ -206,7 +204,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется." IDS_INTERRUPTED_DOWNLOAD "Загрузка была прервана. Проверьте подключение к сети Интернет." IDS_UNABLE_TO_WRITE "Не удалось записать данные на диск. Возможно, недостаточно свободного места на диске." - IDS_SELECT_ALL "Выбрать все" IDS_INSTALL_SELECTED "Установить выбранное" IDS_SELECTEDFORINST "Выбрано для установки" IDS_MISMATCH_CERT_INFO "Используемый сертификат не опознан:\nНазначение: %s\nВыдан: %s\nВы хотите продолжить в любом случае?" diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 8cbbda6bd81..9f5d55cdec5 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Inštalovať" IDS_TOOLTIP_UNINSTALL "Odinštalovať" IDS_TOOLTIP_MODIFY "Zmeniť" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Nastavenia" IDS_TOOLTIP_REFRESH "Obnoviť" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "Manažér aplikácií systému ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Hľadať…" - IDS_INSTALL "Inštalovať" - IDS_UNINSTALL "Odinštalovať" - IDS_MODIFY "Zmeniť" IDS_APPS_COUNT "Počet programov: %d; Selected: %d" IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" // ReactOS Application Manager 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: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index afafad7cf09..2b5f723e209 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalo" IDS_TOOLTIP_UNINSTALL "Uninstall" IDS_TOOLTIP_MODIFY "Modifiko" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Konfigurime" IDS_TOOLTIP_REFRESH "Rifresko" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Kerko…" - IDS_INSTALL "Instalo" - IDS_UNINSTALL "Uninstall" - IDS_MODIFY "Modifiko" IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d" IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 7d0442e0b23..007bc7438e0 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -116,6 +116,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Installera" IDS_TOOLTIP_UNINSTALL "Avinstallera" IDS_TOOLTIP_MODIFY "Redigera" + IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" IDS_TOOLTIP_SETTINGS "Inställingar" IDS_TOOLTIP_REFRESH "Uppdatera" IDS_TOOLTIP_UPDATE_DB "Update Database" @@ -188,9 +189,6 @@ BEGIN IDS_APPTITLE "ReactOS programhanterare" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Sök…" - IDS_INSTALL "Installera" - IDS_UNINSTALL "Avinstallera" - IDS_MODIFY "Ändra" IDS_APPS_COUNT "Programantal: %d; Selected: %d" IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n" IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: " @@ -213,7 +211,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index cdb9ad4a9ff..b22117da773 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -118,6 +118,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Kur" IDS_TOOLTIP_UNINSTALL "Kaldır" IDS_TOOLTIP_MODIFY "Değiştir" + IDS_TOOLTIP_SELECT_ALL "Tümünü Seç/Seçileni Kaldır" IDS_TOOLTIP_SETTINGS "Ayarlar" IDS_TOOLTIP_REFRESH "Yenile" IDS_TOOLTIP_UPDATE_DB "Yazılım Veri Tabanını Yenile" @@ -190,9 +191,6 @@ BEGIN IDS_APPTITLE "ReactOS Uygulama Yöneticisi" IDS_APP_AUTHORS "Telif Hakkı: 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Ara" - IDS_INSTALL "Kur" - IDS_UNINSTALL "Kaldır" - IDS_MODIFY "Değiştir" IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d" IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n" 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: " @@ -215,7 +213,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veya indirme esnasında oynanmış olabilir. Yazılımı çalıştırmanız önerilmez." IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. İnternet bağlantınızı denetleyiniz." IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir." - IDS_SELECT_ALL "Tümünü Seç/Seçileni Kaldır" IDS_INSTALL_SELECTED "Seçileni Kur" IDS_SELECTEDFORINST "Kurulum için seçildi" IDS_MISMATCH_CERT_INFO "Kullanılan sertifika bilimmiyor:\nAçıklama: %s\nSertifikayı Veren: %s\nYine de devam etmek istiyor musunuz?" diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index d552eb111bc..3d753d30ca1 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -118,6 +118,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Встановити" IDS_TOOLTIP_UNINSTALL "Видалити" IDS_TOOLTIP_MODIFY "Змінити" + IDS_TOOLTIP_SELECT_ALL "Вибрати все" IDS_TOOLTIP_SETTINGS "Налаштування" IDS_TOOLTIP_REFRESH "Оновити" IDS_TOOLTIP_UPDATE_DB "Оновити список програм" @@ -190,9 +191,6 @@ BEGIN IDS_APPTITLE "Менеджер додатків ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Пошук…" - IDS_INSTALL "Встановити" - IDS_UNINSTALL "Видалити" - IDS_MODIFY "Змінити" IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d" IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n" IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: " @@ -215,7 +213,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "Додаток не пройшов перевірку цілістності, його молги пошкодити чи замінити. Запуск додатку не рекомендується." IDS_INTERRUPTED_DOWNLOAD "Завантаження перервано. Перевірте підключення до мережі Інтернет." IDS_UNABLE_TO_WRITE "Записк на диск неможливий. Можливо, на диску недостатньо містця." - IDS_SELECT_ALL "Вибрати все" IDS_INSTALL_SELECTED "Встановити обране" IDS_SELECTEDFORINST "Обрані для встановлення" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 40e243b3545..54cfa5871ee 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -120,6 +120,7 @@ BEGIN IDS_TOOLTIP_INSTALL "安装" IDS_TOOLTIP_UNINSTALL "卸载" IDS_TOOLTIP_MODIFY "修改" + IDS_TOOLTIP_SELECT_ALL "全选/全反选" IDS_TOOLTIP_SETTINGS "设置" IDS_TOOLTIP_REFRESH "刷新" IDS_TOOLTIP_UPDATE_DB "更新数据库" @@ -192,9 +193,6 @@ BEGIN IDS_APPTITLE "ReactOS 程序管理器" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "搜索…" - IDS_INSTALL "安装" - IDS_UNINSTALL "卸载" - IDS_MODIFY "修改" IDS_APPS_COUNT "程序数量:%d;已选:%d" IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器!\n\n" IDS_WELCOME_TEXT "从左栏选择一个类别,然后选择要安装或卸载的程序。\nReactOS 网站:" @@ -217,7 +215,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "这个包没有通过完整性验证,它可能在下载过程中损坏或被人为篡改了。不推荐运行这个程序。" IDS_INTERRUPTED_DOWNLOAD "下载中断。请检查网络连接。" IDS_UNABLE_TO_WRITE "无法写入磁盘。磁盘可能已满。" - IDS_SELECT_ALL "全选/全反选" IDS_INSTALL_SELECTED "安装已选中的" IDS_SELECTEDFORINST "选中以安装" IDS_MISMATCH_CERT_INFO "所使用的证书未知:\n主题:%s\n发行方:%s\n是否仍要继续?" diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index ebfee0dadd7..f7a0ee355ff 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -117,6 +117,7 @@ BEGIN IDS_TOOLTIP_INSTALL "安裝" IDS_TOOLTIP_UNINSTALL "解除安裝" IDS_TOOLTIP_MODIFY "修改" + IDS_TOOLTIP_SELECT_ALL "全選/全反選" IDS_TOOLTIP_SETTINGS "設定" IDS_TOOLTIP_REFRESH "重新整理" IDS_TOOLTIP_UPDATE_DB "更新資料庫" @@ -189,9 +190,6 @@ BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "搜尋..." - IDS_INSTALL "安裝" - IDS_UNINSTALL "解除安裝" - IDS_MODIFY "修改" IDS_APPS_COUNT "程式數量:%d; 已選:%d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員!\n\n" IDS_WELCOME_TEXT "從左側欄目選擇一個類別,然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" @@ -214,7 +212,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "套件未通過完整性檢查,它可能已損壞,或在下載過程中篡改。建議您不要執行該軟件。" IDS_INTERRUPTED_DOWNLOAD "下載中斷。請檢查網絡連線。" IDS_UNABLE_TO_WRITE "無法寫入到儲存裝置。儲存裝置可能已滿。" - IDS_SELECT_ALL "全選/全反選" IDS_INSTALL_SELECTED "安裝選中的軟件" IDS_SELECTEDFORINST "選中以安裝" IDS_MISMATCH_CERT_INFO "使用了不明的證書:\n主題:%s\n發行方:%s\n您是否仍然要繼續?" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 472c49f8149..9c9d47b3660 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -117,6 +117,7 @@ BEGIN IDS_TOOLTIP_INSTALL "安裝" IDS_TOOLTIP_UNINSTALL "解除安裝" IDS_TOOLTIP_MODIFY "修改" + IDS_TOOLTIP_SELECT_ALL "全選/全反選" IDS_TOOLTIP_SETTINGS "設定" IDS_TOOLTIP_REFRESH "重新整理" IDS_TOOLTIP_UPDATE_DB "更新資料庫" @@ -189,9 +190,6 @@ BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "搜尋..." - IDS_INSTALL "安裝" - IDS_UNINSTALL "解除安裝" - IDS_MODIFY "修改" IDS_APPS_COUNT "程式數量:%d; 已選:%d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員!\n\n" IDS_WELCOME_TEXT "從左側欄目選擇一個類別,然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" @@ -214,7 +212,6 @@ BEGIN IDS_INTEG_CHECK_FAIL "套件未能通過完整性檢查,它可能已損壞,或者在下載過程中篡改。建議您不要執行該軟體。" IDS_INTERRUPTED_DOWNLOAD "下載中斷。請檢查網路連接。" IDS_UNABLE_TO_WRITE "無法寫入至儲存裝置。儲存裝置可能已滿。" - IDS_SELECT_ALL "全選/全反選" IDS_INSTALL_SELECTED "安裝已選取軟體" IDS_SELECTEDFORINST "選中以安裝" IDS_MISMATCH_CERT_INFO "使用了不明的證書:\n主體:%s\n簽發者:%s\n您是否仍然要繼續?"
1 year, 5 months
1
0
0
0
[reactos] 01/01: [SHELL32] Update Russian (ru-RU) translation
by Stanislav Motylkov
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddf94ee4b6c9bb3813b0e…
commit ddf94ee4b6c9bb3813b0e00ac4cd42008a587eda Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jul 7 16:32:03 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jul 7 16:32:03 2023 +0300 [SHELL32] Update Russian (ru-RU) translation --- dll/win32/shell32/lang/ru-RU.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index d5af87413e8..ab1e1e258e5 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -891,13 +891,13 @@ BEGIN IDS_NETWORKPLACE "Сетевое окружение" IDS_NEWFOLDER "Новая папка" - IDS_NEWITEMFORMAT "New %s" + IDS_NEWITEMFORMAT "Новый %s" IDS_DRIVE_FIXED "Локальный диск" IDS_DRIVE_CDROM "CD-дисковод" IDS_DRIVE_NETWORK "Сетевой диск" IDS_DRIVE_FLOPPY "Дисковод 3.5" - IDS_DRIVE_REMOVABLE "Съемный диск" + IDS_DRIVE_REMOVABLE "Съёмный диск" IDS_FS_UNKNOWN "Неизвестно" /* Open With */ @@ -908,7 +908,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Авторы" IDS_SHELL_ABOUT_BACK "< &Назад" - FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ + FCIDM_SHVIEW_NEW "Созд&ать" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папка" FCIDM_SHVIEW_NEWLINK "&Ярлык" IDS_FOLDER_OPTIONS "Свойства папки"
1 year, 5 months
1
0
0
0
[reactos] 01/01: [SHELL32] Add IDS_NEWITEMFORMAT and retry FCIDM_SHVIEW_NEW (#5412)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abf1934d9266556575285…
commit abf1934d926655657528502c09f08dfb6dff3f0e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 7 17:24:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 7 17:24:25 2023 +0900 [SHELL32] Add IDS_NEWITEMFORMAT and retry FCIDM_SHVIEW_NEW (#5412) - FCIDM_SHVIEW_NEW resource string had some problems in localization and keyboard usability. - Add IDS_NEWITEMFORMAT resource string ("New %s") to format the new file item string. - Modify CNewMenu::NewItemByNonCommand for IDS_NEWITEMFORMAT. - FCIDM_SHVIEW_NEW is provided for [New] menu item, so it should have an ampersand. Add a comment for it and then retry the translation. CORE-18706 --- dll/win32/shell32/CNewMenu.cpp | 11 ++++------- dll/win32/shell32/lang/bg-BG.rc | 3 ++- dll/win32/shell32/lang/ca-ES.rc | 3 ++- dll/win32/shell32/lang/cs-CZ.rc | 3 ++- dll/win32/shell32/lang/da-DK.rc | 3 ++- dll/win32/shell32/lang/de-DE.rc | 3 ++- dll/win32/shell32/lang/el-GR.rc | 3 ++- dll/win32/shell32/lang/en-GB.rc | 3 ++- dll/win32/shell32/lang/en-US.rc | 3 ++- dll/win32/shell32/lang/es-ES.rc | 3 ++- dll/win32/shell32/lang/et-EE.rc | 3 ++- dll/win32/shell32/lang/eu-ES.rc | 3 ++- dll/win32/shell32/lang/fi-FI.rc | 3 ++- dll/win32/shell32/lang/fr-FR.rc | 3 ++- dll/win32/shell32/lang/he-IL.rc | 3 ++- dll/win32/shell32/lang/hi-IN.rc | 3 ++- dll/win32/shell32/lang/hu-HU.rc | 3 ++- dll/win32/shell32/lang/id-ID.rc | 3 ++- dll/win32/shell32/lang/it-IT.rc | 3 ++- dll/win32/shell32/lang/ja-JP.rc | 3 ++- dll/win32/shell32/lang/ko-KR.rc | 3 ++- dll/win32/shell32/lang/nl-NL.rc | 3 ++- dll/win32/shell32/lang/no-NO.rc | 3 ++- dll/win32/shell32/lang/pl-PL.rc | 3 ++- dll/win32/shell32/lang/pt-BR.rc | 3 ++- dll/win32/shell32/lang/pt-PT.rc | 3 ++- dll/win32/shell32/lang/ro-RO.rc | 3 ++- dll/win32/shell32/lang/ru-RU.rc | 3 ++- dll/win32/shell32/lang/sk-SK.rc | 3 ++- dll/win32/shell32/lang/sl-SI.rc | 3 ++- dll/win32/shell32/lang/sq-AL.rc | 3 ++- dll/win32/shell32/lang/sv-SE.rc | 3 ++- dll/win32/shell32/lang/tr-TR.rc | 3 ++- dll/win32/shell32/lang/uk-UA.rc | 3 ++- dll/win32/shell32/lang/zh-CN.rc | 3 ++- dll/win32/shell32/lang/zh-HK.rc | 3 ++- dll/win32/shell32/lang/zh-TW.rc | 3 ++- dll/win32/shell32/shresdef.h | 1 + 38 files changed, 77 insertions(+), 43 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index a02314b1d8e..6c8e9354fc3 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -518,17 +518,14 @@ HRESULT CNewMenu::NewItemByCommand(SHELLNEW_ITEM *pItem, LPCWSTR wszPath) HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, DWORD cchNameMax, LPCWSTR wszPath) { - WCHAR wszBuf[MAX_PATH]; - WCHAR wszNewFile[MAX_PATH]; BOOL bSuccess = TRUE; - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf))) - return E_FAIL; - - StringCchPrintfW(wszNewFile, _countof(wszNewFile), L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); + CStringW strNewItem; + strNewItem.Format(IDS_NEWITEMFORMAT, pItem->pwszDesc); + strNewItem += pItem->pwszExt; /* Create the name of the new file */ - if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFile)) + if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, strNewItem)) return E_FAIL; /* Create new file */ diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 7e04ed2be6a..0913002bd52 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -885,6 +885,7 @@ BEGIN IDS_NETWORKPLACE "Моята мрежа" IDS_NEWFOLDER "Нова папка" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Местен диск" IDS_DRIVE_CDROM "КД четец" @@ -901,7 +902,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Създатели" IDS_SHELL_ABOUT_BACK "< &Назад" - FCIDM_SHVIEW_NEW "Нови" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Нова &папка" FCIDM_SHVIEW_NEWLINK "Нова &връзка" IDS_FOLDER_OPTIONS "Настройки на папките" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index c3e162d7246..f6d97783526 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index d6bc364b7bf..220008b789b 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -890,6 +890,7 @@ BEGIN IDS_NETWORKPLACE "Místa v síti" IDS_NEWFOLDER "Nová složka" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Místní disk" IDS_DRIVE_CDROM "Jednotka CD" @@ -906,7 +907,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autoři" IDS_SHELL_ABOUT_BACK "< &Zpět" - FCIDM_SHVIEW_NEW "&Nový" + FCIDM_SHVIEW_NEW "&Nový" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nová &složka" FCIDM_SHVIEW_NEWLINK "Nový &zástupce" IDS_FOLDER_OPTIONS "Možnosti složky" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 537625fb298..41a9d35709d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -890,6 +890,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "Ny Mappe" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -906,7 +907,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "Ny" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &Mappe" FCIDM_SHVIEW_NEWLINK "Nyt &Link" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 40b2e1557bc..b276d858ebb 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -885,6 +885,7 @@ BEGIN IDS_NETWORKPLACE "Netzwerkumgebung" IDS_NEWFOLDER "Neuer Ordner" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Lokaler Datenträger" IDS_DRIVE_CDROM "CD-Laufwerk" @@ -901,7 +902,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autoren" IDS_SHELL_ABOUT_BACK "< &Zurück" - FCIDM_SHVIEW_NEW "Neu" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 84eabdb3a03..0de7aeba63d 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Τοπικός δίσκος" IDS_DRIVE_CDROM "Μονάδα CD" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Προγραμματιστές" IDS_SHELL_ABOUT_BACK "< &Επιστροφή" - FCIDM_SHVIEW_NEW "Δημιουργία" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Νέος &Φάκελος" FCIDM_SHVIEW_NEWLINK "Νέα &Συντόμευση" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 8c9b997914f..4cc41af0613 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 8a515de2a43..9f6c6e772dc 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 6c81ce28cc1..ecaa6fb9e12 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -893,6 +893,7 @@ BEGIN IDS_NETWORKPLACE "Mis sitios de red" IDS_NEWFOLDER "Nueva carpeta" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disco local" IDS_DRIVE_CDROM "Unidad de CD" @@ -909,7 +910,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autores" IDS_SHELL_ABOUT_BACK "< A&trás" - FCIDM_SHVIEW_NEW "Nuevo" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" FCIDM_SHVIEW_NEWLINK "Nuevo &acceso directo" IDS_FOLDER_OPTIONS "Opciones de carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 43a6077bace..b3ed8a6252e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -891,6 +891,7 @@ BEGIN IDS_NETWORKPLACE "Minu võrgukohad" IDS_NEWFOLDER "Uus kaust" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Kohalik ketas" IDS_DRIVE_CDROM "CD-draiv" @@ -907,7 +908,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autorid" IDS_SHELL_ABOUT_BACK "< &Tagasi" - FCIDM_SHVIEW_NEW "Uus" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Uus &kaust" FCIDM_SHVIEW_NEWLINK "Uus &otsetee" IDS_FOLDER_OPTIONS "Kaustasuvandid" diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 913a88a1ba8..c5d65dd876a 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -889,6 +889,7 @@ BEGIN IDS_NETWORKPLACE "Nire sarelekuak" IDS_NEWFOLDER "Karpeta berria" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disko lokala" IDS_DRIVE_CDROM "CD Unitatea" @@ -905,7 +906,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Egileak" IDS_SHELL_ABOUT_BACK "< A&tzea" - FCIDM_SHVIEW_NEW "Berria" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Karpeta &berria" FCIDM_SHVIEW_NEWLINK "&Lasterbide berria" IDS_FOLDER_OPTIONS "Karpeta aukera" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 0a8890e51d0..2a7e1ca250b 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "Uusi" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" FCIDM_SHVIEW_NEWLINK "Uusi &Linkki" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 38d8bd1e7c6..0bbdfcddcd2 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Mes emplacements réseau" IDS_NEWFOLDER "Nouveau dossier" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disque local" IDS_DRIVE_CDROM "Lecteur CD" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< Précédent" - FCIDM_SHVIEW_NEW "Nouveau" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien" IDS_FOLDER_OPTIONS "Options du dossier" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 0415a870ae8..1da85f9fa48 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -886,6 +886,7 @@ BEGIN IDS_NETWORKPLACE "מיקומי הרשת שלי" IDS_NEWFOLDER "תיקיה חדשה" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "כונן מקומי" IDS_DRIVE_CDROM "כונן CD" @@ -902,7 +903,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&יוצרים" IDS_SHELL_ABOUT_BACK "< &חזרה" - FCIDM_SHVIEW_NEW "חדש" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "תיקיה חדשה" FCIDM_SHVIEW_NEWLINK "&קישור חדש" IDS_FOLDER_OPTIONS "אפשרויות תיקיה" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 5f79e7a90b3..ac0009b3710 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -879,6 +879,7 @@ BEGIN IDS_NETWORKPLACE "मेरे नेटवर्क स्थान" IDS_NEWFOLDER "नया फोल्डर" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "लोकल डिस्क" IDS_DRIVE_CDROM "सीडी ड्राइव" @@ -895,7 +896,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&ऑथर" IDS_SHELL_ABOUT_BACK "< &पीछे" - FCIDM_SHVIEW_NEW "नया" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "नया &फोल्डर" FCIDM_SHVIEW_NEWLINK "नया &लिंक" IDS_FOLDER_OPTIONS "फोल्डर विकल्प" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 3502490b70e..5c00c13d26e 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -883,6 +883,7 @@ BEGIN IDS_NETWORKPLACE "Hálózati helyek" IDS_NEWFOLDER "Új mappa" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Helyi lemez" IDS_DRIVE_CDROM "CD-meghajtó" @@ -899,7 +900,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Készítők" IDS_SHELL_ABOUT_BACK "< &Vissza" - FCIDM_SHVIEW_NEW "Új" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Mappa" FCIDM_SHVIEW_NEWLINK "&Parancsikon" IDS_FOLDER_OPTIONS "Mappabeállítások" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 690c30c5cee..fab8a02e5b3 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -881,6 +881,7 @@ BEGIN IDS_NETWORKPLACE "Tempat Jaringan Saya" IDS_NEWFOLDER "Folder Baru" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disk Lokal" IDS_DRIVE_CDROM "CD Drive" @@ -897,7 +898,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "Peng&arang" IDS_SHELL_ABOUT_BACK "< Kem&bali" - FCIDM_SHVIEW_NEW "Baru" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Folder Baru" FCIDM_SHVIEW_NEWLINK "&Tautan Baru" IDS_FOLDER_OPTIONS "Opsi Folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 01527786306..ed1a18e5c60 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Risorse di rete" IDS_NEWFOLDER "Nuova cartella" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disco locale" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autori" IDS_SHELL_ABOUT_BACK "< &Indietro" - FCIDM_SHVIEW_NEW "Nuovo" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" FCIDM_SHVIEW_NEWLINK "Nuovo &Collegamento" IDS_FOLDER_OPTIONS "Opzioni della cartella" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 5096f15bfbe..91f7859346c 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -881,6 +881,7 @@ BEGIN IDS_NETWORKPLACE "マイ ネットワーク" IDS_NEWFOLDER "新しいフォルダ" + IDS_NEWITEMFORMAT "新しい%s" IDS_DRIVE_FIXED "ローカル ディスク" IDS_DRIVE_CDROM "CDドライブ" @@ -897,7 +898,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "制作者(&A)" IDS_SHELL_ABOUT_BACK "< 戻る(&B)" - FCIDM_SHVIEW_NEW "新規作成" + FCIDM_SHVIEW_NEW "新規作成(&W)" FCIDM_SHVIEW_NEWFOLDER "フォルダ(&F)" FCIDM_SHVIEW_NEWLINK "ショートカット(&L)" IDS_FOLDER_OPTIONS "フォルダ オプション" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 253f17537ff..40fbdbb1d1a 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -891,6 +891,7 @@ BEGIN IDS_NETWORKPLACE "내 네트워크 환경" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "로컬 디스크" IDS_DRIVE_CDROM "CD 드라이브" @@ -907,7 +908,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "폴더 옵션" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 8973af3dcce..bfdac3178ce 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index dba9ec3b66c..c5d08ac8231 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Mine nettverkssteder" IDS_NEWFOLDER "Ny mappe" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Lokal Disk" IDS_DRIVE_CDROM "CD stasjon" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Forfatter" IDS_SHELL_ABOUT_BACK "< &Tilbake" - FCIDM_SHVIEW_NEW "Ny" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" FCIDM_SHVIEW_NEWLINK "Ny &snarvei" IDS_FOLDER_OPTIONS "Mappe valg" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index b34b21e0769..42ec6f397c8 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -890,6 +890,7 @@ BEGIN IDS_NETWORKPLACE "Moje miejsca sieciowe" IDS_NEWFOLDER "Nowy folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Dysk lokalny" IDS_DRIVE_CDROM "Stacja dysków CD" @@ -906,7 +907,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autorzy" IDS_SHELL_ABOUT_BACK "< &Wstecz" - FCIDM_SHVIEW_NEW "&Nowy" + FCIDM_SHVIEW_NEW "&Nowy" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&Skrót" IDS_FOLDER_OPTIONS "Opcje folderów" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 6ab4c66224c..97dfc414e18 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Meus Locais de Rede" IDS_NEWFOLDER "Nova Pasta" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disco Local" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autores" IDS_SHELL_ABOUT_BACK "< &Voltar" - FCIDM_SHVIEW_NEW "Novo" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Opções de Pasta" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 488350cb687..18b7df153d5 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -883,6 +883,7 @@ BEGIN IDS_NETWORKPLACE "Os Meus Locais na Rede" IDS_NEWFOLDER "Nova Pasta" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disco Local" IDS_DRIVE_CDROM "CD Drive" @@ -899,7 +900,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autores" IDS_SHELL_ABOUT_BACK "< &Retroceder" - FCIDM_SHVIEW_NEW "Novo" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Opções das Pastas" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 48b136c2337..108fb316db2 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -887,6 +887,7 @@ BEGIN IDS_NETWORKPLACE "Locații în rețea" IDS_NEWFOLDER "Dosar nou" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disc local" IDS_DRIVE_CDROM "Unitate CD" @@ -903,7 +904,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autori" IDS_SHELL_ABOUT_BACK "< Înap&oi" - FCIDM_SHVIEW_NEW "&Crează" + FCIDM_SHVIEW_NEW "&Crează" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Dosar" FCIDM_SHVIEW_NEWLINK "Sc&urtătură" IDS_FOLDER_OPTIONS "Opțiuni dosare" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index dee2f826f29..d5af87413e8 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -891,6 +891,7 @@ BEGIN IDS_NETWORKPLACE "Сетевое окружение" IDS_NEWFOLDER "Новая папка" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Локальный диск" IDS_DRIVE_CDROM "CD-дисковод" @@ -907,7 +908,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Авторы" IDS_SHELL_ABOUT_BACK "< &Назад" - FCIDM_SHVIEW_NEW "Создать" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папка" FCIDM_SHVIEW_NEWLINK "&Ярлык" IDS_FOLDER_OPTIONS "Свойства папки" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 137eb98fe1c..5137aaa3193 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Miesta v sieti" IDS_NEWFOLDER "Nový priečinok" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Lokálny disk" IDS_DRIVE_CDROM "Jednotka CD" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autori" IDS_SHELL_ABOUT_BACK "< &Späť" - FCIDM_SHVIEW_NEW "&Nový" + FCIDM_SHVIEW_NEW "&Nový" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Priečinok" FCIDM_SHVIEW_NEWLINK "&Odkaz" IDS_FOLDER_OPTIONS "Možnosti priečinka" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 0a276532274..9c23ac6a46c 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "My Network Places" IDS_NEWFOLDER "New Folder" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CD Drive" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 50922cb2fb9..5c379fa5b84 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -888,6 +888,7 @@ BEGIN IDS_NETWORKPLACE "Vendi Rrjetit Tim" IDS_NEWFOLDER "Dosje e're" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disku Vendorë" IDS_DRIVE_CDROM "CD Drive" @@ -904,7 +905,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autorët" IDS_SHELL_ABOUT_BACK "< &Mbrapa" - FCIDM_SHVIEW_NEW "E're" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Dosje E're" FCIDM_SHVIEW_NEWLINK "&Lidhje e Re" IDS_FOLDER_OPTIONS "Opsione Dosje" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index a0260919158..98e086c537f 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Mina nätverksplatser" IDS_NEWFOLDER "Ny mapp" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Lokal disk" IDS_DRIVE_CDROM "CD-enhet" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Upphovsinformation" IDS_SHELL_ABOUT_BACK "< &Bakåt" - FCIDM_SHVIEW_NEW "Ny(tt)" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &mapp" FCIDM_SHVIEW_NEWLINK "Ny &genväg" IDS_FOLDER_OPTIONS "Mappalternativ" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index f717102e350..92b19843e1b 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -886,6 +886,7 @@ BEGIN IDS_NETWORKPLACE "Ağ Bağlantılarım" IDS_NEWFOLDER "Yeni Dizin" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Yerel Disk" IDS_DRIVE_CDROM "CD-ROM" @@ -902,7 +903,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Yazarlar" IDS_SHELL_ABOUT_BACK "< &Geri" - FCIDM_SHVIEW_NEW "Yeni" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" FCIDM_SHVIEW_NEWLINK "Yeni &Kısayol" IDS_FOLDER_OPTIONS "Dizin Seçenekleri" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index f0b85264deb..edba619b269 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -884,6 +884,7 @@ BEGIN IDS_NETWORKPLACE "Мережне оточення" IDS_NEWFOLDER "Нова папка" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Локальний диск" IDS_DRIVE_CDROM "Привід компакт-дисків" @@ -900,7 +901,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Автори" IDS_SHELL_ABOUT_BACK "< &Назад" - FCIDM_SHVIEW_NEW "Створити" + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папку" FCIDM_SHVIEW_NEWLINK "&Ярлик" IDS_FOLDER_OPTIONS "Властивості папки" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index ea176d3f78a..1c5a374868f 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -894,6 +894,7 @@ BEGIN IDS_NETWORKPLACE "网上邻居" IDS_NEWFOLDER "新建文件夹" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "本地磁盘" IDS_DRIVE_CDROM "光盘驱动器" @@ -910,7 +911,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "作者(&A)" IDS_SHELL_ABOUT_BACK "< 返回(&B)" - FCIDM_SHVIEW_NEW "新建" + FCIDM_SHVIEW_NEW "新建(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "文件夹(&F)" FCIDM_SHVIEW_NEWLINK "快捷方式(&L)" IDS_FOLDER_OPTIONS "文件夹选项" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 92349c2134c..b45531d8300 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -892,6 +892,7 @@ BEGIN IDS_NETWORKPLACE "網絡上的芳鄰" IDS_NEWFOLDER "新資料夾" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "本機磁碟" IDS_DRIVE_CDROM "CD 光碟機" @@ -908,7 +909,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "作者(&A)" IDS_SHELL_ABOUT_BACK "< 返回(&B)" - FCIDM_SHVIEW_NEW "新增" + FCIDM_SHVIEW_NEW "新增(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" FCIDM_SHVIEW_NEWLINK "新增捷徑(&L)" IDS_FOLDER_OPTIONS "資料夾選項" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 4670f652e57..a948e751233 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -893,6 +893,7 @@ BEGIN IDS_NETWORKPLACE "網路上的芳鄰" IDS_NEWFOLDER "新資料夾" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "本機磁碟" IDS_DRIVE_CDROM "CD 光碟機" @@ -909,7 +910,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "作者(&A)" IDS_SHELL_ABOUT_BACK "< 上一步(&B)" - FCIDM_SHVIEW_NEW "新增" + FCIDM_SHVIEW_NEW "新增(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" FCIDM_SHVIEW_NEWLINK "新增捷徑(&L)" IDS_FOLDER_OPTIONS "資料夾選項" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index f7a72000745..9f37375b3f3 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -140,6 +140,7 @@ #define FCIDM_SHVIEW_NEW 146 #define IDS_CONTROLPANEL 148 #define IDS_NEWFOLDER 149 +#define IDS_NEWITEMFORMAT 150 #define IDS_COLUMN_EXTENSION 151 #define IDS_NO_EXTENSION 152 #define IDS_RECYCLEBIN_LOCATION 153
1 year, 5 months
1
0
0
0
[reactos] 01/01: [NETSTAT] Less heap allocations (#5409)
by Joachim Henze
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3da13042eafa553f9f624…
commit 3da13042eafa553f9f624f2dcf414c28359092ca Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Jul 6 18:23:17 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 6 18:23:17 2023 +0200 [NETSTAT] Less heap allocations (#5409) - Avoid the heap in ShowIpStatistics() and ShowIcmpStatistics() to simplify the code, inspired by how we do it in ShowTcpStatistics() and ShowUdpStatistics() already - Strip 2 Captain-Obvious-Comments For the record: Retrieving ICMP-stats and IP-stats does not work properly in ReactOS yet, neither with nor without my fix. Lower layers are most likely wrong still somehow. But netstat itself can properly obtain ICMP-stats and IP-stats in Windows already. --- base/applications/network/netstat/netstat.c | 84 ++++++++++++----------------- 1 file changed, 35 insertions(+), 49 deletions(-) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index c4449add815..22ab9385c09 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -6,7 +6,7 @@ */ /* * TODO: - * implement -b, -t and -v + * implement -b, -t, -v * clean up GetIpHostName */ @@ -58,9 +58,6 @@ VOID DoFormatMessage(DWORD ErrorCode) NULL, ErrorCode, LANG_USER_DEFAULT); } -/* - * Display table header - */ VOID DisplayTableHeader(VOID) { ConResPuts(StdOut, IDS_ACTIVE_CONNECT); @@ -166,9 +163,6 @@ StopParsingAndShowUsageHelp: return TRUE; } -/* - * Simulate Microsofts netstat utility output - */ BOOL DisplayOutput(VOID) { if (bNoOptions) @@ -239,84 +233,76 @@ BOOL DisplayOutput(VOID) VOID ShowIpStatistics(VOID) { - PMIB_IPSTATS pIpStats; + MIB_IPSTATS IpStats; DWORD dwRetVal; - pIpStats = (MIB_IPSTATS*)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPSTATS)); - - if ((dwRetVal = GetIpStatistics(pIpStats)) == NO_ERROR) + if ((dwRetVal = GetIpStatistics(&IpStats)) == NO_ERROR) { ConResPuts(StdOut, IDS_IP4_STAT_HEADER); - ConResPrintf(StdOut, IDS_IP_PACK_REC, pIpStats->dwInReceives); - ConResPrintf(StdOut, IDS_IP_HEAD_REC_ERROR, pIpStats->dwInHdrErrors); - ConResPrintf(StdOut, IDS_IP_ADDR_REC_ERROR, pIpStats->dwInAddrErrors); - ConResPrintf(StdOut, IDS_IP_DATAG_FWD, pIpStats->dwForwDatagrams); - ConResPrintf(StdOut, IDS_IP_UNKNOWN_PRO_REC, pIpStats->dwInUnknownProtos); - ConResPrintf(StdOut, IDS_IP_REC_PACK_DISCARD, pIpStats->dwInDiscards); - ConResPrintf(StdOut, IDS_IP_REC_PACK_DELIVER, pIpStats->dwInDelivers); - ConResPrintf(StdOut, IDS_IP_OUT_REQUEST, pIpStats->dwOutRequests); - ConResPrintf(StdOut, IDS_IP_ROUTE_DISCARD, pIpStats->dwRoutingDiscards); - ConResPrintf(StdOut, IDS_IP_DISCARD_OUT_PACK, pIpStats->dwOutDiscards); - ConResPrintf(StdOut, IDS_IP_OUT_PACKET_NO_ROUTE, pIpStats->dwOutNoRoutes); - ConResPrintf(StdOut, IDS_IP_REASSEMBLE_REQUIRED, pIpStats->dwReasmReqds); - ConResPrintf(StdOut, IDS_IP_REASSEMBLE_SUCCESS, pIpStats->dwReasmOks); - ConResPrintf(StdOut, IDS_IP_REASSEMBLE_FAILURE, pIpStats->dwReasmFails); - ConResPrintf(StdOut, IDS_IP_DATAG_FRAG_SUCCESS, pIpStats->dwFragOks); - ConResPrintf(StdOut, IDS_IP_DATAG_FRAG_FAILURE, pIpStats->dwFragFails); - ConResPrintf(StdOut, IDS_IP_DATAG_FRAG_CREATE, pIpStats->dwFragCreates); + ConResPrintf(StdOut, IDS_IP_PACK_REC, IpStats.dwInReceives); + ConResPrintf(StdOut, IDS_IP_HEAD_REC_ERROR, IpStats.dwInHdrErrors); + ConResPrintf(StdOut, IDS_IP_ADDR_REC_ERROR, IpStats.dwInAddrErrors); + ConResPrintf(StdOut, IDS_IP_DATAG_FWD, IpStats.dwForwDatagrams); + ConResPrintf(StdOut, IDS_IP_UNKNOWN_PRO_REC, IpStats.dwInUnknownProtos); + ConResPrintf(StdOut, IDS_IP_REC_PACK_DISCARD, IpStats.dwInDiscards); + ConResPrintf(StdOut, IDS_IP_REC_PACK_DELIVER, IpStats.dwInDelivers); + ConResPrintf(StdOut, IDS_IP_OUT_REQUEST, IpStats.dwOutRequests); + ConResPrintf(StdOut, IDS_IP_ROUTE_DISCARD, IpStats.dwRoutingDiscards); + ConResPrintf(StdOut, IDS_IP_DISCARD_OUT_PACK, IpStats.dwOutDiscards); + ConResPrintf(StdOut, IDS_IP_OUT_PACKET_NO_ROUTE, IpStats.dwOutNoRoutes); + ConResPrintf(StdOut, IDS_IP_REASSEMBLE_REQUIRED, IpStats.dwReasmReqds); + ConResPrintf(StdOut, IDS_IP_REASSEMBLE_SUCCESS, IpStats.dwReasmOks); + ConResPrintf(StdOut, IDS_IP_REASSEMBLE_FAILURE, IpStats.dwReasmFails); + ConResPrintf(StdOut, IDS_IP_DATAG_FRAG_SUCCESS, IpStats.dwFragOks); + ConResPrintf(StdOut, IDS_IP_DATAG_FRAG_FAILURE, IpStats.dwFragFails); + ConResPrintf(StdOut, IDS_IP_DATAG_FRAG_CREATE, IpStats.dwFragCreates); } else { DoFormatMessage(dwRetVal); } - - HeapFree(GetProcessHeap(), 0, pIpStats); } VOID ShowIcmpStatistics(VOID) { - PMIB_ICMP pIcmpStats; + MIB_ICMP IcmpStats; DWORD dwRetVal; - pIcmpStats = (MIB_ICMP*)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_ICMP)); - - if ((dwRetVal = GetIcmpStatistics(pIcmpStats)) == NO_ERROR) + if ((dwRetVal = GetIcmpStatistics(&IcmpStats)) == NO_ERROR) { ConResPuts(StdOut, IDS_ICMP4_STAT_HEADER); ConResPuts(StdOut, IDS_ICMP_THEADER); ConResPrintf(StdOut, IDS_ICMP_MSG, - pIcmpStats->stats.icmpInStats.dwMsgs, pIcmpStats->stats.icmpOutStats.dwMsgs); + IcmpStats.stats.icmpInStats.dwMsgs, IcmpStats.stats.icmpOutStats.dwMsgs); ConResPrintf(StdOut, IDS_ICMP_ERROR, - pIcmpStats->stats.icmpInStats.dwErrors, pIcmpStats->stats.icmpOutStats.dwErrors); + IcmpStats.stats.icmpInStats.dwErrors, IcmpStats.stats.icmpOutStats.dwErrors); ConResPrintf(StdOut, IDS_ICMP_DEST_UNREACH, - pIcmpStats->stats.icmpInStats.dwDestUnreachs, pIcmpStats->stats.icmpOutStats.dwDestUnreachs); + IcmpStats.stats.icmpInStats.dwDestUnreachs, IcmpStats.stats.icmpOutStats.dwDestUnreachs); ConResPrintf(StdOut, IDS_ICMP_TIME_EXCEED, - pIcmpStats->stats.icmpInStats.dwTimeExcds, pIcmpStats->stats.icmpOutStats.dwTimeExcds); + IcmpStats.stats.icmpInStats.dwTimeExcds, IcmpStats.stats.icmpOutStats.dwTimeExcds); ConResPrintf(StdOut, IDS_ICMP_PARAM_PROBLEM, - pIcmpStats->stats.icmpInStats.dwParmProbs, pIcmpStats->stats.icmpOutStats.dwParmProbs); + IcmpStats.stats.icmpInStats.dwParmProbs, IcmpStats.stats.icmpOutStats.dwParmProbs); ConResPrintf(StdOut, IDS_ICMP_SRC_QUENCHES, - pIcmpStats->stats.icmpInStats.dwSrcQuenchs, pIcmpStats->stats.icmpOutStats.dwSrcQuenchs); + IcmpStats.stats.icmpInStats.dwSrcQuenchs, IcmpStats.stats.icmpOutStats.dwSrcQuenchs); ConResPrintf(StdOut, IDS_ICMP_REDIRECT, - pIcmpStats->stats.icmpInStats.dwRedirects, pIcmpStats->stats.icmpOutStats.dwRedirects); + IcmpStats.stats.icmpInStats.dwRedirects, IcmpStats.stats.icmpOutStats.dwRedirects); ConResPrintf(StdOut, IDS_ICMP_ECHO, - pIcmpStats->stats.icmpInStats.dwEchos, pIcmpStats->stats.icmpOutStats.dwEchos); + IcmpStats.stats.icmpInStats.dwEchos, IcmpStats.stats.icmpOutStats.dwEchos); ConResPrintf(StdOut, IDS_ICMP_ECHO_REPLY, - pIcmpStats->stats.icmpInStats.dwEchoReps, pIcmpStats->stats.icmpOutStats.dwEchoReps); + IcmpStats.stats.icmpInStats.dwEchoReps, IcmpStats.stats.icmpOutStats.dwEchoReps); ConResPrintf(StdOut, IDS_ICMP_TIMESTAMP, - pIcmpStats->stats.icmpInStats.dwTimestamps, pIcmpStats->stats.icmpOutStats.dwTimestamps); + IcmpStats.stats.icmpInStats.dwTimestamps, IcmpStats.stats.icmpOutStats.dwTimestamps); ConResPrintf(StdOut, IDS_ICMP_TIMESTAMP_REPLY, - pIcmpStats->stats.icmpInStats.dwTimestampReps, pIcmpStats->stats.icmpOutStats.dwTimestampReps); + IcmpStats.stats.icmpInStats.dwTimestampReps, IcmpStats.stats.icmpOutStats.dwTimestampReps); ConResPrintf(StdOut, IDS_ICMP_ADDRESSS_MASK, - pIcmpStats->stats.icmpInStats.dwAddrMasks, pIcmpStats->stats.icmpOutStats.dwAddrMasks); + IcmpStats.stats.icmpInStats.dwAddrMasks, IcmpStats.stats.icmpOutStats.dwAddrMasks); ConResPrintf(StdOut, IDS_ICMP_ADDRESSS_MASK_REPLY, - pIcmpStats->stats.icmpInStats.dwAddrMaskReps, pIcmpStats->stats.icmpOutStats.dwAddrMaskReps); + IcmpStats.stats.icmpInStats.dwAddrMaskReps, IcmpStats.stats.icmpOutStats.dwAddrMaskReps); } else { DoFormatMessage(dwRetVal); } - - HeapFree(GetProcessHeap(), 0, pIcmpStats); } VOID ShowTcpStatistics(VOID)
1 year, 5 months
1
0
0
0
[reactos] 01/01: [NETSTAT] pragma once, reorder, fix pl-PL.rc (#5407)
by Joachim Henze
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1245a897fefa0379421a…
commit c1245a897fefa0379421ae0f4c01d4ffec041bf6 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Jul 6 18:19:30 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 6 18:19:30 2023 +0200 [NETSTAT] pragma once, reorder, fix pl-PL.rc (#5407) - add a pragma once into the header - order -o options alphabetically also for the global variables, not only in usage-help - pl-PL.rc: fix wrong alignment of IDS_ETHERNET_THEADER and its data - pl-PL.rc: also don't pad the data with 2 spaces here in the beginning, which we don't do in any other locale, and MS netstat also doesn't do that here. pl-PL.rc most likely got this wrong because it was created while en-US wasn't finished yet. --- base/applications/network/netstat/lang/pl-PL.rc | 14 +++++++------- base/applications/network/netstat/netstat.h | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/base/applications/network/netstat/lang/pl-PL.rc b/base/applications/network/netstat/lang/pl-PL.rc index caa9cfe93ff..d418edd8a95 100644 --- a/base/applications/network/netstat/lang/pl-PL.rc +++ b/base/applications/network/netstat/lang/pl-PL.rc @@ -95,13 +95,13 @@ END STRINGTABLE BEGIN IDS_ETHERNET_INTERFACE_STAT "Statystyki interfejsu\n\n" - IDS_ETHERNET_THEADER " Odebrano Wysłano\n\n" - IDS_ETHERNET_BYTES " Bajty %14lu %15lu\n" - IDS_ETHERNET_UNICAST_PACKET " Pakiety emisji pojedynczej %14lu %15lu\n" - IDS_ETHERNET_NON_UNICAST_PACKET " Pakiety inne niż emisji pojedynczej %14lu %15lu\n" - IDS_ETHERNET_DISCARD " Odrzucone %14lu %15lu\n" - IDS_ETHERNET_ERROR " Błędy %14lu %15lu\n" - IDS_ETHERNET_UNKNOWN " Nieznane protokoły %14lu\n" + IDS_ETHERNET_THEADER " Odebrano Wysłano\n\n" + IDS_ETHERNET_BYTES "Bajty %14lu %15lu\n" + IDS_ETHERNET_UNICAST_PACKET "Pakiety emisji pojedynczej %14lu %15lu\n" + IDS_ETHERNET_NON_UNICAST_PACKET "Pakiety inne niż emisji pojedynczej %14lu %15lu\n" + IDS_ETHERNET_DISCARD "Odrzucone %14lu %15lu\n" + IDS_ETHERNET_ERROR "Błędy %14lu %15lu\n" + IDS_ETHERNET_UNKNOWN "Nieznane protokoły %14lu\n" END STRINGTABLE diff --git a/base/applications/network/netstat/netstat.h b/base/applications/network/netstat/netstat.h index aebd80c4f2d..2b9458cd36f 100644 --- a/base/applications/network/netstat/netstat.h +++ b/base/applications/network/netstat/netstat.h @@ -1,3 +1,4 @@ +#pragma once /* Maximum string lengths for ASCII ip address and port names */ #define HOSTNAMELEN 256 @@ -10,10 +11,10 @@ BOOL bDoShowAllCons = FALSE; // -a BOOL bDoShowProcName = FALSE; // -b BOOL bDoShowEthStats = FALSE; // -e BOOL bDoShowNumbers = FALSE; // -n +BOOL bDoShowProcessId = FALSE; // -o BOOL bDoShowProtoCons = FALSE; // -p BOOL bDoShowRouteTable = FALSE; // -r BOOL bDoShowProtoStats = FALSE; // -s -BOOL bDoShowProcessId = FALSE; // -o BOOL bDoDispSeqComp = FALSE; // -v BOOL bLoopOutput = FALSE; // interval
1 year, 5 months
1
0
0
0
[reactos] 11/11: [WINESYNC][WINMM] PlaySound: Formatting only
by Thamatip Chitpong
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9580fb95cdeef0c8e86d…
commit a9580fb95cdeef0c8e86d3169cc0ab7b90234174 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 12:06:44 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:22 2023 +0300 [WINESYNC][WINMM] PlaySound: Formatting only - Indent with spaces - complies with Wine --- dll/win32/winmm/playsound.c | 116 ++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index b599073a2db..8ce6f7c154c 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -37,7 +37,7 @@ typedef struct tagWINE_PLAYSOUND static WINE_PLAYSOUND *PlaySoundCurrent; static BOOL bPlaySoundStop; -static HMMIO get_mmioFromFile(LPCWSTR lpszName) +static HMMIO get_mmioFromFile(LPCWSTR lpszName) { HMMIO ret; WCHAR buf[256]; @@ -308,37 +308,37 @@ Quit: struct playsound_data { - HANDLE hEvent; - LONG dwEventCount; + HANDLE hEvent; + LONG dwEventCount; }; static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, - DWORD_PTR dwInstance, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - struct playsound_data* s = (struct playsound_data*)dwInstance; + struct playsound_data* s = (struct playsound_data*)dwInstance; switch (uMsg) { case WOM_OPEN: case WOM_CLOSE: - break; + break; case WOM_DONE: - InterlockedIncrement(&s->dwEventCount); - TRACE("Returning waveHdr=%lx\n", dwParam1); - SetEvent(s->hEvent); - break; + InterlockedIncrement(&s->dwEventCount); + TRACE("Returning waveHdr=%lx\n", dwParam1); + SetEvent(s->hEvent); + break; default: - ERR("Unknown uMsg=%d\n", uMsg); + ERR("Unknown uMsg=%d\n", uMsg); } } static void PlaySound_WaitDone(struct playsound_data* s) { for (;;) { - if (InterlockedDecrement(&s->dwEventCount) >= 0) break; - InterlockedIncrement(&s->dwEventCount); + if (InterlockedDecrement(&s->dwEventCount) >= 0) break; + InterlockedIncrement(&s->dwEventCount); - WaitForSingleObject(s->hEvent, INFINITE); + WaitForSingleObject(s->hEvent, INFINITE); } } @@ -420,70 +420,70 @@ static WINE_PLAYSOUND* PlaySound_AllocAndGetMMIO(const void* pszSound, HMODULE h static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) { - BOOL bRet = FALSE; - MMCKINFO ckMainRIFF; - MMCKINFO mmckInfo; + BOOL bRet = FALSE; + MMCKINFO ckMainRIFF; + MMCKINFO mmckInfo; LPWAVEFORMATEX lpWaveFormat = NULL; - HWAVEOUT hWave = 0; - LPWAVEHDR waveHdr = NULL; - INT count, bufsize, left, index; - struct playsound_data s; + HWAVEOUT hWave = 0; + LPWAVEHDR waveHdr = NULL; + INT count, bufsize, left, index; + struct playsound_data s; LONG r; s.hEvent = 0; if (mmioDescend(wps->hmmio, &ckMainRIFF, NULL, 0)) - goto errCleanUp; + goto errCleanUp; TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08X\n", - (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); + (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); if ((ckMainRIFF.ckid != FOURCC_RIFF) || - (ckMainRIFF.fccType != mmioFOURCC('W', 'A', 'V', 'E'))) - goto errCleanUp; + (ckMainRIFF.fccType != mmioFOURCC('W', 'A', 'V', 'E'))) + goto errCleanUp; mmckInfo.ckid = mmioFOURCC('f', 'm', 't', ' '); if (mmioDescend(wps->hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) - goto errCleanUp; + goto errCleanUp; TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08X\n", - (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); + (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; r = mmioRead(wps->hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize); if (r < 0 || r < sizeof(PCMWAVEFORMAT)) - goto errCleanUp; + goto errCleanUp; - TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag); - TRACE("nChannels=%d\n", lpWaveFormat->nChannels); - TRACE("nSamplesPerSec=%d\n", lpWaveFormat->nSamplesPerSec); - TRACE("nAvgBytesPerSec=%d\n", lpWaveFormat->nAvgBytesPerSec); - TRACE("nBlockAlign=%d\n", lpWaveFormat->nBlockAlign); - TRACE("wBitsPerSample=%u !\n", lpWaveFormat->wBitsPerSample); + TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag); + TRACE("nChannels=%d\n", lpWaveFormat->nChannels); + TRACE("nSamplesPerSec=%d\n", lpWaveFormat->nSamplesPerSec); + TRACE("nAvgBytesPerSec=%d\n", lpWaveFormat->nAvgBytesPerSec); + TRACE("nBlockAlign=%d\n", lpWaveFormat->nBlockAlign); + TRACE("wBitsPerSample=%u !\n", lpWaveFormat->wBitsPerSample); /* move to end of 'fmt ' chunk */ mmioAscend(wps->hmmio, &mmckInfo, 0); mmckInfo.ckid = mmioFOURCC('d', 'a', 't', 'a'); if (mmioDescend(wps->hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) - goto errCleanUp; + goto errCleanUp; TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08X\n", - (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); + (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!s.hEvent || bPlaySoundStop) goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, - (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) - goto errCleanUp; + (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) + goto errCleanUp; /* make it so that 3 buffers per second are needed */ bufsize = (((lpWaveFormat->nAvgBytesPerSec / 3) - 1) / lpWaveFormat->nBlockAlign + 1) * - lpWaveFormat->nBlockAlign; + lpWaveFormat->nBlockAlign; waveHdr = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WAVEHDR) + 2 * bufsize); if (!waveHdr) goto errCleanUp; @@ -494,8 +494,8 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L; waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize; if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || - waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) { - goto errCleanUp; + waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) { + goto errCleanUp; } wps->hWave = hWave; @@ -503,21 +503,21 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) index = 0; do { - left = mmckInfo.cksize; + left = mmckInfo.cksize; - mmioSeek(wps->hmmio, mmckInfo.dwDataOffset, SEEK_SET); - while (left) + mmioSeek(wps->hmmio, mmckInfo.dwDataOffset, SEEK_SET); + while (left) { - if (bPlaySoundStop) + if (bPlaySoundStop) { - wps->bLoop = FALSE; - break; - } - count = mmioRead(wps->hmmio, waveHdr[index].lpData, min(bufsize, left)); - if (count < 1) break; - left -= count; - waveHdr[index].dwBufferLength = count; - if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { + wps->bLoop = FALSE; + break; + } + count = mmioRead(wps->hmmio, waveHdr[index].lpData, min(bufsize, left)); + if (count < 1) break; + left -= count; + waveHdr[index].dwBufferLength = count; + if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } @@ -526,8 +526,8 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) wps->bLoop = FALSE; break; } - } - bRet = TRUE; + } + bRet = TRUE; } while (wps->bLoop); PlaySound_WaitDone(&s); /* to balance first buffer */ @@ -589,11 +589,11 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo WINE_PLAYSOUND* wps = NULL; TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", - pszSound, hmod, fdwSound); + pszSound, hmod, fdwSound); /* SND_NOWAIT is ignored in w95/2k/xp. */ if ((fdwSound & SND_NOSTOP) && PlaySoundCurrent != NULL) - return FALSE; + return FALSE; /* alloc internal structure, if we need to play something */ if (pszSound && !(fdwSound & SND_PURGE))
1 year, 5 months
1
0
0
0
[reactos] 10/11: [WINESYNC][WINMM] Properly handle mmioRead/mmioWrite in case of errors
by Thamatip Chitpong
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b30a8a08684f9eb5f97cf…
commit b30a8a08684f9eb5f97cffcb4f36c55c85823377 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 09:32:52 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:22 2023 +0300 [WINESYNC][WINMM] Properly handle mmioRead/mmioWrite in case of errors In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52628
Wine commit: 0de8d01b09b1cc7ca34f7ae3890b4a416ff801fe author: Eric Pouech <eric.pouech(a)gmail.com> Wed, 30 Mar 2022 12:57:44 +0000 (14:57 +0200) committer: Alexandre Julliard <julliard(a)winehq.org> Fri, 1 Apr 2022 20:59:40 +0000 (22:59 +0200) --- dll/win32/winmm/mmio.c | 4 ++-- dll/win32/winmm/playsound.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dll/win32/winmm/mmio.c b/dll/win32/winmm/mmio.c index 5e86722e747..9182d3b800c 100644 --- a/dll/win32/winmm/mmio.c +++ b/dll/win32/winmm/mmio.c @@ -1161,7 +1161,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, LONG ix; ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + if (ix < 0 || ix < 2*sizeof(DWORD)) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1263,7 +1263,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %d req = %d, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index f71cbd32a21..b599073a2db 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -428,6 +428,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) LPWAVEHDR waveHdr = NULL; INT count, bufsize, left, index; struct playsound_data s; + LONG r; s.hEvent = 0; @@ -451,8 +452,9 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(wps->hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) - goto errCleanUp; + r = mmioRead(wps->hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize); + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) + goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag); TRACE("nChannels=%d\n", lpWaveFormat->nChannels);
1 year, 5 months
1
0
0
0
[reactos] 09/11: [WINESYNC][WINMM] PlaySound: Avoid a unneeded lstrlenW call
by Thamatip Chitpong
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e85c54a5c7013efc1dc18…
commit e85c54a5c7013efc1dc185fc986877facf6c2f17 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 09:17:30 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:22 2023 +0300 [WINESYNC][WINMM] PlaySound: Avoid a unneeded lstrlenW call Note that since str is a buffer it cannot be NULL. Based on Wine commit: 6a4347be371bea544e0d4a81f4cfacd29af18d6e author: Francois Gouget <fgouget(a)free.fr> Mon, 16 Sep 2019 14:01:04 +0000 (16:01 +0200) committer: Alexandre Julliard <julliard(a)winehq.org> Mon, 16 Sep 2019 20:58:42 +0000 (22:58 +0200) --- dll/win32/winmm/playsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index 7e5fb34a24a..f71cbd32a21 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -72,7 +72,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) L"", str, ARRAY_SIZE(str)); - if (lstrlenW(str) == 0) + if (!*str) goto Next; for (ptr = str; *ptr && *ptr != L','; ptr++);
1 year, 5 months
1
0
0
0
[reactos] 08/11: [WINESYNC][WINMM] sndPlaySound can play resource sounds
by Thamatip Chitpong
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53b12aaae999c0004ed9d…
commit 53b12aaae999c0004ed9d573b533b82127918a1a Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 09:10:11 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:21 2023 +0300 [WINESYNC][WINMM] sndPlaySound can play resource sounds Wine commit: 74471e857c44449a0236702b7cf8c607cf153a38 author: Aric Stewart <aric(a)codeweavers.com> Wed, 1 Apr 2015 15:11:24 +0000 (10:11 -0500) committer: Alexandre Julliard <julliard(a)winehq.org> Thu, 2 Apr 2015 05:03:35 +0000 (14:03 +0900) --- dll/win32/winmm/playsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index 27310b02fb4..7e5fb34a24a 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -656,7 +656,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSoundW, HMODULE hmod, DWORD fdwSound) */ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) { - uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE); } @@ -665,7 +665,7 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) */ BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags) { - uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE); }
1 year, 5 months
1
0
0
0
[reactos] 07/11: [WINESYNC][WINMM] Add .wav extension when searching for PlaySound
by Thamatip Chitpong
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=582d2f468456717e45227…
commit 582d2f468456717e4522724ef14ff2540ce52cd4 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 09:04:38 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:21 2023 +0300 [WINESYNC][WINMM] Add .wav extension when searching for PlaySound Wine commit: 563a4ff08ba9137dda4803a83d8937b3037fa25e author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Tue, 24 Feb 2015 16:38:47 +0000 (01:38 +0900) committer: Alexandre Julliard <julliard(a)winehq.org> Wed, 25 Feb 2015 05:17:46 +0000 (14:17 +0900) --- dll/win32/winmm/playsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index 1a13a020008..27310b02fb4 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -46,7 +46,7 @@ static HMMIO get_mmioFromFile(LPCWSTR lpszName) ret = mmioOpenW((LPWSTR)lpszName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (ret != 0) return ret; - if (SearchPathW(NULL, lpszName, NULL, ARRAY_SIZE(buf), buf, &dummy)) + if (SearchPathW(NULL, lpszName, L".wav", ARRAY_SIZE(buf), buf, &dummy)) { return mmioOpenW(buf, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
1 year, 5 months
1
0
0
0
← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
Results per page:
10
25
50
100
200