Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NEWDEV] Fix a truncated text
by Bișoc George 25 Jun '18

25 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23881cfcf3e153df69704… commit 23881cfcf3e153df69704c322387a90bea1af40c Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Jun 25 10:35:14 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jun 25 13:55:19 2018 +0200 [NEWDEV] Fix a truncated text --- dll/win32/newdev/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/newdev/lang/ru-RU.rc b/dll/win32/newdev/lang/ru-RU.rc index 58c38cc027..8ec2dda482 100644 --- a/dll/win32/newdev/lang/ru-RU.rc +++ b/dll/win32/newdev/lang/ru-RU.rc @@ -19,7 +19,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Мастер нового оборудования" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 26 LTEXT "Оборудование не установлено, поскольку мастер не смог найти нужного программного обеспечения.", IDC_STATIC, 120, 32, 195, 16 LTEXT "Если имеются установочные диски или известно расположение нужного программного обеспечения, нажмите кнопку ""Назад"".", IDC_STATIC, 120, 98, 195, 24 CONTROL "Больше не напоминать об установке этого драйвера.", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 @@ -30,7 +30,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Мастер нового оборудования" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 26 LTEXT "Неизвестная ошибка. Не удалось установить устройство.", IDC_STATIC, 120, 32, 195, 16 LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 12 END

1 0

01/01: [SHELL32] Fixed TRASH_CanTrashFile() sending the wrong path string to GetVolumeInformationW() (#635)
by Russell Johnson 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a683dc6d8353a27b5052… commit 6a683dc6d8353a27b5052a6ac8311d093bb3da98 Author: Russell Johnson <encrypteddata0(a)gmail.com> AuthorDate: Sun Jun 24 11:29:57 2018 -0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 20:29:57 2018 +0200 [SHELL32] Fixed TRASH_CanTrashFile() sending the wrong path string to GetVolumeInformationW() (#635) Function TRASH_CanTrashFile() would always fail because GetVolumeInformationW() requires only the base root path. The path (stored in buffer wszRootPathName) was not being stripped correctly. CORE-12340 --- dll/win32/shell32/folders/CRecycleBin.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index fb8c1d8dc1..ad80c9dbc7 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Mikolaj Zalewski * Copyright (C) 2009 Andrew Hill + * Copyright (C) 2018 Russell Johnson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -867,6 +868,11 @@ HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pd return S_OK; } +/** + * Tests whether a file can be trashed + * @param wszPath Path to the file to be trash + * @returns TRUE if the file can be trashed, FALSE otherwise + */ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { @@ -883,12 +889,12 @@ TRASH_CanTrashFile(LPCWSTR wszPath) return FALSE; } - // Only keep the base path. + // Copy and retrieve the root path from get given string WCHAR wszRootPathName[MAX_PATH]; - strcpyW(wszRootPathName, wszPath); - PathRemoveFileSpecW(wszRootPathName); - PathAddBackslashW(wszRootPathName); + StringCbCopy(wszRootPathName, sizeof(wszRootPathName), wszPath); + PathStripToRootW(wszRootPathName); + // Test to see if the drive is fixed (non removable) if (GetDriveTypeW(wszRootPathName) != DRIVE_FIXED) { /* no bitbucket on removable media */ @@ -897,7 +903,7 @@ TRASH_CanTrashFile(LPCWSTR wszPath) if (!GetVolumeInformationW(wszRootPathName, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) { - ERR("GetVolumeInformationW failed with %u\n", GetLastError()); + ERR("GetVolumeInformationW failed with %u wszRootPathName=%s\n", GetLastError(), debugstr_w(wszRootPathName)); return FALSE; }

1 0

01/01: [SHELL32] Implement Folder Options File Types 'Change' button (#629)
by Katayama Hirofumi MZ 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b1e1baa6e5544010c6b8… commit 1b1e1baa6e5544010c6b8c89d3e8a7b086ff3923 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 25 03:04:25 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 20:04:25 2018 +0200 [SHELL32] Implement Folder Options File Types 'Change' button (#629) CORE-12906 --- dll/win32/shell32/dialogs/filetypes.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index 8c00df723e..56b32cb20a 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -1704,8 +1704,10 @@ FolderOptionsFileTypesDlg( pEntry = FileTypesDlg_GetEntry(GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW)); if (pEntry) { + ZeroMemory(&Info, sizeof(Info)); Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT; - Info.pcszClass = pEntry->FileExtension; + Info.pcszFile = pEntry->FileExtension; + Info.pcszClass = NULL; SHOpenWithDialog(hwndDlg, &Info); } break;

1 0

01/01: [BROWSEUI] Re-enable the "Folder Options" menu item (#630)
by Katayama Hirofumi MZ 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e6c46a832ba7a276fe6f… commit 6e6c46a832ba7a276fe6feb1f3da524429a72e23 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 25 03:02:36 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 20:02:36 2018 +0200 [BROWSEUI] Re-enable the "Folder Options" menu item (#630) It was originally disabled in r71192 (8b77c254). CORE-11141 --- dll/win32/browseui/shellbrowser.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 7bc511b338..a0cac36427 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -3487,8 +3487,6 @@ LRESULT CShellBrowser::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, SHEnableMenuItem(theMenu, IDM_TOOLS_MAPNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_DISCONNECTNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_SYNCHRONIZE, FALSE); - FIXME("Folder options dialog is stubbed: CORE-11141\n"); - SHEnableMenuItem(theMenu, IDM_TOOLS_FOLDEROPTIONS, FALSE); // Remove when CORE-11141 is fixed. menuIndex = 4; } else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_HELP))

1 0

01/01: [SHELL32] Fix desktop.ini folder icon again (retrial of #595) (#632)
by Katayama Hirofumi MZ 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1829f5fed7fd7247e9f7d… commit 1829f5fed7fd7247e9f7da4dcfcd5c1e0057e907 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 25 02:59:03 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 19:59:03 2018 +0200 [SHELL32] Fix desktop.ini folder icon again (retrial of #595) (#632) #595 failed at non-Desktop folder. We should use ILGetDisplayNameExW instead of SHGetPathFromLDList to get path from psf and pidl. CORE-9196 --- dll/win32/shell32/folders/CFSFolder.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 6928bf13b5..77d87e6f82 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -161,7 +161,7 @@ getShellClassInfo(LPCWSTR Entry, LPWSTR pszValue, DWORD cchValueLen, LPCWSTR Ini } static HRESULT -getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, +getIconLocationForFolder(IShellFolder * psf, PCITEMID_CHILD pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { DWORD dwFileAttrs; @@ -178,14 +178,15 @@ getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, goto Quit; // get path - SHGetPathFromIDListW(pidl, wszPath); + if (!ILGetDisplayNameExW(psf, pidl, wszPath, 0)) + goto Quit; if (!PathIsDirectoryW(wszPath)) - goto Quit; + goto Quit; // read-only or system folder? - dwFileAttrs = GetFileAttributes(wszPath); + dwFileAttrs = _ILGetFileAttributes(ILFindLastID(pidl), NULL, 0); if ((dwFileAttrs & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) == 0) - goto Quit; + goto Quit; // build the full path of ini file StringCchCopyW(wszIniFullPath, _countof(wszIniFullPath), wszPath);

1 0

01/01: [TRANSLATION][WHOAMI] Add Italian resource (#626)
by Bișoc George 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5440316fa3de4723eca0… commit d5440316fa3de4723eca0cdf8a5d468a25ecd537 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Jun 24 19:49:47 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 19:49:47 2018 +0200 [TRANSLATION][WHOAMI] Add Italian resource (#626) Note: Supersedes PR #627 --- base/applications/cmdutils/whoami/lang/it-IT.rc | 64 +++++++++++++++++++++++++ base/applications/cmdutils/whoami/whoami.rc | 3 ++ 2 files changed, 67 insertions(+) diff --git a/base/applications/cmdutils/whoami/lang/it-IT.rc b/base/applications/cmdutils/whoami/lang/it-IT.rc new file mode 100644 index 0000000000..b7bc41b9ca --- /dev/null +++ b/base/applications/cmdutils/whoami/lang/it-IT.rc @@ -0,0 +1,64 @@ +/* + * PROJECT: ReactOS Whoami + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USER_HEADER "INFORMAZIONI DELL'UTENTE" + IDS_GROU_HEADER "INFORMAZIONI DEL GRUPPO" + IDS_PRIV_HEADER "INFORMAZIONI DEI PRIVILEGI" + IDS_COL_USER_NAME "Nome Utente" + IDS_COL_GROUP_NAME "Gruppo Utente" + IDS_COL_TYPE "Tipo" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "Attributi" + IDS_COL_PRIV_NAME "Nome Privilegio" + IDS_COL_DESCRIPTION "Descrizione" + IDS_COL_STATE "Stato" + IDS_TP_WELL_KNOWN_GROUP "Gruppo conosciuto" + IDS_TP_ALIAS "Alias" + IDS_TP_LABEL "Etichetta" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "Gruppo obbligatorio, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Abilitato per impostazione predefinita, " + IDS_ATTR_GROUP_ENABLED "Gruppo abilitato, " + IDS_ATTR_GROUP_OWNER "Gruppo proprietario, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "Abilitato" + IDS_STATE_DISABLED "Disabilitato" + IDS_ERROR_UPN "ERRORE: Impossibile trovare l'User Principal Name (UPN) perchè l'utente attualmente registrato\nnon è un dominio utente.\n" + IDS_ERROR_FQDN "ERRORE: Impossibile trovare un Fully Qualified Domain Name (FQDN) perchè l'utente\nattualmente registrato non è un dominio utente.\n" + IDS_ERROR_VALUEXPECTED "ERRORE: Sintassi non valida. È previsto un valore per '/fo'.\nInserisci ""WHOAMI /?"" per leggere le informazioni sull'uso.\n" + IDS_ERROR_VALUENOTALLOWED "ERRORE: Sintassi non valida. Valore '%s' non autorizzato per l'opzione '/fo'.\nInserisci ""WHOAMI /?"" per leggere le informazioni sull'uso.\n" + IDS_ERROR_1TIMES "ERRORE: Sintassi non valida. L'uso dell'opzione '%s' non è autorizzato più\n di una volta.\nInserisci ""WHOAMI /?"" per leggere le informazioni sull'uso.\n" + IDS_ERROR_INVALIDSYNTAX "ERRORE: Sintassi non valida.\nInserisci ""WHOAMI /?"" per leggere le informazioni sull'uso.\n" + IDS_ERROR_INVALIDARG "ERRORE: Argomento o opzione non valida - '%s'.\nInserisci ""WHOAMI /?"" per leggere le informazioni sull'uso.\n" + IDS_ERROR_NH_LIST "ERRORE: L'opzione /NH non può essere usata in formato LIST.\nInserisci ""WHOAMI /?"" per leggere le informazioni sull'uso.\n" + IDS_HELP "DESCRIPTION:\n\ + Mostra le informazioni di utente, gruppo e privilegi relativi ad\n\ + un account locale. Se non vengono forniti argomenti, sarà\n\ + mostrato nome e dominio dell'account attuale.\n\ +\n\ + I formati disponibili per l'opzione '/fo' sono 'csv', 'list' e 'table'.\n\ + Usa '/nh' per nascondere le intestazioni. La data è visualizzata in una tabella.\n\ +\n\ +SINTASSI:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ +\n\ +ESEMPI: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END diff --git a/base/applications/cmdutils/whoami/whoami.rc b/base/applications/cmdutils/whoami/whoami.rc index b0e3a89253..0b75f08a31 100644 --- a/base/applications/cmdutils/whoami/whoami.rc +++ b/base/applications/cmdutils/whoami/whoami.rc @@ -25,6 +25,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

01/01: [SHELL32] Implement OpenAs_RunDLLA/W (#628)
by Katayama Hirofumi MZ 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc8b2717ae8dce0fff79d… commit cc8b2717ae8dce0fff79d2b601c78d683f32027d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 25 02:46:06 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 19:46:06 2018 +0200 [SHELL32] Implement OpenAs_RunDLLA/W (#628) CORE-14751 --- dll/win32/shell32/shlexec.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index bfbec4b704..67c10f317c 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -3,6 +3,7 @@ * * Copyright 1998 Marcus Meissner * Copyright 2002 Eric Pouech + * Copyright 2018 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2288,17 +2289,32 @@ EXTERN_C HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpVerb, LPCSTR lpFil } /************************************************************************* - * OpenAs_RunDLLA [SHELL32.@] + * OpenAs_RunDLLW [SHELL32.@] */ -EXTERN_C void WINAPI OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow) +EXTERN_C void WINAPI +OpenAs_RunDLLW(HWND hwnd, HINSTANCE hinst, LPCWSTR cmdline, int cmdshow) { - FIXME("%p, %p, %s, %d\n", hwnd, hinst, debugstr_a(cmdline), cmdshow); + OPENASINFO info; + TRACE("%p, %p, %s, %d\n", hwnd, hinst, debugstr_w(cmdline), cmdshow); + + ZeroMemory(&info, sizeof(info)); + info.pcszFile = cmdline; + info.pcszClass = NULL; + info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT | OAIF_EXEC; + + SHOpenWithDialog(hwnd, &info); } /************************************************************************* - * OpenAs_RunDLLW [SHELL32.@] + * OpenAs_RunDLLA [SHELL32.@] */ -EXTERN_C void WINAPI OpenAs_RunDLLW(HWND hwnd, HINSTANCE hinst, LPCWSTR cmdline, int cmdshow) +EXTERN_C void WINAPI +OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow) { - FIXME("%p, %p, %s, %d\n", hwnd, hinst, debugstr_w(cmdline), cmdshow); + LPWSTR pszCmdLineW = NULL; + TRACE("%p, %p, %s, %d\n", hwnd, hinst, debugstr_a(cmdline), cmdshow); + + __SHCloneStrAtoW(&pszCmdLineW, cmdline); + OpenAs_RunDLLW(hwnd, hinst, pszCmdLineW, cmdshow); + SHFree(pszCmdLineW); }

1 0

01/01: [TRANSLATION][SHELL32] Update Russian translation (#633)
by Abdulganiev Rafael 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=824a52aa9954cd592df2c… commit 824a52aa9954cd592df2c9ac1af88015e2ed1f50 Author: Abdulganiev Rafael <40519766+A-Rafael(a)users.noreply.github.com> AuthorDate: Sun Jun 24 21:42:34 2018 +0400 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 24 19:42:34 2018 +0200 [TRANSLATION][SHELL32] Update Russian translation (#633) --- dll/win32/shell32/lang/ru-RU.rc | 84 ++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 1932309ecc..a14c15af4e 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1,4 +1,4 @@ -/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ +/* Translators: Kudratov Olimjon (olim98(a)bk.ru), Abdulganiev Rafael (abdulganiev.rafael[at]gmail.com) */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -81,11 +81,11 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "&Копировать сюда", IDM_COPYHERE + MENUITEM "&Переместить сюда", IDM_MOVEHERE + MENUITEM "Создать &ярлыки здесь", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Отмена", 0 END END @@ -644,53 +644,53 @@ BEGIN END IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 -CAPTION "Create New Extension" +CAPTION "Создание нового расширения" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&File Extension:", -1, 10, 10, 85, 14 + LTEXT "&Расширение файла:", -1, 10, 10, 85, 14 EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 - PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 - LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + PUSHBUTTON "<< До&полнительно", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Зарегистрированные типы файлов:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 + PUSHBUTTON "Отмена", IDCANCEL, 190, 55, 60, 14 END IDD_EDITTYPE DIALOG 0, 0, 225, 190 -CAPTION "Edit File Type" +CAPTION "Изменение типа файла" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL - PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 - LTEXT "&Actions:", -1, 5, 37, 70, 10 + PUSHBUTTON "Изменить зна&чок...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Действия:", -1, 5, 37, 70, 10 LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 - PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 - PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 - PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 - AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 - AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 - AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + PUSHBUTTON "&Создать...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Изменить...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Удалить", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "По у&молчанию", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Подтверждать открытие после &загрузки", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "&Всегда отображать расширение", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "Просматривать в том &же окне", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 + PUSHBUTTON "Отмена", IDCANCEL, 160, 170, 60, 14 END IDD_ACTION DIALOG 0, 0, 225, 95 -CAPTION "New Action" +CAPTION "Новое действие" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Action:", -1, 5, 7, 150, 10 + LTEXT "&Действие:", -1, 5, 7, 150, 10 EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL - LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + LTEXT "&Приложение, исполняющее действие:", -1, 5, 42, 150, 10 EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 - AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + PUSHBUTTON "&Обзор...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Использовать DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 + PUSHBUTTON "Отмена", IDCANCEL, 160, 40, 60, 14 END STRINGTABLE @@ -931,20 +931,20 @@ BEGIN IDS_ADVANCED_SHOW_COMP_COLOR "Отображать сжатые или зашифрованные файлы NTFS другим цветом" IDS_ADVANCED_SHOW_INFO_TIP "Отображать описание для папок и элементов рабочего стола" - IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" - IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" - IDS_NEWEXT_NEW "<New>" - IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" - IDS_NEWEXT_EXT_IN_USE "Extension is in use" - - IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" - IDS_SPECIFY_ACTION "You must specify an action." - IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." - IDS_REMOVE_ACTION "Are you sure you want to remove this action?" - IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_NEWEXT_ADVANCED_LEFT "<< До&полнительно" + IDS_NEWEXT_ADVANCED_RIGHT "До&полнительно >>" + IDS_NEWEXT_NEW "<Новый>" + IDS_NEWEXT_SPECIFY_EXT "Необходимо задать расширение." + IDS_NEWEXT_ALREADY_ASSOC "Расширение '%s' уже сопоставлено файлам типа '%s'. Удалить сопоставление '%s' с '%s' и создать для него новый тип файла?" + IDS_NEWEXT_EXT_IN_USE "Расширение уже используется" + + IDS_REMOVE_EXT "Если вы удалите регистрацию расширения имени файлов, то вы не сможете открывать соответствующие файлы двойным щелчком.\n\nВы действительно хотите удалить это расширение?" + IDS_SPECIFY_ACTION "Необходимо задать действие." + IDS_INVALID_PROGRAM "Указанная программа не найдена. Убедитесь, что имя и путь к файлу указаны правильно." + IDS_REMOVE_ACTION "Вы действительно хотите удалить это действие?" + IDS_ACTION_EXISTS "Действие '%s' уже зарегистрирован для этого типа файла. Введите другое имя и повторите попытку." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" - IDS_EDITING_ACTION "Editing action for type: " - IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." - IDS_FILE_NOT_FOUND "The file '%s' was not found." + IDS_EDITING_ACTION "Изменение действия для типа: " + IDS_NO_ICONS "Файл '%s' не содержит значков.\n\nВыберите значок из списка или укажите другой файл." + IDS_FILE_NOT_FOUND "Файл '%s' не найден." END

1 0

01/01: Add a document on the rules we should follow while managing/reviewing PRs, and link to it from CONTRIBUTING.md and CODE_OF_CONDUCT.md
by David Quintana 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23d0ec4c4a735cacb9f83… commit 23d0ec4c4a735cacb9f833808010ad5bc04c9b89 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Thu May 31 23:50:49 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 24 17:00:00 2018 +0200 Add a document on the rules we should follow while managing/reviewing PRs, and link to it from CONTRIBUTING.md and CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 4 ++++ CONTRIBUTING.md | 4 ++++ PULL_REQUEST_MANAGEMENT.md | 16 ++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 8109c09b77..dc718106c1 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,7 @@ # Code of Conduct Be respectful toward other members of the community. Don't initiate or engage in discussions that are designed to insult, inflame, attack, or incite hate/discrimination/bullying against others. Don't feed the trolls. If we detect any kind of behaviour we consider unacceptable, we reserve the right to ban, block, or remove the involved members from any or all of our communities. + +# See Also + +- [Rules for managing Pull Requests](PULL_REQUEST_MANAGEMENT.md) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 49a1837d4e..e9033d2971 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,3 +101,7 @@ Finding a good project to start with can be a challenge, because when starting o [Coverity]: https://scan.coverity.com/projects/reactos [request-coverity]: https://scan.coverity.com/memberships/new?project_id=reactos [commit template]: .gitmessage + +# See Also + +- [Rules for managing Pull Requests](PULL_REQUEST_MANAGEMENT.md) diff --git a/PULL_REQUEST_MANAGEMENT.md b/PULL_REQUEST_MANAGEMENT.md new file mode 100644 index 0000000000..8d36bb7be7 --- /dev/null +++ b/PULL_REQUEST_MANAGEMENT.md @@ -0,0 +1,16 @@ +# Rules for managing Pull Requests + +For the sake of trying to maintain an acceptable number of open but idle PRs, the following rules should be considered: +- If a PR has at least one approval, it can be merged after 1 week of waiting for additional comments. + - If the change has at least 3 approvals or you consider it trivial enough, it may be merged right away. +- If a PR stays in "changes requested" for too long, and there is no indication from the author that they are working on it, it shall be closed. + - Rule of thumb: 2 weeks for a small PR. Can be longer if the PR is large. + - The PR can be reopened at any point, if you have additional comments, or new changes have been done. +- If you require a review from a particular person, assign the PR to that person. Don't just rely on the "review requested" feature of GitHub. +- Remember that PR labels exist. You can assign an appropriate label to a pull request to designate it's scope, grab additional attention or just for extra navigation possibilities. +- Don't feel obliged to comment everything you see, just for the sake of commenting. Be it on JIRA, GitHub, or even on IRC. + +In addition, in order to avoid coming off as rude to helpful contributors, please refrain from: +- Asking the contributor to do unrelated work +- Closing without providing a reason +- Merging with the intention to rewrite that code soon after

1 0

01/01: [CMAKE] Add support for VS 15.7.1 / CL 19.14.x
by Timo Kreuzer 24 Jun '18

24 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=994eb598b334ae9d63181… commit 994eb598b334ae9d63181eb0f0fbb3828bd6eea6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 13:08:49 2018 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Jun 24 11:42:43 2018 +0200 [CMAKE] Add support for VS 15.7.1 / CL 19.14.x --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 5f3d939ef0..70b0f48211 100755 --- a/configure.cmd +++ b/configure.cmd @@ -70,6 +70,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 + cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs