Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[hbelusca] 69854: [SHELL32]: Update French translation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 8 16:31:42 2015 New Revision: 69854 URL: http://svn.reactos.org/svn/reactos?rev=69854&view=rev Log: [SHELL32]: Update French translation. Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Nov 8 16:31:42 2015 @@ -697,11 +697,11 @@ IDS_OVERWRITEFILE_CAPTION "Confirmer l'Ã©crasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient dÃ©jÃ un dossier nommÃ© '%1'.\n\nSi les fichiers dans le dossier de destination ont les mÃªmes noms que ceux dans le\ndossier sÃ©lectionnÃ©, ils seront remplacÃ©s. Voulez-vous toujours dÃ©placer ou copier\nle dossier?" - IDS_FILEOOP_COPYING "Copying..." - IDS_FILEOOP_MOVING "Moving..." - IDS_FILEOOP_DELETING "Deleting..." - IDS_FILEOOP_FROM_TO "From %1 to %2" - IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_COPYING "Copie..." + IDS_FILEOOP_MOVING "DÃ©placement..." + IDS_FILEOOP_DELETING "Suppression..." + IDS_FILEOOP_FROM_TO "Depuis %1 vers %2" + IDS_FILEOOP_FROM "Depuis %1" IDS_FILEOOP_PREFLIGHT "Preflight" /* message box strings */ @@ -753,15 +753,15 @@ IDS_DRIVE_FIXED "Disque local" IDS_DRIVE_CDROM "CD Drive" IDS_DRIVE_NETWORK "Disque rÃ©seau" - IDS_DRIVE_FLOPPY "3.5 Floppy" - IDS_DRIVE_REMOVABLE "Removable Disk" - IDS_FS_UNKNOWN "Unknown" + IDS_DRIVE_FLOPPY "Disquette 3.5" + IDS_DRIVE_REMOVABLE "Disque amovible" + IDS_FS_UNKNOWN "Inconnu" /* Open With */ IDS_OPEN_WITH "Ouvrir avec" IDS_OPEN_WITH_CHOOSE "Choisir le programme..." IDS_OPEN_WITH_RECOMMENDED "Programmes recommandÃ©s :" - IDS_OPEN_WITH_OTHER "Auttres programmes :" + IDS_OPEN_WITH_OTHER "Autres programmes :" IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< PrÃ©cÃ©dent" @@ -818,6 +818,6 @@ IDS_EXE_DESCRIPTION "Description :" IDS_MENU_EMPTY "(Vide)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" -END + IDS_OBJECTS "%d objet(s)" + IDS_OBJECTS_SELECTED "%d objet(s) sÃ©lectionnÃ©(s)" +END

8 years, 10 months

[dreimer] 69853: [NTVDM] Update German translation

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 8 16:27:39 2015 New Revision: 69853 URL: http://svn.reactos.org/svn/reactos?rev=69853&view=rev Log: [NTVDM] Update German translation Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] Sun Nov 8 16:27:39 2015 @@ -2,8 +2,8 @@ STRINGTABLE BEGIN - IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" - IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_CAPTURE_MOUSE, "Mauszeiger &erfassen" + IDS_RELEASE_MOUSE, "Mauszeiger &freigeben" IDS_VDM_MENU , "ReactOS &VDM" END

8 years, 10 months

[dreimer] 69852: [BROWSEUI] Update German translation

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 8 16:19:56 2015 New Revision: 69852 URL: http://svn.reactos.org/svn/reactos?rev=69852&view=rev Log: [BROWSEUI] Update German translation Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sun Nov 8 16:19:56 2015 @@ -283,7 +283,7 @@ STRINGTABLE BEGIN IDS_BACK "ZurÃ¼ck zu %s" - IDS_FORWARD "Forward to %s" + IDS_FORWARD "VorwÃ¤rts zu %s" END

8 years, 10 months

[rnaumann] 69851: [BROWSEUI] Pass the Resource string directly instead of using an additional buffer. Remove the NULL characters from the strings. Fix return value handling of LoadStringW()

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Sun Nov 8 15:44:18 2015 New Revision: 69851 URL: http://svn.reactos.org/svn/reactos?rev=69851&view=rev Log: [BROWSEUI] Pass the Resource string directly instead of using an additional buffer. Remove the NULL characters from the strings. Fix return value handling of LoadStringW() Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc trunk/reactos/dll/win32/browseui/travellog.cpp Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -264,8 +264,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -282,8 +282,8 @@ STRINGTABLE BEGIN - IDS_BACK "ZurÃ¼ck zu %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "ZurÃ¼ck zu %s" + IDS_FORWARD "Forward to %s" END Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -282,8 +282,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -265,8 +265,8 @@ STRINGTABLE BEGIN - IDS_BACK "Volver a %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Volver a %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -266,8 +266,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -264,8 +264,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -272,8 +272,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -266,8 +266,8 @@ STRINGTABLE BEGIN - IDS_BACK "Ãnapoi la %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Ãnapoi la %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -266,8 +266,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -283,8 +283,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -264,8 +264,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -266,8 +266,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -284,8 +284,8 @@ STRINGTABLE BEGIN - IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward to %s\0" + IDS_BACK "Back to %s" + IDS_FORWARD "Forward to %s" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Sun Nov 8 15:44:18 2015 @@ -428,7 +428,6 @@ CTravelEntry *destinationEntry; wchar_t tempString[MAX_PATH]; wchar_t templateString[200]; - wchar_t *resourceString; HRESULT hResult; if (pwzText == NULL) @@ -443,19 +442,16 @@ return hResult; if (iOffset < 0) { - hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(), - IDS_BACK, (wchar_t*)&resourceString, 0); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + if(LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_BACK, templateString, sizeof(templateString) / sizeof(wchar_t)) == 0) + return HRESULT_FROM_WIN32(GetLastError()); } else { - hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(), - IDS_FORWARD, (wchar_t*)&resourceString, 0); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - } - wcscpy(templateString, resourceString); + if(LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_FORWARD, templateString, sizeof(templateString) / sizeof(wchar_t)) == 0) + return HRESULT_FROM_WIN32(GetLastError()); + } _snwprintf(pwzText, cchText, templateString, tempString); TRACE("CTravelLog::GetToolTipText for IUnknown punk=%p at offset=%d returning L\"%S\"\n", punk, iOffset, pwzText);

8 years, 10 months

[hbelusca] 69850: [BROWSEUI] - Apply the same fix as r69849, but for the Forward tooltip. Also it would be nice to use ATL strings to retrieve the resources & not hardcoding an extra NULL character...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 8 14:41:26 2015 New Revision: 69850 URL: http://svn.reactos.org/svn/reactos?rev=69850&view=rev Log: [BROWSEUI] - Apply the same fix as r69849, but for the Forward tooltip. Also it would be nice to use ATL strings to retrieve the resources & not hardcoding an extra NULL character inside the resource string. - Add a missing string resource in romanian RC file. Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc trunk/reactos/dll/win32/browseui/travellog.cpp Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -265,7 +265,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -283,7 +283,7 @@ STRINGTABLE BEGIN IDS_BACK "ZurÃ¼ck zu %s\0" - IDS_FORWARD "VorwÃ¤rts" + IDS_FORWARD "Forward to %s\0" END Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -283,7 +283,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -266,7 +266,7 @@ STRINGTABLE BEGIN IDS_BACK "Volver a %s\0" - IDS_FORWARD "Adelante" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -267,7 +267,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "Forward" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -265,7 +265,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "Avanti" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -273,7 +273,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "Dalej" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -267,6 +267,10 @@ STRINGTABLE BEGIN IDS_BACK "Ãnapoi la %s\0" - IDS_FORWARD "Ãnainte" -END - + IDS_FORWARD "Forward to %s\0" +END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" +END Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -267,7 +267,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -284,7 +284,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "Perpara" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -265,7 +265,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "Ä°leri" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -267,7 +267,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -285,7 +285,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s\0" - IDS_FORWARD "åè¿" + IDS_FORWARD "Forward to %s\0" END STRINGTABLE Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Sun Nov 8 14:41:26 2015 @@ -447,12 +447,15 @@ IDS_BACK, (wchar_t*)&resourceString, 0); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - wcscpy(templateString, resourceString); } else { - wcscpy(templateString, L"Forward to %s"); - } + hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_FORWARD, (wchar_t*)&resourceString, 0); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + wcscpy(templateString, resourceString); _snwprintf(pwzText, cchText, templateString, tempString); TRACE("CTravelLog::GetToolTipText for IUnknown punk=%p at offset=%d returning L\"%S\"\n", punk, iOffset, pwzText);

8 years, 10 months

[rnaumann] 69849: [BROWSEUI] Use a resource string instead of a hardcoded one for the "Back" button. Patch by Ștefan Fulea with Spanish translation by Ismael Ferreras Morezuelas. CORE-10303 Changes...

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Sun Nov 8 14:30:25 2015 New Revision: 69849 URL: http://svn.reactos.org/svn/reactos?rev=69849&view=rev Log: [BROWSEUI] Use a resource string instead of a hardcoded one for the "Back" button. Patch by Ștefan Fulea with Spanish translation by Ismael Ferreras Morezuelas. CORE-10303 Changes by me: -Add the same for Russian -Add German translation Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc trunk/reactos/dll/win32/browseui/travellog.cpp Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -264,7 +264,7 @@ STRINGTABLE BEGIN - IDS_BACK "ÐÐ°Ð·Ð°Ð´" + IDS_BACK "Back to %s\0" IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" END Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -282,7 +282,7 @@ STRINGTABLE BEGIN - IDS_BACK "ZurÃ¼ck" + IDS_BACK "ZurÃ¼ck zu %s\0" IDS_FORWARD "VorwÃ¤rts" END Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -282,7 +282,7 @@ STRINGTABLE BEGIN - IDS_BACK "Back" + IDS_BACK "Back to %s\0" IDS_FORWARD "Forward" END Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -265,7 +265,7 @@ STRINGTABLE BEGIN - IDS_BACK "AtrÃ¡s" + IDS_BACK "Volver a %s\0" IDS_FORWARD "Adelante" END Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@ STRINGTABLE BEGIN - IDS_BACK "Back" + IDS_BACK "Back to %s\0" IDS_FORWARD "Forward" END Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -264,7 +264,7 @@ STRINGTABLE BEGIN - IDS_BACK "Indietro" + IDS_BACK "Back to %s\0" IDS_FORWARD "Avanti" END Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -272,7 +272,7 @@ STRINGTABLE BEGIN - IDS_BACK "Wstecz" + IDS_BACK "Back to %s\0" IDS_FORWARD "Dalej" END Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@ STRINGTABLE BEGIN - IDS_BACK "Ãnapoi" + IDS_BACK "Ãnapoi la %s\0" IDS_FORWARD "Ãnainte" END Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@ STRINGTABLE BEGIN - IDS_BACK "ÐÐ°Ð·Ð°Ð´" + IDS_BACK "Back to %s\0" IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" END Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -283,7 +283,7 @@ STRINGTABLE BEGIN - IDS_BACK "Mrapa" + IDS_BACK "Back to %s\0" IDS_FORWARD "Perpara" END Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -264,7 +264,7 @@ STRINGTABLE BEGIN - IDS_BACK "Geri" + IDS_BACK "Back to %s\0" IDS_FORWARD "Ä°leri" END Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -266,7 +266,7 @@ STRINGTABLE BEGIN - IDS_BACK "ÐÐ°Ð·Ð°Ð´" + IDS_BACK "Back to %s\0" IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" END Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -284,7 +284,7 @@ STRINGTABLE BEGIN - IDS_BACK "åé" + IDS_BACK "Back to %s\0" IDS_FORWARD "åè¿" END Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Sun Nov 8 14:30:25 2015 @@ -428,6 +428,7 @@ CTravelEntry *destinationEntry; wchar_t tempString[MAX_PATH]; wchar_t templateString[200]; + wchar_t *resourceString; HRESULT hResult; if (pwzText == NULL) @@ -442,7 +443,11 @@ return hResult; if (iOffset < 0) { - wcscpy(templateString, L"Back to %s"); + hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(), + IDS_BACK, (wchar_t*)&resourceString, 0); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + wcscpy(templateString, resourceString); } else {

8 years, 10 months

[rnaumann] 69848: [SHELL32] improve file delete dialogs. Patch by Jared Smudde. CORE-10398 *fix some strings *change the used icons to more aappropriate

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Sun Nov 8 13:06:39 2015 New Revision: 69848 URL: http://svn.reactos.org/svn/reactos?rev=69848&view=rev Log: [SHELL32] improve file delete dialogs. Patch by Jared Smudde. CORE-10398 *fix some strings *change the used icons to more aappropriate Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/res/icons/161.ico trunk/reactos/dll/win32/shell32/res/icons/16710.ico trunk/reactos/dll/win32/shell32/res/icons/16715.ico trunk/reactos/dll/win32/shell32/res/icons/16717.ico trunk/reactos/dll/win32/shell32/res/icons/16718.ico trunk/reactos/dll/win32/shell32/res/icons/16721.ico Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -684,8 +684,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sun Nov 8 13:06:39 2015 @@ -692,8 +692,8 @@ IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" + IDS_DELETEITEM_CAPTION "Confirm File Deletion" + IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" Modified: trunk/reactos/dll/win32/shell32/res/icons/161.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/16710.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/16715.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/16717.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/16718.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/16721.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

8 years, 10 months

[rnaumann] 69847: [SHELL32] Big Icon Update by Henry Tang Ih and Jared Smudde -Fix blurry icons. -Make the icons sharper and clearer in all size. -Modified the design of some icons. -Brand new Fax ...

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Sun Nov 8 12:08:59 2015 New Revision: 69847 URL: http://svn.reactos.org/svn/reactos?rev=69847&view=rev Log: [SHELL32] Big Icon Update by Henry Tang Ih and Jared Smudde -Fix blurry icons. -Make the icons sharper and clearer in all size. -Modified the design of some icons. -Brand new Fax icons! -Remove unneeded icon sizes Things I have changed from the original patch: -Fix 2 copypasta and 1 double definition errors -Changed the icon back to the floppy one in folders.cpp and drvdefext.cpp because this would have resulted an a regression for floppy drives Added: trunk/reactos/dll/win32/shell32/res/icons/1008.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1009.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1010.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/1011.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/196.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/197.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/198.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/199.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/281.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/303.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/307.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/49.ico (with props) Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/res/icons/1001.ico trunk/reactos/dll/win32/shell32/res/icons/12.ico trunk/reactos/dll/win32/shell32/res/icons/13.ico trunk/reactos/dll/win32/shell32/res/icons/135.ico trunk/reactos/dll/win32/shell32/res/icons/137.ico trunk/reactos/dll/win32/shell32/res/icons/138.ico trunk/reactos/dll/win32/shell32/res/icons/139.ico trunk/reactos/dll/win32/shell32/res/icons/140.ico trunk/reactos/dll/win32/shell32/res/icons/141.ico trunk/reactos/dll/win32/shell32/res/icons/154.ico trunk/reactos/dll/win32/shell32/res/icons/156.ico trunk/reactos/dll/win32/shell32/res/icons/157.ico trunk/reactos/dll/win32/shell32/res/icons/161.ico trunk/reactos/dll/win32/shell32/res/icons/165.ico trunk/reactos/dll/win32/shell32/res/icons/166.ico trunk/reactos/dll/win32/shell32/res/icons/168.ico trunk/reactos/dll/win32/shell32/res/icons/169.ico trunk/reactos/dll/win32/shell32/res/icons/170.ico trunk/reactos/dll/win32/shell32/res/icons/1700.ico trunk/reactos/dll/win32/shell32/res/icons/172.ico trunk/reactos/dll/win32/shell32/res/icons/176.ico trunk/reactos/dll/win32/shell32/res/icons/178.ico trunk/reactos/dll/win32/shell32/res/icons/182.ico trunk/reactos/dll/win32/shell32/res/icons/183.ico trunk/reactos/dll/win32/shell32/res/icons/184.ico trunk/reactos/dll/win32/shell32/res/icons/185.ico trunk/reactos/dll/win32/shell32/res/icons/186.ico trunk/reactos/dll/win32/shell32/res/icons/187.ico trunk/reactos/dll/win32/shell32/res/icons/193.ico trunk/reactos/dll/win32/shell32/res/icons/194.ico trunk/reactos/dll/win32/shell32/res/icons/20.ico trunk/reactos/dll/win32/shell32/res/icons/22.ico trunk/reactos/dll/win32/shell32/res/icons/222.ico trunk/reactos/dll/win32/shell32/res/icons/223.ico trunk/reactos/dll/win32/shell32/res/icons/226.ico trunk/reactos/dll/win32/shell32/res/icons/227.ico trunk/reactos/dll/win32/shell32/res/icons/228.ico trunk/reactos/dll/win32/shell32/res/icons/229.ico trunk/reactos/dll/win32/shell32/res/icons/249.ico trunk/reactos/dll/win32/shell32/res/icons/252.ico trunk/reactos/dll/win32/shell32/res/icons/259.ico trunk/reactos/dll/win32/shell32/res/icons/263.ico trunk/reactos/dll/win32/shell32/res/icons/267.ico trunk/reactos/dll/win32/shell32/res/icons/268.ico trunk/reactos/dll/win32/shell32/res/icons/270.ico trunk/reactos/dll/win32/shell32/res/icons/271.ico trunk/reactos/dll/win32/shell32/res/icons/277.ico trunk/reactos/dll/win32/shell32/res/icons/283.ico trunk/reactos/dll/win32/shell32/res/icons/289.ico trunk/reactos/dll/win32/shell32/res/icons/29.ico trunk/reactos/dll/win32/shell32/res/icons/291.ico trunk/reactos/dll/win32/shell32/res/icons/293.ico trunk/reactos/dll/win32/shell32/res/icons/294.ico trunk/reactos/dll/win32/shell32/res/icons/295.ico trunk/reactos/dll/win32/shell32/res/icons/296.ico trunk/reactos/dll/win32/shell32/res/icons/297.ico trunk/reactos/dll/win32/shell32/res/icons/298.ico trunk/reactos/dll/win32/shell32/res/icons/30.ico trunk/reactos/dll/win32/shell32/res/icons/304.ico trunk/reactos/dll/win32/shell32/res/icons/31.ico trunk/reactos/dll/win32/shell32/res/icons/312.ico trunk/reactos/dll/win32/shell32/res/icons/313.ico trunk/reactos/dll/win32/shell32/res/icons/316.ico trunk/reactos/dll/win32/shell32/res/icons/318.ico trunk/reactos/dll/win32/shell32/res/icons/321.ico trunk/reactos/dll/win32/shell32/res/icons/326.ico trunk/reactos/dll/win32/shell32/res/icons/327.ico trunk/reactos/dll/win32/shell32/res/icons/330.ico trunk/reactos/dll/win32/shell32/res/icons/337.ico trunk/reactos/dll/win32/shell32/res/icons/36.ico trunk/reactos/dll/win32/shell32/res/icons/37.ico trunk/reactos/dll/win32/shell32/res/icons/39.ico trunk/reactos/dll/win32/shell32/res/icons/42.ico trunk/reactos/dll/win32/shell32/res/icons/43.ico trunk/reactos/dll/win32/shell32/res/icons/46.ico trunk/reactos/dll/win32/shell32/res/icons/47.ico trunk/reactos/dll/win32/shell32/res/icons/512.ico trunk/reactos/dll/win32/shell32/res/icons/6.ico trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] Sun Nov 8 12:08:59 2015 @@ -303,7 +303,7 @@ switch (DriveType) { case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; TypeStrId = IDS_DRIVE_CDROM; break; - case DRIVE_REMOVABLE: IconId = IDI_SHELL_FLOPPY; break; + case DRIVE_REMOVABLE: IconId = IDI_SHELL_3_14_FLOPPY; break; case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break; default: IconId = IDI_SHELL_DRIVE; TypeStrId = IDS_DRIVE_FIXED; } Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sun Nov 8 12:08:59 2015 @@ -289,7 +289,7 @@ switch(GetDriveTypeA(sTemp)) { case DRIVE_REMOVABLE: - icon_idx = IDI_SHELL_FLOPPY; + icon_idx = IDI_SHELL_3_14_FLOPPY; break; case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Sun Nov 8 12:08:59 2015 @@ -5,7 +5,7 @@ IDI_SHELL_FOLDER_OPEN ICON "res/icons/5.ico" IDI_SHELL_5_12_FLOPPY ICON "res/icons/6.ico" IDI_SHELL_3_14_FLOPPY ICON "res/icons/7.ico" -IDI_SHELL_FLOPPY ICON "res/icons/7.ico" +IDI_SHELL_REMOVEABLE ICON "res/icons/8.ico" IDI_SHELL_DRIVE ICON "res/icons/9.ico" IDI_SHELL_NETDRIVE ICON "res/icons/10.ico" IDI_SHELL_NETDRIVE_OFF ICON "res/icons/11.ico" @@ -46,6 +46,7 @@ IDI_SHELL_EXPLORER ICON "res/icons/46.ico" IDI_SHELL_UPDATE ICON "res/icons/47.ico" IDI_SHELL_LOCKED ICON "res/icons/48.ico" +IDI_SHELL_DISCONN ICON "res/icons/49.ico" IDI_SHELL_NOT_CONNECTED_HDD ICON "res/icons/54.ico" IDI_SHELL_MULTIPLE_FILES ICON "res/icons/133.ico" IDI_SHELL_FIND_IN_FILE ICON "res/icons/134.ico" @@ -101,7 +102,10 @@ IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico" IDI_SHELL_WEB_FOLDERS ICON "res/icons/193.ico" IDI_SHELL_SECURITY ICON "res/icons/194.ico" -/* TODO: 196.ico, 197.ico, 198.ico, 199.ico */ +IDI_SHELL_FAX ICON "res/icons/196.ico" +IDI_SHELL_FAX_OK ICON "res/icons/197.ico" +IDI_SHELL_NET_FAX_OK ICON "res/icons/198.ico" +IDI_SHELL_NET_FAX ICON "res/icons/199.ico" IDI_SHELL_NO ICON "res/icons/200.ico" IDI_SHELL_FOLDER_OPTIONS ICON "res/icons/210.ico" IDI_SHELL_USERS2 ICON "res/icons/220.ico" @@ -164,7 +168,7 @@ IDI_SHELL_TUNES ICON "res/icons/277.ico" IDI_SHELL_CMD ICON "res/icons/278.ico" IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico" -//IDI_SHELL_WINDOWS_SEARCH ICON "res/icons/281.ico" +IDI_SHELL_WINDOWS_SEARCH ICON "res/icons/281.ico" IDI_SHELL_COMPUTER_TEXT ICON "res/icons/282.ico" IDI_SHELL_OSK ICON "res/icons/283.ico" IDI_SHELL_ICON_284 ICON "res/icons/284.ico" @@ -182,10 +186,11 @@ IDI_SHELL_SERVER ICON "res/icons/300.ico" IDI_SHELL_SERVER1 ICON "res/icons/301.ico" IDI_SHELL_CD_ROM1 ICON "res/icons/302.ico" -/* TODO: 303.ico */ +IDI_SHELL_COMPACT_FLASH ICON "res/icons/303.ico" IDI_SHELL_DVD_ROM1 ICON "res/icons/304.ico" IDI_SHELL_FDD2 ICON "res/icons/305.ico" -/* TODO: 306.ico, 307.ico */ +/* TODO: 306.ico */ +IDI_SHELL_SD_MMC ICON "res/icons/307.ico" IDI_SHELL_SMART_MEDIA ICON "res/icons/308.ico" IDI_SHELL_CAMERA1 ICON "res/icons/309.ico" IDI_SHELL_PHONE ICON "res/icons/310.ico" @@ -220,7 +225,10 @@ IDI_SHELL_FILE_MOVE1 ICON "res/icons/1005.ico" IDI_SHELL_FILE_PRINT ICON "res/icons/1006.ico" IDI_SHELL_FILE_OK ICON "res/icons/1007.ico" -/* TODO: 1008.ico, 1009.ico, 1010.ico, 1011.ico */ +IDI_SHELL_PRINT_PAUSE ICON "res/icons/1008.ico" +IDI_SHELL_PRINT_PLAY ICON "res/icons/1009.ico" +IDI_SHELL_PRINT_SHARE ICON "res/icons/1010.ico" +IDI_SHELL_FAX2 ICON "res/icons/1011.ico" IDI_SHELL_SHUTDOWN2 ICON "res/icons/8240.ico" IDI_SHELL_DELETE1 ICON "res/icons/16710.ico" IDI_SHELL_DELETE2 ICON "res/icons/16715.ico" Modified: trunk/reactos/dll/win32/shell32/res/icons/1001.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/shell32/res/icons/1008.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1008.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1009.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1009.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1010.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1010.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/1011.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/1011.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/12.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/135.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/137.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/138.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/139.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/140.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/141.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/154.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/156.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/157.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/161.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/165.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/166.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/168.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/169.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/170.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/1700.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/172.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/176.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/178.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/182.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/183.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/184.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/185.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/186.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/187.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/193.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/194.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/shell32/res/icons/196.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/196.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/197.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/197.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/198.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/198.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/199.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/199.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/22.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/222.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/223.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/226.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/227.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/228.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/229.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/249.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/252.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/259.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/263.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/267.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/268.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/270.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/271.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/277.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/shell32/res/icons/281.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/281.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/283.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/289.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/29.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/291.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/293.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/294.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/295.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/296.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/297.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/298.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/30.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/shell32/res/icons/303.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/303.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/304.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/shell32/res/icons/307.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/307.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/31.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/312.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/313.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/316.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/318.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/321.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/326.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/327.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/330.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/337.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/36.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/37.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/39.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/42.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/43.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/46.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/47.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/shell32/res/icons/49.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/49.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/res/icons/512.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Nov 8 12:08:59 2015 @@ -319,7 +319,7 @@ #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6 #define IDI_SHELL_3_14_FLOPPY 7 -#define IDI_SHELL_FLOPPY 8 +#define IDI_SHELL_REMOVEABLE 8 #define IDI_SHELL_DRIVE 9 #define IDI_SHELL_NETDRIVE 10 #define IDI_SHELL_NETDRIVE_OFF 11 @@ -337,8 +337,8 @@ #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 #define IDI_SHELL_RUN 25 -#define IDI_SHELL_SLEEP 26 -#define IDI_SHELL_HARDWARE_REMOVE 27 +#define IDI_SHELL_SLEEP 26 +#define IDI_SHELL_HARDWARE_REMOVE 27 #define IDI_SHELL_SHUTDOWN 28 #define IDI_SHELL_SHARE 29 #define IDI_SHELL_SHORTCUT 30 @@ -360,6 +360,7 @@ #define IDI_SHELL_EXPLORER 46 #define IDI_SHELL_UPDATE 47 #define IDI_SHELL_LOCKED 48 +#define IDI_SHELL_DISCONN 49 #define IDI_SHELL_NOT_CONNECTED_HDD 54 #define IDI_SHELL_MULTIPLE_FILES 133 #define IDI_SHELL_FIND_IN_FILE 134 @@ -415,7 +416,10 @@ #define IDI_SHELL_FULL_RECYCLE_BIN1 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_SECURITY 194 -/* TODO: 196.ico, 197.ico, 198.ico, 199.ico */ +#define IDI_SHELL_FAX 196 +#define IDI_SHELL_FAX_OK 197 +#define IDI_SHELL_NET_FAX_OK 198 +#define IDI_SHELL_NET_FAX 199 #define IDI_SHELL_NO 200 #define IDI_SHELL_FOLDER_OPTIONS 210 #define IDI_SHELL_USERS2 220 @@ -497,10 +501,11 @@ #define IDI_SHELL_SERVER 300 #define IDI_SHELL_SERVER1 301 #define IDI_SHELL_CD_ROM1 302 -/* TODO: 303.ico */ +#define IDI_SHELL_COMPACT_FLASH 303 #define IDI_SHELL_DVD_ROM1 304 #define IDI_SHELL_FDD2 305 -/* TODO: 306.ico, 307.ico */ +/* TODO: 306.ico */ +#define IDI_SHELL_SD_MMC 307 #define IDI_SHELL_SMART_MEDIA 308 #define IDI_SHELL_CAMERA1 309 #define IDI_SHELL_PHONE 310 @@ -535,7 +540,10 @@ #define IDI_SHELL_FILE_MOVE1 1005 #define IDI_SHELL_FILE_PRINT 1006 #define IDI_SHELL_FILE_OK 1007 -/* TODO: 1008.ico, 1009.ico, 1010.ico, 1011.ico */ +#define IDI_SHELL_PRINT_PAUSE 1008 +#define IDI_SHELL_PRINT_PLAY 1009 +#define IDI_SHELL_PRINT_SHARE 1010 +#define IDI_SHELL_FAX2 1011 #define IDI_SHELL_SHUTDOWN2 8240 #define IDI_SHELL_DELETE1 16710

8 years, 10 months

[tfaber] 69846: [WIN32K:NTUSER] - Don't leak the captured string in NtUserThunkedMenuItemInfo CORE-10493

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 8 07:57:14 2015 New Revision: 69846 URL: http://svn.reactos.org/svn/reactos?rev=69846&view=rev Log: [WIN32K:NTUSER] - Don't leak the captured string in NtUserThunkedMenuItemInfo CORE-10493 Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sun Nov 8 07:57:14 2015 @@ -6216,12 +6216,12 @@ /* lpszCaption may be NULL, check for it and call RtlInitUnicodeString() if bInsert == TRUE call UserInsertMenuItem() else UserSetMenuItemInfo() */ + RtlInitEmptyUnicodeString(&lstrCaption, NULL, 0); + if (!(Menu = UserGetMenuObject(hMenu))) { RETURN(FALSE); } - - RtlInitUnicodeString(&lstrCaption, 0); /* Check if we got a Caption */ if (lpszCaption && lpszCaption->Buffer) @@ -6243,6 +6243,11 @@ RETURN( UserMenuItemInfo(Menu, uItem, fByPosition, (PROSMENUITEMINFO)lpmii, TRUE, &lstrCaption)); CLEANUP: + if (lstrCaption.Buffer) + { + ReleaseCapturedUnicodeString(&lstrCaption, UserMode); + } + TRACE("Leave NtUserThunkedMenuItemInfo, ret=%i\n",_ret_); UserLeave(); END_CLEANUP;

8 years, 10 months

[hbelusca] 69845: [NTVDM]: Fix a bug I've introduced in r69838.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 8 02:42:17 2015 New Revision: 69845 URL: http://svn.reactos.org/svn/reactos?rev=69845&view=rev Log: [NTVDM]: Fix a bug I've introduced in r69838. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sun Nov 8 02:42:17 2015 @@ -674,7 +674,8 @@ VgaConsoleDestroyTextScreen(); /* Cleanup the video data */ - TextFramebuffer = NULL; + // TextFramebuffer = NULL; + // NEVER SET the ALWAYS-SET TextFramebuffer pointer to NULL!! } /* Reset the active framebuffer */

8 years, 10 months

← Newer
1
...
35
36
37
38
39
40
41
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015