Author: akhaldi Date: Sun Jul 31 12:46:15 2016 New Revision: 72064 URL: http://svn.reactos.org/svn/reactos?rev=72064&view=rev Log: [0.4.2] * Merge the browseui work by Mark in r72063. CORE-11721
Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/es-ES.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/fr-FR.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/he-IL.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/it-IT.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pl-PL.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pt-BR.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ro-RO.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ru-RU.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/sq-AL.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/tr-TR.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/uk-UA.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-CN.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-TW.rc branches/ros-branch-0_4_2/reactos/dll/win32/browseui/resource.h branches/ros-branch-0_4_2/reactos/dll/win32/browseui/shellbrowser.cpp Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jul 31 12:46:15 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063 Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -273,3 +273,10 @@ 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 + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -292,3 +292,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Zurück|Vorwärts|Ãbergeordneter Ordner|Suchen|Ordner|Verschieben nach|Kopieren nach|Löschen|Rückgängig|Ansicht|Stop|Aktualisieren|Startseite|Netzlaufwerk verbinden|Netzlaufwerk trennen|Favoriten|Verlauf|Vollbild|Eigenschaften|Ausschneiden|Kopieren|Einfügen|Ordneroptionen||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -291,3 +291,10 @@ 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 + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/es-ES.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -275,3 +275,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Atrás|Adelante|Subir|Búsqueda|Carpetas|Mover a|Copiar a|Borrar|Deshacer|Vistas|Detener|Recargar|Inicio|Montar disco|Desconectar|Favoritos|Historial|Pantalla completa|Propiedades|Cortar|Copiar|Pegar|Opciones de carpeta||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/fr-FR.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/fr-FR.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -291,3 +291,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Retour|Avancer|Dossier parent|Recherche|Dossiers|Aller vers|Copier dans|Supprimer|Annuler|Affichage|Stop|Rafraîchir|Home|Map Drive|Déconnecter|Favoris|Historique|Plein écran|Propriétés|Couper|Copier|Coller|Options des dossiers||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Désolé" + IDS_SORRY_MESSAGE, "ReactOS ne peut pas atteindre '%s' (erreur 0x%lx).\nVeuillez vérifier qu'un navigateur web est installé." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/he-IL.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -275,3 +275,10 @@ 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 + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/it-IT.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -273,3 +273,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Indietro|Avanti|Livello superiore|Cerca|Cartelle|Sposta in|Copia in|Elimina|Annulla|Visualizza|Ferma|Aggiorna|Pagina iniziale|Mappa disco|Disconnette|Preferiti|Cronologia|Schermo intero|Proprietà |Taglia|Copia|Incolla|Opzioni cartella||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pl-PL.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -281,3 +281,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Wstecz|Dalej|W górÄ|Wyszukaj|Foldery|PrzemieÅÄ do|Kopiuj do|UsuÅ|Cofnij|Widoki|Stop|OdÅwież|Strona gÅówna|Mapa dysków|RozÅÄ cz|Ulubione|Historia|PeÅny ekran|WÅaÅciwoÅci|Wytnij|Kopiuj|Wklej|Opcje folderów||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pt-BR.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pt-BR.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -275,3 +275,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibição|Parar|Atualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Tela inteira|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ro-RO.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -275,3 +275,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Ãnapoi|Ãnainte|Sus|CÄutare|Dosare|Mutare în|Copiere în|Ètergere|Desfacere|AfiÈÄri|Oprire|ÃmprospÄtare|AcasÄ|Conectare unitate de stocare|Deconectare|Favorite|Istoric|Pe tot ecranul|ProprietÄÈi|Decupare|Copiere|Lipire|OpÈiuni de dosar||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ru-RU.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -275,3 +275,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Ðазад|ÐпеÑед|ÐвеÑÑ |ÐоиÑк|Ðапки|ÐеÑемеÑÑиÑÑ Ð²|ÐопиÑоваÑÑ Ð²|УдалиÑÑ|ÐÑмениÑÑ|Ðид|ÐÑÑановиÑÑ|ÐбновиÑÑ|Ðомой|ÐодклÑÑиÑÑ Ð´Ð¸Ñк|ÐÑклÑÑиÑÑ|ÐзбÑанное|ÐÑÑнал|Ðо веÑÑ ÑкÑан|СвойÑÑва|ÐÑÑезаÑÑ|ÐопиÑоваÑÑ|ÐÑÑавиÑÑ|СвойÑÑва папки||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/sq-AL.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -292,3 +292,10 @@ 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 + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/tr-TR.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -273,3 +273,10 @@ 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 + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/uk-UA.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -275,3 +275,10 @@ 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 + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-CN.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -293,3 +293,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|è¿å|åè¿|åä¸|æç´¢|æ件夹|移å¨å°|å¤å¶å°|å é¤|æ¤æ¶|è§å¾|åæ¢|å·æ°|é¦é¡µ|æ å°ç£ç|æå¼è¿æ¥|æ¶è夹|åå²|å ¨å±å¹|å±æ§|åªä¸|å¤å¶|è´´ä¸|æ件夹é项||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-TW.rc?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-TW.rc [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -293,3 +293,10 @@ BEGIN IDS_STANDARD_TOOLBAR, "|è¿å|åé²|åä¸|æç´¢|è³æ夾|移åå°|è¤è£½å°|åªé¤|æ¤æ¶|檢è¦|åæ¢|éæ°æ´ç|é¦é |å°æ ç£ç¢|æ·éé£ç·|æ¶è夾|æ·å²|å ¨è¢å¹|屬æ§|åªä¸|è¤è£½|è²¼ä¸|è³æ夾é¸é ||" END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "Sorry" + IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." +END Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/resource.h?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/resource.h [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -93,6 +93,7 @@ #define IDR_AUTOCOMPLETE 141 #define IDR_ACLISTISF 142 +#define IDS_LEGAL_URL 12299 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 #define IDS_SHOWTEXTLABELS 12303 @@ -105,6 +106,8 @@ #define IDS_ADDRESSBANDLABEL 12902 #define IDS_FOLDERSLABEL 12919 #define IDS_HISTORYTEXT 13169 +#define IDS_SORRY_CAPTION 14001 +#define IDS_SORRY_MESSAGE 14002 #define IDS_UP 58434 #define IDS_BACK 58689 #define IDS_FORWARD 58690 Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/shellbrowser.cpp?rev=72064&r1=72063&r2=72064&view=diff ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Jul 31 12:46:15 2016 @@ -3619,26 +3619,34 @@ LRESULT CShellBrowser::OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - /* TODO: Implement properly */ - - LPCWSTR strSite = L"https://www.reactos.org/user-faq"; - - /* TODO: Make localizable */ - LPCWSTR strCaption = L"Sorry"; - LPCWSTR strMessage = L"ReactOS could not browse to '%s' (error %d). Please make sure there is a web browser installed."; - WCHAR tmpMessage[512]; - - /* TODO: Read from the registry */ - LPCWSTR strVerb = NULL; /* default */ - LPCWSTR strPath = strSite; - LPCWSTR strParams = NULL; - - /* The return value is defined as HINSTANCE for backwards compatibility only, the cast is needed */ - int result = (int) ShellExecuteW(m_hWnd, strVerb, strPath, strParams, NULL, SW_SHOWNORMAL); - if (result <= 32) - { - StringCchPrintfW(tmpMessage, 512, strMessage, strSite, result); - MessageBoxExW(m_hWnd, tmpMessage, strCaption, MB_OK, 0); + WCHAR wszSite[256]; + HINSTANCE hResourceInstance = _AtlBaseModule.GetResourceInstance(); + + if (!LoadStringW(hResourceInstance, IDS_LEGAL_URL, wszSite, _countof(wszSite))) + StringCchCopyW(wszSite, _countof(wszSite), L"https://www.reactos.org/joining/faqs"); + + SHELLEXECUTEINFOW execInfo = { sizeof(execInfo), 0 }; + execInfo.lpVerb = L"open"; + execInfo.lpFile = wszSite; + execInfo.hwnd = m_hWnd; + execInfo.nShow = SW_SHOWNORMAL; + + if (!ShellExecuteExW(&execInfo)) + { + WCHAR wszCaption[256]; + WCHAR wszMessage[512]; + + DWORD error = GetLastError(); + + if (!LoadStringW(hResourceInstance, IDS_SORRY_MESSAGE, wszCaption, _countof(wszCaption))) + StringCchCopyW(wszCaption, _countof(wszCaption), L"ReactOS could not browse to '%s' (error 0x%lx). Please make sure there is a web browser installed."); + + StringCchPrintfW(wszMessage, _countof(wszMessage), wszCaption, wszSite, error); + + if (!LoadStringW(hResourceInstance, IDS_SORRY_CAPTION, wszCaption, _countof(wszCaption))) + StringCchCopyW(wszCaption, _countof(wszCaption), L"Sorry"); + + MessageBoxW(wszMessage, wszCaption, MB_OK); } return 0;