[dreimer] 42753: Sync all apps with wine 1.1.27. (reactos) This is not a 1:1 sync anymore, because Wine adds all single rc files into the makefile now and we don't support this right now. -> Reverted to old behavior and added a pragma revert line to all rc files which change the pragma for UTF8 Support. Now all Wine apps properly work again.
Author: dreimer Date: Mon Aug 17 03:42:32 2009 New Revision: 42753
URL: http://svn.reactos.org/svn/reactos?rev=42753&view=rev Log: Sync all apps with wine 1.1.27. (reactos) This is not a 1:1 sync anymore, because Wine adds all single rc files into the makefile now and we don't support this right now. -> Reverted to old behavior and added a pragma revert line to all rc files which change the pragma for UTF8 Support. Now all Wine apps properly work again.
Added: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc - copied, changed from r42072, trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/write/rsrc.rc - copied, changed from r42072, trunk/reactos/base/applications/write/rsrc.rc Removed: trunk/reactos/base/applications/write/lang/ Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild trunk/reactos/base/applications/winhlp32/De.rc trunk/reactos/base/applications/winhlp32/Fr.rc trunk/reactos/base/applications/winhlp32/It.rc trunk/reactos/base/applications/winhlp32/Ja.rc trunk/reactos/base/applications/winhlp32/Lt.rc trunk/reactos/base/applications/winhlp32/Nl.rc trunk/reactos/base/applications/winhlp32/Pt.rc trunk/reactos/base/applications/winhlp32/Rm.rc trunk/reactos/base/applications/winhlp32/Ru.rc trunk/reactos/base/applications/winhlp32/Si.rc trunk/reactos/base/applications/winhlp32/Zh.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/write/De.rc trunk/reactos/base/applications/write/Fr.rc trunk/reactos/base/applications/write/Ja.rc trunk/reactos/base/applications/write/Lt.rc trunk/reactos/base/applications/write/Ro.rc trunk/reactos/base/applications/write/Ru.rc trunk/reactos/base/applications/write/Si.rc trunk/reactos/base/applications/write/write.rbuild
Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -80,3 +80,4 @@ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
} +#pragma code_page(default)
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -81,3 +81,4 @@ \t\tque le fichier source\n\n"
} +#pragma code_page(default)
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -29,18 +29,18 @@ STRINGTABLE { STRING_INVPARMS, "Neteisingas parametrų skaiÄius - pagalba: xcopy /?\n" - STRING_INVPARM, "Neteisingas parametras '%s' - pagalba: xcopy /?\n" + STRING_INVPARM, "Neteisingas parametras â%sâ - pagalba: xcopy /?\n" STRING_PAUSE, "Spauskite <enter> kopijavimui pradÄti\n" STRING_SIMCOPY, "bus nukopijuota failų: %d\n" STRING_COPY, "nukopijuota failų: %d\n" - STRING_QISDIR, "Ar '%s' yra failas, ar katalogas,\n" \ + STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n" \ "ar paskirtis?\n" \ "(F - failas, K - katalogas)\n" STRING_SRCPROMPT,"%s? (Taip|Ne)\n" STRING_OVERWRITE,"PerraÅ¡yti %s? (Taip|Ne|Visus)\n" - STRING_COPYFAIL, "'%s' kopijavimas į '%s' nepavyko su r/c %d\n" - STRING_OPENFAIL, "Nepavyko atverti '%s'\n" - STRING_READFAIL, "Klaida skaitant '%s'\n" + STRING_COPYFAIL, "â%sâ kopijavimas į â%sâ nepavyko su r/c %d\n" + STRING_OPENFAIL, "Nepavyko atverti â%sâ\n" + STRING_READFAIL, "Klaida skaitant â%sâ\n" STRING_YES_CHAR, "T" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "V" @@ -81,3 +81,4 @@ \t\tsenesnis už Å¡altinio failÄ \n\n"
} +#pragma code_page(default)
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,6 +20,8 @@ */
#include "xcopy.h" + +#pragma code_page(65001)
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
@@ -77,3 +79,4 @@ \t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"
} +#pragma code_page(default)
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -22,26 +22,29 @@
#include "xcopy.h"
+/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE { STRING_INVPARMS, -"Íåäîïóñòèìîå ÷èñëî ïàðàìåòðîâ - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ\n\ -ïîäðîáíîãî îïèñàíèÿ.\n" +"ÐедопÑÑÑимое ÑиÑло паÑамеÑÑов - попÑобÑйÑе 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑениÑ\n\ +подÑобного опиÑаниÑ.\n" STRING_INVPARM, -"Íåäîïóñòèìûé ïàðàìåòð '%s' - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ ïîäðîáíîãî\n\ -îïèñàíèÿ.\n" - STRING_PAUSE, "Íàæìèòå êëàâèøó <enter>, ÷òîáû íà÷àòü êîïèðîâàíèå.\n" - STRING_SIMCOPY, "%d ôàéë(îâ) áûëî áû ñêîïèðîâàíî.\n" - STRING_COPY, "%d ôàéë(îâ) ñêîïèðîâàíî.\n" - STRING_QISDIR, "'%s' ÿâëÿåòñÿ ôàéëîì èëè ïàïêîé?\n" \ - "(F - Ôàéë, D - Ïàïêà)\n" +"ÐедопÑÑÑимÑй паÑамеÑÑ '%s' - попÑобÑйÑе 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñобного\n\ +опиÑаниÑ.\n" + STRING_PAUSE, "ÐажмиÑе клавиÑÑ <enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñование.\n" + STRING_SIMCOPY, "%d Ñайл(ов) бÑло Ð±Ñ ÑкопиÑовано.\n" + STRING_COPY, "%d Ñайл(ов) ÑкопиÑовано.\n" + STRING_QISDIR, "'%s' ÑвлÑеÑÑÑ Ñайлом или папкой?\n" \ + "(F - Файл, D - Ðапка)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" - STRING_OVERWRITE,"Ïåðåïèñàòü %s? (Yes|No|All)\n" - STRING_COPYFAIL, "Ïðè êîïèðîâàíèè '%s' â '%s' ïðîèçîøëà îøèáêà: %d\n" - STRING_OPENFAIL, "Íåâîçìîæíî îòêðûòü '%s'\n" - STRING_READFAIL, "Ïðè ÷òåíèè '%s' ïðîèçîøëà îøèáêà\n" + STRING_OVERWRITE,"ÐеÑепиÑаÑÑ %s? (Yes|No|All)\n" + STRING_COPYFAIL, "ÐÑи копиÑовании '%s' в '%s' пÑоизоÑла оÑибка: %d\n" + STRING_OPENFAIL, "Ðевозможно оÑкÑÑÑÑ '%s'\n" + STRING_READFAIL, "ÐÑи ÑÑении '%s' пÑоизоÑла оÑибка\n" STRING_YES_CHAR, "Y" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -49,35 +52,36 @@ STRING_DIR_CHAR, "D"
STRING_HELP, -"XCOPY - Êîïèðóåò ôàéëû è äåðåâüÿ ïàïîê\n\ +"XCOPY - ÐопиÑÑÐµÑ ÑÐ°Ð¹Ð»Ñ Ð¸ деÑевÑÑ Ð¿Ð°Ð¿Ð¾Ðº\n\ \n\ -Ñèíòàêñèñ:\n\ +СинÑакÑиÑ:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -Ãäå:\n\ +Ðде:\n\ \n\ -[/I] Åñëè êîíå÷íàÿ ïàïêà îòñóòñòâóåò è êîïèðóåòñÿ áîëåå îäíîãî ôàéëà,\n\ - òî ïðåäïîëàãàåòñÿ ïàïêà â êà÷åñòâå ìåñòà íàçíà÷åíèÿ.\n\ -[/S] Êîïèðóåò ïàïêè è ïîäïàïêè.\n\ -[/E] Êîïèðóåò ïàïêè è ïîäïàïêè, âêëþ÷àÿ ïóñòûå.\n\ -[/Q] Íå îòîáðàæàåò èìåíà êîïèðóåìûõ ôàéëîâ.\n\ -[/F] Îòîáðàæàåò ïîëíûå èìåíà èñõîäíûõ è êîíå÷íûõ ôàéëîâ.\n\ -[/L] Âûâîäèò ñïèñîê ôàéëîâ, êîòîðûå áóäóò ñêîïèðîâàíû.\n\ -[/W] Çàïðàøèâàåò ïîäòâåðæäåíèå ïåðåä íà÷àëîì êîïèðîâàíèÿ.\n\ -[/T] Ñîçäàåò ñòðóêòóðó ïàïîê, íî íå êîïèðóåò ôàéëû.\n\ -[/Y] Ïîäàâëÿåò çàïðîñ íà ïîäòâåðæäåíèå ïåðåçàïèñè ôàéëîâ.\n\ -[/-Y] Çàïðàøèâàåò ïîäòâåðæäåíèå íà ïåðåçàïèñü ôàéëîâ.\n\ -[/P] Çàïðàøèâàåò ïîäòâåðæäåíèå äëÿ êàæäîãî êîïèðóåìîãî ôàéëà.\n\ -[/N] Èñïîëüçóåò êîðîòêèå èìåíà ôàéëîâ ïðè êîïèðîâàíèè.\n\ -[/U] Êîïèðóåò òîëüêî òå ôàéëû, êîòîðûå óæå ñóùåñòâóþò â êîíå÷íîé ïàïêå.\n\ -[/R] Ïåðåçàïèñûâàåò ôàéëû, äîñòóïíûå òîëüêî äëÿ ÷òåíèÿ.\n\ -[/H] Êîïèðóåò ñêðûòûå è ñèñòåìíûå ôàéëû.\n\ -[/C] Ïðîäîëæàåò ðàáîòó, äàæå åñëè ïðîèçîøëà îøèáêà.\n\ -[/A] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò "àðõèâíûé".\n\ -[/M] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò "àðõèâíûé",\n\ - ïðè ýòîì àòðèáóò óäàëÿåòñÿ.\n\ -[/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\ - ïîñëå óêàçàííîé äàòû. Åñëè äàòà íå óêàçàíà, êîïèðóåò òîëüêî\n\ - òå ôàéëû, êîòîðûå íîâåå â èñõîäíîé ïàïêå.\n" +[/I] ÐÑли конеÑÐ½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° оÑÑÑÑÑÑвÑÐµÑ Ð¸ копиÑÑеÑÑÑ Ð±Ð¾Ð»ÐµÐµ одного Ñайла,\n\ + Ñо пÑедполагаеÑÑÑ Ð¿Ð°Ð¿ÐºÐ° в каÑеÑÑве меÑÑа назнаÑениÑ.\n\ +[/S] ÐопиÑÑÐµÑ Ð¿Ð°Ð¿ÐºÐ¸ и подпапки.\n\ +[/E] ÐопиÑÑÐµÑ Ð¿Ð°Ð¿ÐºÐ¸ и подпапки, вклÑÑÐ°Ñ Ð¿ÑÑÑÑе.\n\ +[/Q] Ðе оÑобÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð¼ÐµÐ½Ð° копиÑÑемÑÑ Ñайлов.\n\ +[/F] ÐÑобÑÐ°Ð¶Ð°ÐµÑ Ð¿Ð¾Ð»Ð½Ñе имена иÑÑ Ð¾Ð´Ð½ÑÑ Ð¸ конеÑнÑÑ Ñайлов.\n\ +[/L] ÐÑÐ²Ð¾Ð´Ð¸Ñ ÑпиÑок Ñайлов, коÑоÑÑе бÑдÑÑ ÑкопиÑованÑ.\n\ +[/W] ÐапÑаÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´ÑвеÑждение пеÑед наÑалом копиÑованиÑ.\n\ +[/T] Ð¡Ð¾Ð·Ð´Ð°ÐµÑ ÑÑÑÑкÑÑÑÑ Ð¿Ð°Ð¿Ð¾Ðº, но не копиÑÑÐµÑ ÑайлÑ.\n\ +[/Y] ÐодавлÑÐµÑ Ð·Ð°Ð¿ÑÐ¾Ñ Ð½Ð° подÑвеÑждение пеÑезапиÑи Ñайлов.\n\ +[/-Y] ÐапÑаÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´ÑвеÑждение на пеÑезапиÑÑ Ñайлов.\n\ +[/P] ÐапÑаÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´ÑвеÑждение Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ копиÑÑемого Ñайла.\n\ +[/N] ÐÑполÑзÑÐµÑ ÐºÐ¾ÑоÑкие имена Ñайлов пÑи копиÑовании.\n\ +[/U] ÐопиÑÑÐµÑ ÑолÑко Ñе ÑайлÑ, коÑоÑÑе Ñже ÑÑÑеÑÑвÑÑÑ Ð² конеÑной папке.\n\ +[/R] ÐеÑезапиÑÑÐ²Ð°ÐµÑ ÑайлÑ, доÑÑÑпнÑе ÑолÑко Ð´Ð»Ñ ÑÑениÑ.\n\ +[/H] ÐопиÑÑÐµÑ ÑкÑÑÑÑе и ÑиÑÑемнÑе ÑайлÑ.\n\ +[/C] ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑ ÑабоÑÑ, даже еÑли пÑоизоÑла оÑибка.\n\ +[/A] ÐопиÑÑÐµÑ ÑолÑко Ñе ÑайлÑ, Ð´Ð»Ñ ÐºÐ¾ÑоÑÑÑ ÑÑÑановлен аÑÑибÑÑ "аÑÑ Ð¸Ð²Ð½Ñй".\n\ +[/M] ÐопиÑÑÐµÑ ÑолÑко Ñе ÑайлÑ, Ð´Ð»Ñ ÐºÐ¾ÑоÑÑÑ ÑÑÑановлен аÑÑибÑÑ "аÑÑ Ð¸Ð²Ð½Ñй",\n\ + пÑи ÑÑом аÑÑибÑÑ ÑдалÑеÑÑÑ.\n\ +[/D | /D:m-d-y] ÐопиÑÑÐµÑ ÑолÑко новÑе ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ Ñе, коÑоÑÑе бÑли измененÑ\n\ + поÑле Ñказанной даÑÑ. ÐÑли даÑа не Ñказана, копиÑÑÐµÑ ÑолÑко\n\ + Ñе ÑайлÑ, коÑоÑÑе новее в иÑÑ Ð¾Ð´Ð½Ð¾Ð¹ папке.\n" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -80,3 +80,4 @@ \t\tod izvora\n\n"
} +#pragma code_page(default)
Copied: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (from r42072, trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -16,19 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> - #include "xcopy.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#include "Bg.rc" +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "xcopy command\0" +#define REACTOS_STR_INTERNAL_NAME "xcopy\0" +#define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe\0" +#include <reactos/version.rc> + #include "Da.rc" #include "De.rc" -#include "El.rc" #include "En.rc" #include "Fr.rc" -#include "It.rc" #include "Ko.rc" #include "Lt.rc" #include "Nl.rc"
Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/... ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -7,17 +7,6 @@ <library>user32</library> <library>kernel32</library> <file>xcopy.c</file> - <file>Da.rc</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Fr.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> + <file>rsrc.rc</file> <metadata description="xcopy command-line tool" /> </module>
Modified: trunk/reactos/base/applications/winhlp32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -97,13 +97,13 @@ STID_NOT_IMPLEMENTED, "Nicht implementiert" STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'" STID_INDEX, "&Inhalt" -STID_CONTENTS, "Summary" +STID_CONTENTS, "Zusammenfassung" STID_BACK, "&Zurück" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Breche ab." -STID_PSH_INDEX, "Help topics: " +STID_PSH_INDEX, "Hilfethemen: " }
CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -128,3 +128,4 @@ MENUITEM "Systemfarben verwenden", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Fr.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -131,3 +131,4 @@ MENUITEM "Utiliser les couleurs système", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,6 +20,8 @@ */
#include "winhelp_res.h" + +#pragma code_page(65001)
/* Menu */
@@ -87,3 +89,4 @@ STID_NO_RICHEDIT "Non è stato possibile trovare un'implementazione richedit... Annullando" STID_PSH_INDEX, "Argomenti di aiuto: " } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ja.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -128,3 +128,4 @@ MENUITEM "ã·ã¹ãã ã«ã©ã¼ã使ã", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Lt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -129,3 +129,4 @@ MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -127,3 +127,4 @@ MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Pt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -6,7 +6,8 @@ * Portuguese translation by Gustavo Junior Alves alves@correionet.com.br * Copyright 2002 Sylvain Petreolle spetreolle@yahoo.fr * Copyright 2003 Marcelo Duarte - * Copyright 2004,2007 Américo José Melo + * Copyright 2004,2007 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,8 @@ */
#include "winhelp_res.h" + +#pragma code_page(65001)
/* Menu */
@@ -65,9 +68,9 @@ } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT + MENUITEM "Sempre &visÃvel", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Sobre WINE", MNID_HELP_WINE #endif @@ -94,33 +97,49 @@ POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opções" { + POPUP "Ajuda sempre visÃvel" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE - END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Omissão", MNID_OPTS_HELP_DEFAULT + MENUITEM "VisÃvel", MNID_OPTS_HELP_VISIBLE + MENUITEM "InvisÃvel", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Histórico", MNID_OPTS_HISTORY + POPUP "Tipos de Letra" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Pequeno", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE - END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Usar cores do sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT + MENUITEM "Sempre &visÃvel", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Acerca do WINE", MNID_HELP_WINE #endif } }
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ãndice" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Procura" +{ + LTEXT "Ainda não implementado", -1, 10, 10, 180, 150 +} + /* Strings */
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -130,10 +149,10 @@ STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_INDEX, "&Conteúdo" +STID_INDEX, "&Conteúdo" STID_CONTENTS, "Summary" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os arquivos (*.*)" @@ -150,15 +169,39 @@ STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'" -STID_INDEX, "&Conteúdo" -STID_CONTENTS, "Summary" +STID_INDEX, "&Conteúdo" +STID_CONTENTS, "Sumário" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os ficheiros (*.*)" STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " -} +STID_FILE_NOT_FOUND_s "Não é possÃvel encontrar '%s'. Deseja procurar este ficheiro você mesmo?" +STID_NO_RICHEDIT "Não foi possÃvel encontrar uma implementação do richedit... A abortar" +STID_PSH_INDEX, "Tópicos de ajuda: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +BEGIN + POPUP "" + BEGIN + MENUITEM "Anotação...", MNID_CTXT_ANNOTATE + MENUITEM "Copiar", MNID_CTXT_COPY + MENUITEM "Imprimir...", MNID_CTXT_PRINT + POPUP "Tipos de letra" + BEGIN + MENUITEM "Pequeno", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + END + POPUP "Ajuda sempre visÃvel" + BEGIN + MENUITEM "Omissão", MNID_CTXT_HELP_DEFAULT + MENUITEM "VisÃvel", MNID_CTXT_HELP_VISIBLE + MENUITEM "InvisÃvel", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Usar cores do sistema", MNID_CTXT_SYSTEM_COLORS + END +END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Rm.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Rm.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -21,6 +21,8 @@ */
#include "winhelp_res.h" + +#pragma code_page(65001)
/* FIXME: This file is in the Vallader Romansh dialect and not in the official Rumantsch Grischun. */ @@ -90,3 +92,4 @@ STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" STID_PSH_INDEX, "Help topics: " } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,99 +20,105 @@
#include "winhelp_res.h"
+/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + /* Menu */
-MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { - POPUP "&Ôàéë" { - MENUITEM "&Îòêðûòü", MNID_FILE_OPEN + POPUP "&Файл" { + MENUITEM "&ÐÑкÑÑÑÑ", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòàòü", MNID_FILE_PRINT - MENUITEM "Íàñòðîéêà &ïðèíòåðà...", MNID_FILE_SETUP + MENUITEM "&ÐеÑаÑаÑÑ", MNID_FILE_PRINT + MENUITEM "ÐаÑÑÑойка &пÑинÑеÑа...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "&Âûõîä", MNID_FILE_EXIT + MENUITEM "&ÐÑÑ Ð¾Ð´", MNID_FILE_EXIT } - POPUP "&Ïðàâêà" { - MENUITEM "&Êîïèðîâàòü...", MNID_EDIT_COPYDLG + POPUP "&ÐÑавка" { + MENUITEM "&ÐопиÑоваÑÑ...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Çàìåòêè...", MNID_EDIT_ANNOTATE + MENUITEM "&ÐамеÑки...", MNID_EDIT_ANNOTATE } - POPUP "&Çàêëàäêà" { - MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE + POPUP "&Ðакладка" { + MENUITEM "&ÐпÑеделиÑÑ...", MNID_BKMK_DEFINE } - POPUP "&Íàñòðîéêè" { - POPUP "Âèäèìîñòü îêíà ñïðàâêè" + POPUP "&ÐаÑÑÑойки" { + POPUP "ÐидимоÑÑÑ Ð¾ÐºÐ½Ð° ÑпÑавки" BEGIN - MENUITEM "Ïî óìîë÷àíèþ", MNID_OPTS_HELP_DEFAULT - MENUITEM "Íàâåðõó", MNID_OPTS_HELP_VISIBLE - MENUITEM "Íå íàâåðõó", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Ðо ÑмолÑаниÑ", MNID_OPTS_HELP_DEFAULT + MENUITEM "ÐавеÑÑ Ñ", MNID_OPTS_HELP_VISIBLE + MENUITEM "Ðе навеÑÑ Ñ", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "Èñòîðèÿ", MNID_OPTS_HISTORY - POPUP "Øðèôò" + MENUITEM "ÐÑÑоÑиÑ", MNID_OPTS_HISTORY + POPUP "ШÑиÑÑ" BEGIN - MENUITEM "Ìåëêèé", MNID_OPTS_FONTS_SMALL - MENUITEM "Îáû÷íûé", MNID_OPTS_FONTS_NORMAL - MENUITEM "Êðóïíûé", MNID_OPTS_FONTS_LARGE + MENUITEM "Ðелкий", MNID_OPTS_FONTS_SMALL + MENUITEM "ÐбÑÑнÑй", MNID_OPTS_FONTS_NORMAL + MENUITEM "ÐÑÑпнÑй", MNID_OPTS_FONTS_LARGE END - MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà", MNID_OPTS_SYSTEM_COLORS + MENUITEM "ÐÑполÑзоваÑÑ ÑиÑÑемнÑе ÑвеÑа", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Ñïðàâêà" { - MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON - MENUITEM "Âñåãäà &ñâåðõó", MNID_HELP_HELPTOP + POPUP "&СпÑавка" { + MENUITEM "ÐомоÑÑ &по помоÑи", MNID_HELP_HELPON + MENUITEM "ÐÑегда &ÑвеÑÑ Ñ", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT + MENUITEM "&ÐнÑоÑмаÑиÑ...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Î Wine", MNID_HELP_WINE + MENUITEM "&Ð Wine", MNID_HELP_WINE #endif } }
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Óêàçàòåëü" +CAPTION "УказаÑелÑ" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER }
/* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "Ñïðàâêà WINE" -STID_WHERROR, "ÎØÈÁÊÀ" -STID_WARNING, "ÂÍÈÌÀÍÈÅ" -STID_INFO, "Èíôîðìàöèÿ" -STID_NOT_IMPLEMENTED, "Íå ðåàëèçîâàííî" -STID_HLPFILE_ERROR_s, "Îøèáêà ïðè ÷òåíèè ôàéëà ïîìîùè `%s'" -STID_INDEX, "&Ñîäåðæàíèå" -STID_CONTENTS, "Íà÷àëî" -STID_BACK, "&Íàçàä" -STID_ALL_FILES, "Âñå ôàéëû (*.*)" -STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)" -STID_FILE_NOT_FOUND_s "Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?" -STID_NO_RICHEDIT "Íå ìîãó íàéòè richedit" -STID_PSH_INDEX, "Ñîäåðæàíèå: " +STID_WINE_HELP, "СпÑавка WINE" +STID_WHERROR, "ÐШÐÐÐÐ" +STID_WARNING, "ÐÐÐÐÐÐÐÐ" +STID_INFO, "ÐнÑоÑмаÑиÑ" +STID_NOT_IMPLEMENTED, "Ðе Ñеализованно" +STID_HLPFILE_ERROR_s, "ÐÑибка пÑи ÑÑении Ñайла помоÑи `%s'" +STID_INDEX, "&СодеÑжание" +STID_CONTENTS, "ÐаÑало" +STID_BACK, "&Ðазад" +STID_ALL_FILES, "ÐÑе ÑÐ°Ð¹Ð»Ñ (*.*)" +STID_HELP_FILES_HLP, "Ð¤Ð°Ð¹Ð»Ñ ÑпÑавки (*.hlp)" +STID_FILE_NOT_FOUND_s "Ðе Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹Ñи '%s'. ÐÑ Ñ Ð¾ÑиÑе найÑи ÑÑÐ¾Ñ Ñайл ÑамоÑÑоÑÑелÑно?" +STID_NO_RICHEDIT "Ðе Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹Ñи richedit" +STID_PSH_INDEX, "СодеÑжание: " }
-CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "Çàìåòêè...", MNID_CTXT_ANNOTATE - MENUITEM "Êîïèðîâàòü", MNID_CTXT_COPY - MENUITEM "Ïå÷àòü...", MNID_CTXT_PRINT - POPUP "Øðèôò" + MENUITEM "ÐамеÑки...", MNID_CTXT_ANNOTATE + MENUITEM "ÐопиÑоваÑÑ", MNID_CTXT_COPY + MENUITEM "ÐеÑаÑÑ...", MNID_CTXT_PRINT + POPUP "ШÑиÑÑ" BEGIN - MENUITEM "Ìåëêèé", MNID_CTXT_FONTS_SMALL - MENUITEM "Îáû÷íûé", MNID_CTXT_FONTS_NORMAL - MENUITEM "Êðóïíûé", MNID_CTXT_FONTS_LARGE + MENUITEM "Ðелкий", MNID_CTXT_FONTS_SMALL + MENUITEM "ÐбÑÑнÑй", MNID_CTXT_FONTS_NORMAL + MENUITEM "ÐÑÑпнÑй", MNID_CTXT_FONTS_LARGE END - POPUP "Âèäèìîñòü îêíà ñïðàâêè" + POPUP "ÐидимоÑÑÑ Ð¾ÐºÐ½Ð° ÑпÑавки" BEGIN - MENUITEM "Ïî óìîë÷àíèþ", MNID_CTXT_HELP_DEFAULT - MENUITEM "Íàâåðõó", MNID_CTXT_HELP_VISIBLE - MENUITEM "Íå íàâåðõó", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "Ðо ÑмолÑаниÑ", MNID_CTXT_HELP_DEFAULT + MENUITEM "ÐавеÑÑ Ñ", MNID_CTXT_HELP_VISIBLE + MENUITEM "Ðе навеÑÑ Ñ", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà", MNID_CTXT_SYSTEM_COLORS + MENUITEM "ÐÑполÑзоваÑÑ ÑиÑÑемнÑе ÑвеÑа", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -126,3 +126,4 @@ MENUITEM "Uporabi sistemske barve", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -160,3 +160,4 @@ STID_NO_RICHEDIT "æ¾ä¸å° richedit... çµæ¢" STID_PSH_INDEX, "幫å©å §å®¹: " } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -446,10 +446,13 @@
void CALLBACK MACRO_HelpOn(void) { - LPCSTR file; - - WINE_TRACE("()\n"); - file = MACRO_CurrentWindow()->page->file->help_on_file; + WINHELP_WINDOW *win = MACRO_CurrentWindow(); + LPCSTR file = NULL; + + WINE_TRACE("()\n"); + if (win && win->page && win->page->file) + file = win->page->file->help_on_file; + if (!file) file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp";
Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -23,3 +23,28 @@
/* @makedep: winhelp.ico */ IDI_WINHELP ICON DISCARDABLE winhelp.ico + +#include "Bg.rc" +#include "Cs.rc" +#include "Da.rc" +#include "De.rc" +#include "En.rc" +#include "Es.rc" +#include "Fi.rc" +#include "Fr.rc" +#include "Hu.rc" +#include "It.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Lt.rc" +#include "Nl.rc" +#include "No.rc" +#include "Pl.rc" +#include "Pt.rc" +#include "Rm.rc" +#include "Ru.rc" +#include "Si.rc" +#include "Sk.rc" +#include "Sv.rc" +#include "Tr.rc" +#include "Zh.rc"
Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -167,7 +167,7 @@ lpszFile[0]='\0';
openfilename.lStructSize = sizeof(OPENFILENAME); - openfilename.hwndOwner = NULL; + openfilename.hwndOwner = (Globals.active_win ? Globals.active_win->hMainWnd : 0); openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = szzFilter; openfilename.lpstrCustomFilter = 0;
Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -18,28 +18,5 @@ <file>string.c</file> <file>winhelp.c</file> <file>lex.yy.c</file> - <file>Bg.rc</file> - <file>Cs.rc</file> - <file>Da.rc</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Es.rc</file> - <file>Fi.rc</file> - <file>Fr.rc</file> - <file>Hu.rc</file> - <file>It.rc</file> - <file>Ja.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Rm.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> - <file>Sk.rc</file> - <file>Sv.rc</file> - <file>Tr.rc</file> <file>rsrc.rc</file> </module>
Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/D... ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -246,3 +246,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" STRING_MAX_TAB_STOPS, "Es können nur maximal 32 Tabstopps definiert werden." END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/K... ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -180,29 +180,22 @@
STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "¸®Ä¡ ÅؽºÆ® ÆÄÀÏÇü½Ä (*.rtf)" - STRING_TEXT_FILES_TXT, "ÅؽºÆ® ÆÄÀÏ (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "À¯´ÏÄÚµå ÅؽºÆ® ¹®¼(*.txt)" - STRING_ALL_FILES, "¸ðµç ¹®¼ (*.*)" -END + STRING_ALL_FILES, "¸ðµç ¹®¼ (*.*)" + STRING_TEXT_FILES_TXT, "ÅؽºÆ® ÆÄÀÏ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "À¯´ÏÄÚµå ÅؽºÆ® ¹®¼ (*.txt)" + STRING_RICHTEXT_FILES_RTF, "¸®Ä¡ ÅؽºÆ® ÆÄÀÏÇü½Ä (*.rtf)" + STRING_NEWFILE_RICHTEXT, "¸®Ä¡ ÅؽºÆ® ¹®¼" + STRING_NEWFILE_TXT, "ÅؽºÆ® ¹®¼" + STRING_NEWFILE_TXT_UNICODE, "À¯´ÏÄÚµå ÅؽºÆ® ¹®¼" + STRING_PRINTER_FILES_PRN, "ÇÁ¸°ÅÍ ÆÄÀÏ (*.PRN)" +END +
STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "¿ÞÂÊ" STRING_ALIGN_RIGHT, "¿À¸¥ÂÊ" STRING_ALIGN_CENTER, "°¡¿îµ¥" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "¸®Ä¡ ÅؽºÆ® ¹®¼" - STRING_NEWFILE_TXT, "ÅؽºÆ® ¹®¼" - STRING_NEWFILE_TXT_UNICODE, "À¯´ÏÄÚµå ÅؽºÆ® ¹®¼" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "ÇÁ¸°ÅÍ ÆÄÀÏ (*.PRN)" END
STRINGTABLE DISCARDABLE @@ -220,10 +213,6 @@ STRING_PREVIEW_TWOPAGES, "µÎ ÆäÀÌÁö" STRING_PREVIEW_ONEPAGE, "ÇÑ ÆäÀÌÁö" STRING_PREVIEW_CLOSE, "´Ý±â" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_UNITS_CM, "cm" END
Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/N... ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -180,10 +180,14 @@
STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_ALL_FILES, "Alle documenten (*.*)" STRING_TEXT_FILES_TXT, "Tekst documenten (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekst document (*.txt)" - STRING_ALL_FILES, "Alle documenten (*.*)" + STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Rich tekst document" + STRING_NEWFILE_TXT, "Tekst document" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" + STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" END
STRINGTABLE DISCARDABLE @@ -191,18 +195,6 @@ STRING_ALIGN_LEFT, "Links" STRING_ALIGN_RIGHT, "Rechts" STRING_ALIGN_CENTER, "Gecentreerd" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich tekst document" - STRING_NEWFILE_TXT, "Tekst document" - STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/R... ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -18,78 +18,81 @@
#include "wordpad.h"
+/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE BEGIN - POPUP "&Ôàéë" - BEGIN - MENUITEM "Ñîçä&àòü...\tCtrl+N",ID_FILE_NEW - MENUITEM "&Îòêðûòü...\tCtrl+O",ID_FILE_OPEN - MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE - MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòü...\tCtrl+P", ID_PRINT - MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð...", ID_PREVIEW - MENUITEM "&Ìàêåò ñòðàíèöû...", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "Â&ûõîä", ID_FILE_EXIT - END - POPUP "&Ïðàâêà" - BEGIN - MENUITEM "&Îòìåíèòü\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Ïîâòîðèòü\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Óäàëèòü\tDEL", ID_EDIT_CLEAR - MENUITEM "Âûäåëèòü â&ñå\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "&Íàéòè...\tCrtl+F", ID_FIND - MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT - MENUITEM "&Çàìåíèòü...\tCtrl+H", ID_REPLACE - MENUITEM SEPARATOR - MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY - MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED - MENUITEM SEPARATOR - POPUP "&Äîïîëíèòåëüíî" + POPUP "&Файл" + BEGIN + MENUITEM "Созд&аÑÑ...\tCtrl+N",ID_FILE_NEW + MENUITEM "&ÐÑкÑÑÑÑ...\tCtrl+O",ID_FILE_OPEN + MENUITEM "&Ð¡Ð¾Ñ ÑаниÑÑ\tCtrl+S", ID_FILE_SAVE + MENUITEM "Ð¡Ð¾Ñ ÑаниÑÑ &как...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&ÐеÑаÑÑ...\tCtrl+P", ID_PRINT + MENUITEM "ÐÑед&ваÑиÑелÑнÑй пÑоÑмоÑÑ...", ID_PREVIEW + MENUITEM "&ÐÐ°ÐºÐµÑ ÑÑÑаниÑÑ...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Ð&ÑÑ Ð¾Ð´", ID_FILE_EXIT + END + POPUP "&ÐÑавка" + BEGIN + MENUITEM "&ÐÑмениÑÑ\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&ÐовÑоÑиÑÑ\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&ÐÑÑезаÑÑ\tCtrl+X", ID_EDIT_CUT + MENUITEM "&ÐопиÑоваÑÑ\tCtrl+C", ID_EDIT_COPY + MENUITEM "&ÐÑÑавиÑÑ\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&УдалиÑÑ\tDEL", ID_EDIT_CLEAR + MENUITEM "ÐÑделиÑÑ Ð²&Ñе\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&ÐайÑи...\tCrtl+F", ID_FIND + MENUITEM "Ðа&йÑи далее\tF3", ID_FIND_NEXT + MENUITEM "&ÐамениÑÑ...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "&ТолÑко Ð´Ð»Ñ ÑÑениÑ", ID_EDIT_READONLY + MENUITEM "&Ðзменен", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&ÐополниÑелÑно" BEGIN - MENUITEM "&Èíôîðìàöèÿ î âûäåëåíèè", ID_EDIT_SELECTIONINFO - MENUITEM "&Ôîðìàò ñèìâîëîâ", ID_EDIT_CHARFORMAT - MENUITEM "Ôîðìàò ñèìâîëîâ &ïî óìîë÷àíèþ", ID_EDIT_DEFCHARFORMAT - MENUITEM "Ôîðìàò &àáçàöà", ID_EDIT_PARAFORMAT - MENUITEM "Ï&îëó÷èòü òåêñò", ID_EDIT_GETTEXT + MENUITEM "&ÐнÑоÑмаÑÐ¸Ñ Ð¾ вÑделении", ID_EDIT_SELECTIONINFO + MENUITEM "&ФоÑÐ¼Ð°Ñ Ñимволов", ID_EDIT_CHARFORMAT + MENUITEM "ФоÑÐ¼Ð°Ñ Ñимволов &по ÑмолÑаниÑ", ID_EDIT_DEFCHARFORMAT + MENUITEM "ФоÑÐ¼Ð°Ñ &абзаÑа", ID_EDIT_PARAFORMAT + MENUITEM "Ð&олÑÑиÑÑ ÑекÑÑ", ID_EDIT_GETTEXT END END - POPUP "&Âèä" - BEGIN - MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR - MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR - MENUITEM "&Ëèíåéêà", ID_TOGGLE_RULER - MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Ïàðàìåòðû...", ID_VIEWPROPERTIES - END - POPUP "Âñò&àâêà" - BEGIN - MENUITEM "&Äàòà è âðåìÿ...", ID_DATETIME - END - POPUP "Ôîð&ìàò" - BEGIN - MENUITEM "&Øðèôò...", ID_FONTSETTINGS - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö..." ID_PARAFORMAT - MENUITEM "&Òàáóëÿöèÿ..." ID_TABSTOPS - POPUP "&Ôîí" + POPUP "&Ðид" + BEGIN + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &инÑÑÑÑменÑов", ID_TOGGLE_TOOLBAR + MENUITEM "Ð&Ð°Ð½ÐµÐ»Ñ ÑоÑмаÑиÑованиÑ", ID_TOGGLE_FORMATBAR + MENUITEM "&Ðинейка", ID_TOGGLE_RULER + MENUITEM "&СÑÑока ÑоÑÑоÑниÑ", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&ÐаÑамеÑÑÑ...", ID_VIEWPROPERTIES + END + POPUP "ÐÑÑ&авка" + BEGIN + MENUITEM "&ÐаÑа и вÑемÑ...", ID_DATETIME + END + POPUP "ФоÑ&маÑ" + BEGIN + MENUITEM "&ШÑиÑÑ...", ID_FONTSETTINGS + MENUITEM "&ÐаÑкеÑ" ID_BULLET + MENUITEM "&ÐбзаÑ..." ID_PARAFORMAT + MENUITEM "&ТабÑлÑÑиÑ..." ID_TABSTOPS + POPUP "&Фон" BEGIN - MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 - MENUITEM "&Æåëòîâàòûé PostThat\tCtrl+2", ID_BACK_2 + MENUITEM "&СиÑÑемнÑй\tCtrl+1", ID_BACK_1 + MENUITEM "&ÐелÑоваÑÑй PostThat\tCtrl+2", ID_BACK_2 END END - POPUP "&Ñïðàâêà" - BEGIN - MENUITEM "&Î Wine Wordpad" ID_ABOUT + POPUP "&СпÑавка" + BEGIN + MENUITEM "&Ð Wine Wordpad" ID_ABOUT END END
@@ -97,67 +100,67 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö..." ID_PARAFORMAT + MENUITEM "&ÐÑÑезаÑÑ\tCtrl+X", ID_EDIT_CUT + MENUITEM "&ÐопиÑоваÑÑ\tCtrl+C", ID_EDIT_COPY + MENUITEM "ÐÑÑ&авиÑÑ", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&ÐаÑкеÑ" ID_BULLET + MENUITEM "&ÐбзаÑ..." ID_PARAFORMAT END END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Äàòà è âðåìÿ" +CAPTION "ÐаÑа и вÑемÑ" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Äîñòóïíûå ôîðìàòû",-1,3,2,100,15 + LTEXT "ÐоÑÑÑпнÑе ÑоÑмаÑÑ",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - PUSHBUTTON "&ÎÊ",IDOK,87,12,40,12 - PUSHBUTTON "Î&òìåíà",IDCANCEL,87,26,40,12 + PUSHBUTTON "&ÐÐ",IDOK,87,12,40,12 + PUSHBUTTON "Ð&Ñмена",IDCANCEL,87,26,40,12 END
IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Íîâûé äîêóìåíò" +CAPTION "ÐовÑй докÑменÑ" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Òèï ñîçäàâàåìîãî äîêóìåíòà",-1,3,2,100,15 + LTEXT "Тип Ñоздаваемого докÑменÑа",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&ÎÊ",IDOK,97,12,40,12 - PUSHBUTTON "Î&òìåíà",IDCANCEL,97,26,40,12 + PUSHBUTTON "&ÐÐ",IDOK,97,12,40,12 + PUSHBUTTON "Ð&Ñмена",IDCANCEL,97,26,40,12 END
IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Àáçàö" +Caption "ÐбзаÑ" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îòñòóï", -1, 10, 10, 120, 68 - LTEXT "Ñëåâà", -1, 15, 22, 40, 13 + GROUPBOX "ÐÑÑÑÑп", -1, 10, 10, 120, 68 + LTEXT "Слева", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Ñïðàâà", -1, 15, 40, 40, 13 + LTEXT "СпÑава", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Ïåðâàÿ ñòðîêà", -1, 15, 58, 40, 13 + LTEXT "ÐеÑÐ²Ð°Ñ ÑÑÑока", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Âûðàâíèâàíèå", -1, 15, 87, 40, 13 + LTEXT "ÐÑÑавнивание", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15 - PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "&ÐÐ", IDOK, 137, 15, 50, 15 + PUSHBUTTON "Ð&Ñмена", IDCANCEL, 137, 33, 50, 15 END
IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Òàáóëÿöèÿ" +Caption "ТабÑлÑÑиÑ" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Ïîçèöèè òàáóëÿöèè", -1, 10, 10, 120, 90 + GROUPBOX "ÐозиÑии ÑабÑлÑÑии", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Óñòàíîâèòü", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "Î&÷èñòèòü", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15 - PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Î÷èñòèòü &âñå", ID_TAB_EMPTY, 137, 51, 50, 15 + DEFPUSHBUTTON "&УÑÑановиÑÑ", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "Ð&ÑиÑÑиÑÑ", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&ÐÐ", IDOK, 137, 15, 50, 15 + PUSHBUTTON "Ð&Ñмена", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "ÐÑиÑÑиÑÑ &вÑе", ID_TAB_EMPTY, 137, 51, 50, 15 END
IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -165,77 +168,78 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ïåðåíîñ ïî ñëîâàì", -1, 10, 10, 130, 85 + GROUPBOX "ÐеÑÐµÐ½Ð¾Ñ Ð¿Ð¾ Ñловам", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON " ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON " ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Ïàíåëè", -1, 150, 10, 120, 85 - CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ëèíåéêà", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 74, 80, 15 + RADIOBUTTON "РгÑаниÑÐ°Ñ &окна", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "РгÑаниÑÐ°Ñ &полей", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Ðанели", -1, 150, 10, 120, 85 + CHECKBOX "&ÐнÑÑÑÑменÑов", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&ФоÑмаÑиÑованиÑ", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Ðинейка", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&СÑÑока ÑоÑÑоÑниÑ", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END
STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Ôàéëû RTF (*.rtf)" - STRING_TEXT_FILES_TXT, "Òåêñòîâûå äîêóìåíòû (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Äîêóìåíòû Unicode (*.txt)" - STRING_ALL_FILES, "Âñå äîêóìåíòû (*.*)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Ïî ëåâîìó êðàþ" - STRING_ALIGN_RIGHT, "Ïî ïðàâîìó êðàþ" - STRING_ALIGN_CENTER, "Ïî öåíòðó" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Ôàéë RTF" - STRING_NEWFILE_TXT, "Òåêñòîâûé äîêóìåíò" - STRING_NEWFILE_TXT_UNICODE, "Äîêóìåíò â ôîðìàòå Unicode" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Ôàéëû ïðèíòåðà (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Íàñòðîéêè" - STRING_VIEWPROPS_TEXT, "Òåêñò" - STRING_VIEWPROPS_RICHTEXT, "Ôàéë RTF" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Ïå÷àòü" - STRING_PREVIEW_NEXTPAGE, "Ñëåäóþùàÿ ñòðàíèöà" - STRING_PREVIEW_PREVPAGE, "Ïðåäûäóùàÿ ñòðàíèöà" + STRING_RICHTEXT_FILES_RTF, "Ð¤Ð°Ð¹Ð»Ñ RTF (*.rtf)" + STRING_TEXT_FILES_TXT, "ТекÑÑовÑе докÑменÑÑ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "ÐокÑменÑÑ Unicode (*.txt)" + STRING_ALL_FILES, "ÐÑе докÑменÑÑ (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Ðо Ð»ÐµÐ²Ð¾Ð¼Ñ ÐºÑаÑ" + STRING_ALIGN_RIGHT, "Ðо пÑÐ°Ð²Ð¾Ð¼Ñ ÐºÑаÑ" + STRING_ALIGN_CENTER, "Ðо ÑенÑÑÑ" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Файл RTF" + STRING_NEWFILE_TXT, "ТекÑÑовÑй докÑменÑ" + STRING_NEWFILE_TXT_UNICODE, "ÐокÑÐ¼ÐµÐ½Ñ Ð² ÑоÑмаÑе Unicode" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Ð¤Ð°Ð¹Ð»Ñ Ð¿ÑинÑеÑа (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "ÐаÑÑÑойки" + STRING_VIEWPROPS_TEXT, "ТекÑÑ" + STRING_VIEWPROPS_RICHTEXT, "Файл RTF" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "ÐеÑаÑÑ" + STRING_PREVIEW_NEXTPAGE, "СледÑÑÑÐ°Ñ ÑÑÑаниÑа" + STRING_PREVIEW_PREVPAGE, "ÐÑедÑдÑÑÐ°Ñ ÑÑÑаниÑа" STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" - STRING_PREVIEW_CLOSE, "Çàêðûòü" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "ñì" + STRING_PREVIEW_CLOSE, "ÐакÑÑÑÑ" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "Ñм" END
STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Ñîõðàíèòü èçìåíåíèÿ â '%s'?" - STRING_SEARCH_FINISHED, "Ïîèñê â äîêóìåíòå çàâåðøåí." - STRING_LOAD_RICHED_FAILED, "Îøèáêà çàãðóçêè áèáëèîòåêè RichEdit." - STRING_SAVE_LOSEFORMATTING, "Ñîõðàíåíèå äîêóìåíòà â âèäå íåôîðìàòèðîâàííîãî òåêñòà, " \ - "ïðèâåäåò ê ïîòåðå ôîðìàòèðîâàíèÿ. Ïîäòâåðæäàåòå âûïîëíåíèå" \ - "ýòîé îïåðàöèè?" - STRING_INVALID_NUMBER, "Íåïðàâèëüíûé ÷èñëîâîé ôîðìàò" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage äîêóìåíòû íå ïîääåðæèâàþòñÿ" - STRING_PRINTING_NOT_IMPLEMENTED, "Ïå÷àòü íå ïîääåðæèâàåòñÿ" -END + STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾Ñ ÑаниÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" + STRING_SEARCH_FINISHED, "ÐоиÑк в докÑменÑе завеÑÑен." + STRING_LOAD_RICHED_FAILED, "ÐÑибка загÑÑзки библиоÑеки RichEdit." + STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾Ñ Ñанение докÑменÑа в виде неÑоÑмаÑиÑованного ÑекÑÑа, " \ + "пÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº поÑеÑе ÑоÑмаÑиÑованиÑ. ÐодÑвеÑждаеÑе вÑполнение" \ + "ÑÑой опеÑаÑии?" + STRING_INVALID_NUMBER, "ÐепÑавилÑнÑй ÑиÑловой ÑоÑмаÑ" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage докÑменÑÑ Ð½Ðµ поддеÑживаÑÑÑÑ" + STRING_PRINTING_NOT_IMPLEMENTED, "ÐеÑаÑÑ Ð½Ðµ поддеÑживаеÑÑÑ" +END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/S... ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -247,3 +247,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (Å¡e) ni na voljo" STRING_MAX_TAB_STOPS, "Ne morem vstaviti veÄ kot 32 položajev tabulatorja." END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Z... ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -471,3 +471,4 @@ STRING_OPEN_FAILED, "ä¸è½éåæªæ¡." STRING_OPEN_ACCESS_DENIED, "ä½ æ²æéåæªæ¡çæ¬å." END +#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/r... ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -68,6 +68,7 @@ #include "Hu.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"
Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/w... ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -52,7 +52,6 @@ /* use LoadString */ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0};
-static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0};
static const WCHAR stringFormat[] = {'%','2','d','\0'}; @@ -1867,7 +1866,7 @@ PostQuitMessage(1); }
- hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, + hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, RICHEDIT_CLASS20W, NULL, WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL|WS_HSCROLL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL);
Modified: trunk/reactos/base/applications/write/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/De.... ============================================================================== --- trunk/reactos/base/applications/write/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -27,3 +27,4 @@ { IDS_FAILED, "Der Start von Wordpad ist fehlgeschlagen" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/write/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Fr.... ============================================================================== --- trunk/reactos/base/applications/write/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Fr.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -28,3 +28,4 @@ { IDS_FAILED, "Wordpad n'a pas pu être démarré" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/write/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ja.... ============================================================================== --- trunk/reactos/base/applications/write/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Ja.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -29,3 +29,4 @@ { IDS_FAILED, "Wordpad ã®èµ·åã«å¤±æãã¾ãã" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/write/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Lt.... ============================================================================== --- trunk/reactos/base/applications/write/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Lt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -29,3 +29,4 @@ { IDS_FAILED, "Nepavyko paleisti Wordpad" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/write/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ro.... ============================================================================== --- trunk/reactos/base/applications/write/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Ro.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -27,3 +27,4 @@ { IDS_FAILED, "ExecuÈia Wordpad a eÈuat" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/write/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ru.... ============================================================================== --- trunk/reactos/base/applications/write/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,9 +20,13 @@
#include "resources.h"
+/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE { - IDS_FAILED, "Íå óäàëîñü çàïóñòèòü Wordpad" + IDS_FAILED, "Ðе ÑдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑÑ Wordpad" } +#pragma code_page(default)
Modified: trunk/reactos/base/applications/write/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Si.... ============================================================================== --- trunk/reactos/base/applications/write/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -28,3 +28,4 @@ { IDS_FAILED, "Zagon programa Wordpad ni uspel" } +#pragma code_page(default)
Copied: trunk/reactos/base/applications/write/rsrc.rc (from r42072, trunk/reactos/base/applications/write/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rsr... ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -16,27 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> -#include <winuser.h> - #include "resources.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/ja-JP.rc" -#include "lang/ko-KR.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/pt-BR.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sl-SI.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "De.rc" +#include "En.rc" +#include "Fr.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Lt.rc" +#include "Nl.rc" +#include "Pt.rc" +#include "Ro.rc" +#include "Ru.rc" +#include "Si.rc" +#include "Sv.rc"
Modified: trunk/reactos/base/applications/write/write.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/wri... ============================================================================== --- trunk/reactos/base/applications/write/write.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/write.rbuild [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -6,18 +6,5 @@ <library>gdi32</library> <library>kernel32</library> <file>write.c</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Fr.rc</file> - <file>Ja.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Ro.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> - <file>Sv.rc</file> + <file>rsrc.rc</file> </module>
-
dreimer＠svn.reactos.org