Index: applications/CMakeLists.txt =================================================================== --- applications/CMakeLists.txt (rvision 56877) +++ applications/CMakeLists.txt (copie de travail) @@ -1,5 +1,5 @@ add_subdirectory(cmdutils) -#add_subdirectory(devutils) +add_subdirectory(devutils) #add_subdirectory(fraginator) #add_subdirectory(net) add_subdirectory(notevil) Index: applications/devutils/CMakeLists.txt =================================================================== --- applications/devutils/CMakeLists.txt (rvision 0) +++ applications/devutils/CMakeLists.txt (copie de travail) @@ -0,0 +1,6 @@ +#add_subdirectory(gdb2) +#add_subdirectory(gdihv) +#add_subdirectory(genguid) +#add_subdirectory(symdump) +#add_subdirectory(syscalldump) +add_subdirectory(vgafontedit) Index: applications/devutils/vgafontedit/CMakeLists.txt =================================================================== --- applications/devutils/vgafontedit/CMakeLists.txt (rvision 0) +++ applications/devutils/vgafontedit/CMakeLists.txt (copie de travail) @@ -0,0 +1,20 @@ + +set_rc_compiler() + +list(APPEND SOURCE + aboutdlg.c + editglyphdlg.c + fontboxeswnd.c + fontwnd.c + main.c + mainwnd.c + misc.c + opensave.c + vgafontedit.rc) + +add_pch(vgafontedit precomp.h) +add_executable(vgafontedit ${SOURCE}) +set_module_type(vgafontedit win32gui UNICODE) +add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) + +add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all) Index: applications/devutils/vgafontedit/editglyphdlg.c =================================================================== --- applications/devutils/vgafontedit/editglyphdlg.c (rvision 56877) +++ applications/devutils/vgafontedit/editglyphdlg.c (copie de travail) @@ -40,7 +40,7 @@ // Add the Toolbox bitmaps tbab.hInst = hInstance; tbab.nID = IDB_EDIT_GLYPH_TOOLBOX; - iBitmap = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + iBitmap = (INT)SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); AddToolboxButton(hToolbar, iBitmap + TOOLBOX_PEN, ID_TOOLBOX_PEN, TBSTATE_ENABLED | TBSTATE_CHECKED); } Index: applications/devutils/vgafontedit/lang/bg-BG.rc =================================================================== --- applications/devutils/vgafontedit/lang/bg-BG.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/bg-BG.rc (copie de travail) @@ -11,84 +11,84 @@ IDD_ABOUT DIALOGEX 10, 10, 185, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "За" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT " ", IDC_STATIC, 37, 10, 145, 10 - LTEXT " 2008 Colin Finck", IDC_STATIC, 37, 20, 145, 10 - DEFPUSHBUTTON "", IDCANCEL, 70, 44, 55, 15 + LTEXT "Шрифтовия обработчик на РеактОС", IDC_STATIC, 37, 10, 145, 10 + LTEXT "Възпроизводствено право 2008 Colin Finck", IDC_STATIC, 37, 20, 145, 10 + DEFPUSHBUTTON "Добре", IDCANCEL, 70, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " " +CAPTION "Обработка на знак" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 - DEFPUSHBUTTON "", IDOK, 48, 177, 70, 14 - PUSHBUTTON "", IDCANCEL, 125, 177, 70, 14 + DEFPUSHBUTTON "Добре", IDOK, 48, 177, 70, 14 + PUSHBUTTON "Отказ", IDCANCEL, 125, 177, 70, 14 END IDM_MAINMENU MENU BEGIN - POPUP "&" + POPUP "&Файл" BEGIN - MENUITEM "&\tCtrl+N", ID_FILE_NEW - MENUITEM "&...\tCtrl+O", ID_FILE_OPEN - MENUITEM "", ID_FILE_CLOSE + MENUITEM "&Нов\tCtrl+N", ID_FILE_NEW + MENUITEM "&Отваряне...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Затваряне", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "\tCtrl+S", ID_FILE_SAVE - MENUITEM " ...", ID_FILE_SAVE_AS + MENUITEM "Запис\tCtrl+S", ID_FILE_SAVE + MENUITEM "Запис като...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM " \tAlt+F4", ID_FILE_EXIT + MENUITEM "Изход като\tAlt+F4", ID_FILE_EXIT END - POPUP "&" + POPUP "&Обработка" BEGIN - MENUITEM "&\tCtrl+C", ID_EDIT_COPY - MENUITEM "&\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Запомняне\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Поставяне\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM " ...", ID_EDIT_GLYPH + MENUITEM "Обработка на знак...", ID_EDIT_GLYPH END - POPUP "&" + POPUP "&Прозорец" BEGIN - MENUITEM "&", ID_WINDOW_CASCADE - MENUITEM "& ", ID_WINDOW_TILE_HORZ - MENUITEM "& ", ID_WINDOW_TILE_VERT - MENUITEM "& ", ID_WINDOW_ARRANGE + MENUITEM "&Надипляне", ID_WINDOW_CASCADE + MENUITEM "&Водоравно настелване", ID_WINDOW_TILE_HORZ + MENUITEM "&Отвесно настелване", ID_WINDOW_TILE_VERT + MENUITEM "Под&реждане на значетата", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "&\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&Следващ\tCtrl+F6", ID_WINDOW_NEXT END - POPUP "&" + POPUP "Помо&щ" BEGIN - MENUITEM "&...", ID_HELP_ABOUT + MENUITEM "&За...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, " (*.bin,*.psf)|*.bin;*.psf| (*.bin)|*.bin| , 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, " (*.bin)|*.bin|" - IDS_OPENERROR, " ! ( %1!u!)" - IDS_READERROR, " ! ( %1!u!)" - IDS_WRITEERROR, " ! ( %1!u!)" - IDS_UNSUPPORTEDFORMAT, " !" - IDS_UNSUPPORTEDPSF, " PSF! 8x8, ." - IDS_DOCNAME, " %1!u!" - IDS_SAVEPROMPT, " ""%1"" , .\n\n ?" - IDS_APPTITLE, " VGA " - IDS_CLOSEEDIT, " !" + IDS_OPENFILTER, "Всички поддържани формати (*.bin,*.psf)|*.bin;*.psf|Двоичен шрифтов файл (*.bin)|*.bin|Екранен шрифт за ЛС, версия 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Двоични шрифтови файлове (*.bin)|*.bin|" + IDS_OPENERROR, "Грешка при отваряне на файла! (Грешка %1!u!)" + IDS_READERROR, "Грешка при четене на файла! (Грешка %1!u!)" + IDS_WRITEERROR, "Грешка при записване на файла! (Грешка %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Неподдържан файлов формат!" + IDS_UNSUPPORTEDPSF, "Неподдържан формат шрифт PSF! Обработчикът поддържа само шрифтове 8x8, без раширени режими." + IDS_DOCNAME, "Шрифт %1!u!" + IDS_SAVEPROMPT, "Файлът ""%1"" е променен, но не е съхранен.\n\nискате ли да го съхрнаите?" + IDS_APPTITLE, "Обработчикът на РеактОС за VGA шрифтове" + IDS_CLOSEEDIT, "Първо затворете всички прозорци за обработка!" - IDS_TOOLTIP_NEW, "" - IDS_TOOLTIP_OPEN, "" - IDS_TOOLTIP_SAVE, "" - IDS_TOOLTIP_EDIT_GLYPH, " " - IDS_TOOLTIP_COPY, "" - IDS_TOOLTIP_PASTE, "" + IDS_TOOLTIP_NEW, "Нов" + IDS_TOOLTIP_OPEN, "Отваряне" + IDS_TOOLTIP_SAVE, "Запис" + IDS_TOOLTIP_EDIT_GLYPH, "Обработка на знак" + IDS_TOOLTIP_COPY, "Запомняне" + IDS_TOOLTIP_PASTE, "Поставяне" END Index: applications/devutils/vgafontedit/lang/de-DE.rc =================================================================== --- applications/devutils/vgafontedit/lang/de-DE.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/de-DE.rc (copie de travail) @@ -38,8 +38,8 @@ POPUP "&Datei" BEGIN MENUITEM "&Neu\tStrg+N", ID_FILE_NEW - MENUITEM "&ffnen...\tStrg+O", ID_FILE_OPEN - MENUITEM "Schlieen", ID_FILE_CLOSE + MENUITEM "&Öffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "Schließen", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern unter...", ID_FILE_SAVE_AS @@ -50,19 +50,19 @@ POPUP "&Bearbeiten" BEGIN MENUITEM "Kopieren\tStrg+C", ID_EDIT_COPY - MENUITEM "Einfgen\tStrg+V", ID_EDIT_PASTE + MENUITEM "Einfügen\tStrg+V", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "Schriftzeichen bearbeiten...", ID_EDIT_GLYPH END POPUP "&Fenster" BEGIN - MENUITEM "&berlappend", ID_WINDOW_CASCADE + MENUITEM "&Überlappend", ID_WINDOW_CASCADE MENUITEM "&Horizontal teilen", ID_WINDOW_TILE_HORZ MENUITEM "&Vertikal teilen", ID_WINDOW_TILE_VERT MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "Nchs&tes\tStrg+F6", ID_WINDOW_NEXT + MENUITEM "Nächs&tes\tStrg+F6", ID_WINDOW_NEXT END POPUP "&Hilfe" @@ -73,22 +73,22 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Alle untersttzten Formate (*.bin,*.psf)|*.bin;*.psf|Binre Schriftdateien (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Binre Schriftdateien (*.bin)|*.bin|" - IDS_OPENERROR, "Fehler beim ffnen der Datei! (Fehlernummer %1!u!)" + IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binäre Schriftdateien (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Binäre Schriftdateien (*.bin)|*.bin|" + IDS_OPENERROR, "Fehler beim Öffnen der Datei! (Fehlernummer %1!u!)" IDS_READERROR, "Fehler beim Lesen der Datei! (Fehlernummer %1!u!)" IDS_WRITEERROR, "Fehler beim Schreiben der Datei! (Fehlernummer %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Nicht untersttztes Dateiformat!" - IDS_UNSUPPORTEDPSF, "Nicht untersttztes PSF-Format! Der Editor untersttzt nur Fonts im Format 8x8 ohne spezielle Modi." + IDS_UNSUPPORTEDFORMAT, "Nicht unterstütztes Dateiformat!" + IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF-Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." IDS_DOCNAME, "Font %1!u!" - IDS_SAVEPROMPT, "Die Datei ""%1"" wurde gendert.\n\nMchten Sie die nderungen speichern?" + IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" IDS_APPTITLE, "ReactOS VGA Font Editor" - IDS_CLOSEEDIT, "Bitte schlieen Sie zuerst alle offenen Bearbeitungs-Fenster!" + IDS_CLOSEEDIT, "Bitte schließen Sie zuerst alle offenen Bearbeitungs-Fenster!" IDS_TOOLTIP_NEW, "Neu" - IDS_TOOLTIP_OPEN, "ffnen" + IDS_TOOLTIP_OPEN, "Öffnen" IDS_TOOLTIP_SAVE, "Speichern" IDS_TOOLTIP_EDIT_GLYPH, "Schriftzeichen bearbeiten" IDS_TOOLTIP_COPY, "Kopieren" - IDS_TOOLTIP_PASTE, "Einfgen" + IDS_TOOLTIP_PASTE, "Einfügen" END Index: applications/devutils/vgafontedit/lang/es-ES.rc =================================================================== --- applications/devutils/vgafontedit/lang/es-ES.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/es-ES.rc (copie de travail) @@ -47,7 +47,7 @@ MENUITEM "Salir\tAlt+F4", ID_FILE_EXIT END - POPUP "&Edicin" + POPUP "&Edición" BEGIN MENUITEM "Copiar\tCtrl+C", ID_EDIT_COPY MENUITEM "Pegar\tCtrl+V", ID_EDIT_PASTE @@ -73,17 +73,17 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Todos los formatos soportados (*.bin,*.psf)|*.bin;*.psf|Archivos binarios de Fuentes (*.bin)|*.bin|Fuente de pantalla de PC Versin 1 (*.psf)|*.psf|" + IDS_OPENFILTER, "Todos los formatos soportados (*.bin,*.psf)|*.bin;*.psf|Archivos binarios de Fuentes (*.bin)|*.bin|Fuente de pantalla de PC Versión 1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Archivos binarios de Fuentes (*.bin)|*.bin|" - IDS_OPENERROR, "Error al abrir el archivo! (Error nmero %1!u!)" - IDS_READERROR, "Error al leer el archivo! (Error nmero %1!u!)" - IDS_WRITEERROR, "Error al escribir el archivo! (Error nmero %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Formato de archivo no soportado!" - IDS_UNSUPPORTEDPSF, "Formato de fuente PSF no soportado! El editor slo soporta fuentes 8x8 fonts sin modos especiales." + IDS_OPENERROR, "¡Error al abrir el archivo! (Error número %1!u!)" + IDS_READERROR, "¡Error al leer el archivo! (Error número %1!u!)" + IDS_WRITEERROR, "¡Error al escribir el archivo! (Error número %1!u!)" + IDS_UNSUPPORTEDFORMAT, "¡Formato de archivo no soportado!" + IDS_UNSUPPORTEDPSF, "¡Formato de fuente PSF no soportado! El editor sólo soporta fuentes 8x8 fonts sin modos especiales." IDS_DOCNAME, "Fuente %1!u!" - IDS_SAVEPROMPT, "El archivo ""%1"" ha sido modificado, pero no guardado.\n\nQuiere guardarlo ahora?" + IDS_SAVEPROMPT, "El archivo ""%1"" ha sido modificado, pero no guardado.\n\n¿Quiere guardarlo ahora?" IDS_APPTITLE, "ReactOS VGA Font Editor" - IDS_CLOSEEDIT, "Por favor, cierre todas las ventanas de Edicin abiertas primero!" + IDS_CLOSEEDIT, "¡Por favor, cierre todas las ventanas de Edición abiertas primero!" IDS_TOOLTIP_NEW, "Nuevo" IDS_TOOLTIP_OPEN, "Abrir" Index: applications/devutils/vgafontedit/lang/fr-FR.rc =================================================================== --- applications/devutils/vgafontedit/lang/fr-FR.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/fr-FR.rc (copie de travail) @@ -11,18 +11,18 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION " propos de" +CAPTION "À propos de" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "diteur de police VGA ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Éditeur de police VGA ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "diter le glyphe" +CAPTION "Éditer le glyphe" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -47,48 +47,48 @@ MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT END - POPUP "&dition" + POPUP "&Édition" BEGIN MENUITEM "Copier\tCtrl+C", ID_EDIT_COPY MENUITEM "Coller\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "diter le glyphe...", ID_EDIT_GLYPH + MENUITEM "Éditer le glyphe...", ID_EDIT_GLYPH END - POPUP "Fentres" + POPUP "Fenêtres" BEGIN MENUITEM "En &cascade", ID_WINDOW_CASCADE - MENUITEM "Mosaque &horizontale", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaque &verticale", ID_WINDOW_TILE_VERT - MENUITEM "&Arranger les icnes", ID_WINDOW_ARRANGE + MENUITEM "Mosaïque &horizontale", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaïque &verticale", ID_WINDOW_TILE_VERT + MENUITEM "&Arranger les icônes", ID_WINDOW_ARRANGE MENUITEM SEPARATOR MENUITEM "Suivan&te\tCtrl+F6", ID_WINDOW_NEXT END POPUP "Aide" BEGIN - MENUITEM "& propos de...", ID_HELP_ABOUT + MENUITEM "&À propos de...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, "Tous les formats supports (*.bin,*.psf)|*.bin;*.psf|Fichiers police binaires (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_OPENFILTER, "Tous les formats supportés (*.bin,*.psf)|*.bin;*.psf|Fichiers police binaires (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Fichiers police binaires (*.bin)|*.bin|" - IDS_OPENERROR, "Erreur lors de l'ouverture du fichier ! (Erreur numro %1!u!)" - IDS_READERROR, "Erreur lors de la lecture du fichier ! (Erreur numro %1!u!)" - IDS_WRITEERROR, "Erreur lors de l'criture du fichier ! (Erreur numro %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Format de fichier non support!" - IDS_UNSUPPORTEDPSF, "Format de police PSF non support ! L'diteur supporte seulement les polices 8x8 sans aucun mode spcial." + IDS_OPENERROR, "Erreur lors de l'ouverture du fichier ! (Erreur numéro %1!u!)" + IDS_READERROR, "Erreur lors de la lecture du fichier ! (Erreur numéro %1!u!)" + IDS_WRITEERROR, "Erreur lors de l'écriture du fichier ! (Erreur numéro %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Format de fichier non supporté!" + IDS_UNSUPPORTEDPSF, "Format de police PSF non supporté ! L'éditeur supporte seulement les polices 8x8 sans aucun mode spécial." IDS_DOCNAME, "Police %1!u!" - IDS_SAVEPROMPT, "Le fichier ""%1"" a t modifi mais pas enregistr.\n\nVoulez-vous l'enregistrer ?" - IDS_APPTITLE, "diteur de police VGA ReactOS" - IDS_CLOSEEDIT, "Veuillez d'abord fermer toutes les fentres d'dition !" + IDS_SAVEPROMPT, "Le fichier ""%1"" a été modifié mais pas enregistré.\n\nVoulez-vous l'enregistrer ?" + IDS_APPTITLE, "Éditeur de police VGA ReactOS" + IDS_CLOSEEDIT, "Veuillez d'abord fermer toutes les fenêtres d'édition !" IDS_TOOLTIP_NEW, "Nouveau" IDS_TOOLTIP_OPEN, "Ouvrir" IDS_TOOLTIP_SAVE, "Enregistrer" - IDS_TOOLTIP_EDIT_GLYPH, "diter le glyphe" + IDS_TOOLTIP_EDIT_GLYPH, "Éditer le glyphe" IDS_TOOLTIP_COPY, "Copier" IDS_TOOLTIP_PASTE, "Coller" END Index: applications/devutils/vgafontedit/lang/it-IT.rc =================================================================== --- applications/devutils/vgafontedit/lang/it-IT.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/it-IT.rc (copie de travail) @@ -81,7 +81,7 @@ IDS_UNSUPPORTEDFORMAT, "Formato non supportato!" IDS_UNSUPPORTEDPSF, "Formato font PSF non supportato! L'editor supporta esclusivamente i font 8x8 senza modi speciali." IDS_DOCNAME, "Font %1!u!" - IDS_SAVEPROMPT, "Il file ""%1"" stato modificato, ma non salvato.\n\nVolete salvarlo ora?" + IDS_SAVEPROMPT, "Il file ""%1"" è stato modificato, ma non salvato.\n\nVolete salvarlo ora?" IDS_APPTITLE, "ReactOS VGA Font Editor" IDS_CLOSEEDIT, "Prima chiudere tutte le finestre di Edit!" Index: applications/devutils/vgafontedit/lang/no-NO.rc =================================================================== --- applications/devutils/vgafontedit/lang/no-NO.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/no-NO.rc (copie de travail) @@ -38,7 +38,7 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW - MENUITEM "&pne...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN MENUITEM "Lukk", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Lagre\tCtrl+S", ID_FILE_SAVE @@ -73,20 +73,20 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Alle stttet formater (*.bin,*.psf)|*.bin;*.psf|Binre skrifttype filer (*.bin)|*.bin|PC skjerm skrifttype versjon 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Binre skrifttype filer (*.bin)|*.bin|" - IDS_OPENERROR, "Feil med pne filen! (Feil nummer %1!u!)" - IDS_READERROR, "Feil med lese filen! (Feil nummer %1!u!)" - IDS_WRITEERROR, "Feil med lagre filen! (Feil nummer %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Filformatet er ikke stttet!" - IDS_UNSUPPORTEDPSF, "Ikke stttet PSF filformat/skriftformat! Programmet sttter bare 8x8 skrift med ingen spesielle modus." + IDS_OPENFILTER, "Alle støttet formater (*.bin,*.psf)|*.bin;*.psf|Binære skrifttype filer (*.bin)|*.bin|PC skjerm skrifttype versjon 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Binære skrifttype filer (*.bin)|*.bin|" + IDS_OPENERROR, "Feil med å åpne filen! (Feil nummer %1!u!)" + IDS_READERROR, "Feil med å lese filen! (Feil nummer %1!u!)" + IDS_WRITEERROR, "Feil med å lagre filen! (Feil nummer %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Filformatet er ikke støttet!" + IDS_UNSUPPORTEDPSF, "Ikke støttet PSF filformat/skriftformat! Programmet støtter bare 8x8 skrift med ingen spesielle modus." IDS_DOCNAME, "Skrifttype %1!u!" IDS_SAVEPROMPT, "Filen ""%1"" har blitt endret, men har ikke blitt lagret.\n\nVil du lagre denne?" IDS_APPTITLE, "ReactOS VGA Skriftredigering" - IDS_CLOSEEDIT, "Vennligst lukk alle pne vinduer frst!" + IDS_CLOSEEDIT, "Vennligst lukk alle åpne vinduer først!" IDS_TOOLTIP_NEW, "Ny" - IDS_TOOLTIP_OPEN, "pne" + IDS_TOOLTIP_OPEN, "Åpne" IDS_TOOLTIP_SAVE, "Lagre" IDS_TOOLTIP_EDIT_GLYPH, "Rediger Glyph" IDS_TOOLTIP_COPY, "Kopier" Index: applications/devutils/vgafontedit/lang/pl-PL.rc =================================================================== --- applications/devutils/vgafontedit/lang/pl-PL.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/pl-PL.rc (copie de travail) @@ -22,7 +22,7 @@ IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Edycja Glifw" +CAPTION "Edycja Glifów" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -38,13 +38,13 @@ POPUP "&Plik" BEGIN MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW - MENUITEM "&Otwrz.\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Otwórz.\tCtrl+O", ID_FILE_OPEN MENUITEM "Zamknij", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Zapisz\tCtrl+S", ID_FILE_SAVE MENUITEM "Zapisz jako", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Wyjd\tAlt+F4", ID_FILE_EXIT + MENUITEM "Wyjdź\tAlt+F4", ID_FILE_EXIT END POPUP "&Edit" @@ -60,9 +60,9 @@ MENUITEM "&Kaskadowo", ID_WINDOW_CASCADE MENUITEM "Ustaw &poziomo", ID_WINDOW_TILE_HORZ MENUITEM "Ustaw pio&nowo", ID_WINDOW_TILE_VERT - MENUITEM "&Uporzdkuj ikony", ID_WINDOW_ARRANGE + MENUITEM "&Uporządkuj ikony", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "Nas&tpne\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "Nas&tępne\tCtrl+F6", ID_WINDOW_NEXT END POPUP "&Pomoc" @@ -73,20 +73,20 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Wszystkie obsugiwane (*.bin,*.psf)|*.bin;*.psf|Czcionki binarne (*.bin)|*.bin|Czcionki PSF V1 (*.psf)|*.psf|" + IDS_OPENFILTER, "Wszystkie obsługiwane (*.bin,*.psf)|*.bin;*.psf|Czcionki binarne (*.bin)|*.bin|Czcionki PSF V1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Czcionki binarne (*.bin)|*.bin|" - IDS_OPENERROR, "Bd poczas otwierania pliku! (Bd nr. %1!u!)" - IDS_READERROR, "Bd poczas wczytywania pliku! (Bd nr. %1!u!)" - IDS_WRITEERROR, "Bd podczas zapisu do pliku! (Bd nr. %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Nieobsugiwany format czcionki!" - IDS_UNSUPPORTEDPSF, "Nieobsugiwana wersja PSF! Edytor obsuguje wycznie czcionki rozmiaru 8x8, bez dodatkw." + IDS_OPENERROR, "Błąd poczas otwierania pliku! (Błąd nr. %1!u!)" + IDS_READERROR, "Błąd poczas wczytywania pliku! (Błąd nr. %1!u!)" + IDS_WRITEERROR, "Błąd podczas zapisu do pliku! (Błąd nr. %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Nieobsługiwany format czcionki!" + IDS_UNSUPPORTEDPSF, "Nieobsługiwana wersja PSF! Edytor obsługuje wyłącznie czcionki rozmiaru 8x8, bez dodatków." IDS_DOCNAME, "Czcionka %1!u!" - IDS_SAVEPROMPT, "Plik ""%1"" zosta zmieniony, ale nie zapisany.\n\nCzy chcesz zapisa zmiany?" + IDS_SAVEPROMPT, "Plik ""%1"" został zmieniony, ale nie zapisany.\n\nCzy chcesz zapisać zmiany?" IDS_APPTITLE, "Edytor czcionek VGA dla ReactOS" - IDS_CLOSEEDIT, "Prosz najpierw zamkn wszystkie okna Edycji!" + IDS_CLOSEEDIT, "Proszę najpierw zamknąć wszystkie okna Edycji!" IDS_TOOLTIP_NEW, "Nowy" - IDS_TOOLTIP_OPEN, "Otwrz" + IDS_TOOLTIP_OPEN, "Otwórz" IDS_TOOLTIP_SAVE, "Zapisz" IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify" IDS_TOOLTIP_COPY, "Copy" Index: applications/devutils/vgafontedit/lang/ru-RU.rc =================================================================== --- applications/devutils/vgafontedit/lang/ru-RU.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/ru-RU.rc (copie de travail) @@ -11,18 +11,18 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION " " +CAPTION "О программе" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT " VGA- ReactOS", IDC_STATIC, 37, 10, 93, 10 - LTEXT " 2008 ", IDC_STATIC, 37, 20, 93, 17 + LTEXT "Редактор VGA-шрифтов ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Авторские права 2008 Колин Финк", IDC_STATIC, 37, 20, 93, 17 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " " +CAPTION "Редактирование символа" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -30,65 +30,65 @@ CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 - PUSHBUTTON "", IDCANCEL, 125, 177, 70, 14 + PUSHBUTTON "Отмена", IDCANCEL, 125, 177, 70, 14 END IDM_MAINMENU MENU BEGIN - POPUP "&" + POPUP "&Файл" BEGIN - MENUITEM "&\tCtrl+N", ID_FILE_NEW - MENUITEM "&...\tCtrl+O", ID_FILE_OPEN - MENUITEM "", ID_FILE_CLOSE + MENUITEM "&Новый\tCtrl+N", ID_FILE_NEW + MENUITEM "&Открыть...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Закрыть", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "\tCtrl+S", ID_FILE_SAVE - MENUITEM " ...", ID_FILE_SAVE_AS + MENUITEM "Сохранить\tCtrl+S", ID_FILE_SAVE + MENUITEM "Сохранить как...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "\tAlt+F4", ID_FILE_EXIT + MENUITEM "Выход\tAlt+F4", ID_FILE_EXIT END - POPUP "&" + POPUP "&Правка" BEGIN - MENUITEM "\tCtrl+C", ID_EDIT_COPY - MENUITEM "\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Копировать\tCtrl+C", ID_EDIT_COPY + MENUITEM "Вставить\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM " ...", ID_EDIT_GLYPH + MENUITEM "Изменить символ...", ID_EDIT_GLYPH END - POPUP "&" + POPUP "&Окна" BEGIN - MENUITEM "&", ID_WINDOW_CASCADE - MENUITEM "& ", ID_WINDOW_TILE_HORZ - MENUITEM "& ", ID_WINDOW_TILE_VERT - MENUITEM "& ", ID_WINDOW_ARRANGE + MENUITEM "&Каскадом", ID_WINDOW_CASCADE + MENUITEM "&По горизонтали", ID_WINDOW_TILE_HORZ + MENUITEM "П&о вертикали", ID_WINDOW_TILE_VERT + MENUITEM "&Упорядочить значки", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "&\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&Следующее\tCtrl+F6", ID_WINDOW_NEXT END - POPUP "&" + POPUP "&Справка" BEGIN - MENUITEM "& ...", ID_HELP_ABOUT + MENUITEM "&О программе...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, " (*.bin,*.psf)|*.bin;*.psf| (*.bin)|*.bin| PC 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, " (*.bin)|*.bin|" - IDS_OPENERROR, " ! ( %1!u!)" - IDS_READERROR, " ! ( %1!u!)" - IDS_WRITEERROR, " ! ( %1!u!)" - IDS_UNSUPPORTEDFORMAT, " !" - IDS_UNSUPPORTEDPSF, " PSF- ! 8x8 ." - IDS_DOCNAME, " %1!u!" - IDS_SAVEPROMPT, " ""%1"" .\n\n?" - IDS_APPTITLE, " VGA- ReactOS" - IDS_CLOSEEDIT, ", !" + IDS_OPENFILTER, "Все поддерживаемые форматы (*.bin,*.psf)|*.bin;*.psf|Двоичные файлы шрифтов (*.bin)|*.bin|Экранные шрифты PC версии 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Двоичные файлы шрифтов (*.bin)|*.bin|" + IDS_OPENERROR, "Ошибка открытия файла! (Ошибка номер %1!u!)" + IDS_READERROR, "Ошибка чтения файла! (Ошибка номер %1!u!)" + IDS_WRITEERROR, "Ошибка записи файла! (Ошибка номер %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Неподдерживаемый формат файла!" + IDS_UNSUPPORTEDPSF, "Неподдерживаемый PSF-формат шрифта! Редактор поддерживает только шрифты размером 8x8 без специальных режимов." + IDS_DOCNAME, "Шрифт %1!u!" + IDS_SAVEPROMPT, "Файл ""%1"" был изменен и изменения не были сохранены.\n\nСохранить?" + IDS_APPTITLE, "Редактор VGA-шрифтов ReactOS" + IDS_CLOSEEDIT, "Пожалуйста, закройте сначала все открытые окна редактирования!" - IDS_TOOLTIP_NEW, "" - IDS_TOOLTIP_OPEN, "" - IDS_TOOLTIP_SAVE, "" - IDS_TOOLTIP_EDIT_GLYPH, " " - IDS_TOOLTIP_COPY, "" - IDS_TOOLTIP_PASTE, "" + IDS_TOOLTIP_NEW, "Новый" + IDS_TOOLTIP_OPEN, "Открыть" + IDS_TOOLTIP_SAVE, "Сохранить" + IDS_TOOLTIP_EDIT_GLYPH, "Редактировать символ" + IDS_TOOLTIP_COPY, "Копировать" + IDS_TOOLTIP_PASTE, "Вставить" END Index: applications/devutils/vgafontedit/lang/uk-UA.rc =================================================================== --- applications/devutils/vgafontedit/lang/uk-UA.rc (rvision 56877) +++ applications/devutils/vgafontedit/lang/uk-UA.rc (copie de travail) @@ -11,18 +11,18 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION " " +CAPTION "Про програму" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT " VGA- ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Редактор VGA-шрифтів ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " " +CAPTION "Редагування символа" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -30,65 +30,65 @@ CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 - PUSHBUTTON "", IDCANCEL, 125, 177, 70, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 125, 177, 70, 14 END IDM_MAINMENU MENU BEGIN - POPUP "&" + POPUP "&Файл" BEGIN - MENUITEM "&\tCtrl+N", ID_FILE_NEW - MENUITEM "&³...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&", ID_FILE_CLOSE + MENUITEM "&Створити\tCtrl+N", ID_FILE_NEW + MENUITEM "&Відкрити...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Закрити", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "&\tCtrl+S", ID_FILE_SAVE - MENUITEM " &...", ID_FILE_SAVE_AS + MENUITEM "З&берегти\tCtrl+S", ID_FILE_SAVE + MENUITEM "Зберегти &як...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&\tAlt+F4", ID_FILE_EXIT + MENUITEM "В&ихід\tAlt+F4", ID_FILE_EXIT END - POPUP "&" + POPUP "&Правка" BEGIN - MENUITEM "\tCtrl+C", ID_EDIT_COPY - MENUITEM "\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Копіювати\tCtrl+C", ID_EDIT_COPY + MENUITEM "Вставити\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM " ...", ID_EDIT_GLYPH + MENUITEM "Редагувати символ...", ID_EDIT_GLYPH END - POPUP "&³" + POPUP "&Вікно" BEGIN - MENUITEM "&", ID_WINDOW_CASCADE - MENUITEM "&", ID_WINDOW_TILE_HORZ - MENUITEM "&", ID_WINDOW_TILE_VERT - MENUITEM " &", ID_WINDOW_ARRANGE + MENUITEM "&Каскадом", ID_WINDOW_CASCADE + MENUITEM "&Горизонтально", ID_WINDOW_TILE_HORZ + MENUITEM "&Вертикально", ID_WINDOW_TILE_VERT + MENUITEM "Упорядкувати &значки", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "&\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&Наступне\tCtrl+F6", ID_WINDOW_NEXT END - POPUP "&" + POPUP "&Довідка" BEGIN - MENUITEM "& ...", ID_HELP_ABOUT + MENUITEM "&Про програму...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, " (*.bin,*.psf)|*.bin;*.psf| (*.bin)|*.bin| 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, " (*.bin)|*.bin|" - IDS_OPENERROR, " ! ( %1!u!)" - IDS_READERROR, " ! ( %1!u!)" - IDS_WRITEERROR, " ! ( %1!u!)" - IDS_UNSUPPORTEDFORMAT, " !" - IDS_UNSUPPORTEDPSF, " PSF ! 8x8 ." - IDS_DOCNAME, " %1!u!" - IDS_SAVEPROMPT, " ""%1"" , .\n\n ?" - IDS_APPTITLE, " VGA- ReactOS" - IDS_CLOSEEDIT, " !" + IDS_OPENFILTER, "Всі підтримувані формати (*.bin,*.psf)|*.bin;*.psf|Двійкові файли шрифтів (*.bin)|*.bin|Екранні шрифти ПК версії 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Двійкові файли шрифтів (*.bin)|*.bin|" + IDS_OPENERROR, "Помилка при відкритті файлу! (Номер помилки %1!u!)" + IDS_READERROR, "Помилка при читанні файлу! (Номер помилки %1!u!)" + IDS_WRITEERROR, "Помилка при запису файлу! (Номер помилки %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Непідтримуваний формат файлу!" + IDS_UNSUPPORTEDPSF, "Непідтримуваний формат PSF шрифта! Редактор підтримує тільки шрифти 8x8 без спеціальних режимів." + IDS_DOCNAME, "Шрифт %1!u!" + IDS_SAVEPROMPT, "Файл ""%1"" був змінений, але не збережений.\n\nЗберегти його?" + IDS_APPTITLE, "Редактор VGA-шрифтів ReactOS" + IDS_CLOSEEDIT, "Будь ласка закрийте всі відкриті вікна Редагування спочатку!" - IDS_TOOLTIP_NEW, "" - IDS_TOOLTIP_OPEN, "³" - IDS_TOOLTIP_SAVE, "" - IDS_TOOLTIP_EDIT_GLYPH, " " - IDS_TOOLTIP_COPY, "" - IDS_TOOLTIP_PASTE, "" + IDS_TOOLTIP_NEW, "Створити" + IDS_TOOLTIP_OPEN, "Відкрити" + IDS_TOOLTIP_SAVE, "Зберегти" + IDS_TOOLTIP_EDIT_GLYPH, "Редагувати символ" + IDS_TOOLTIP_COPY, "Копіювати" + IDS_TOOLTIP_PASTE, "Вставити" END Index: applications/devutils/vgafontedit/main.rc =================================================================== --- applications/devutils/vgafontedit/main.rc (rvision 56877) +++ applications/devutils/vgafontedit/main.rc (copie de travail) @@ -1,43 +0,0 @@ -/* - * PROJECT: ReactOS VGA Font Editor - * LICENSE: GNU General Public License Version 2.0 or any later version - * FILE: devutils/vgafontedit/main.rc - * PURPOSE: Main resource file - * COPYRIGHT: Copyright 2008 Colin Finck - */ - -#include -#include -#include "resource.h" -#include "customwndclasses.h" - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VGA Font Editor" -#define REACTOS_STR_INTERNAL_NAME "vgafontedit" -#define REACTOS_STR_ORIGINAL_FILENAME "vgafontedit.exe" -#include - -IDA_MAINACCELERATORS ACCELERATORS -BEGIN - "N", ID_FILE_NEW, VIRTKEY, CONTROL - "O", ID_FILE_OPEN, VIRTKEY, CONTROL - "S", ID_FILE_SAVE, VIRTKEY, CONTROL - "C", ID_EDIT_COPY, VIRTKEY, CONTROL - "V", ID_EDIT_PASTE, VIRTKEY, CONTROL -END - -IDB_MAIN_TOOLBAR BITMAP "res/toolbar.bmp" -IDB_EDIT_GLYPH_TOOLBOX BITMAP "res/toolbox.bmp" -IDI_MAIN ICON "res/main.ico" -IDI_DOC ICON "res/doc.ico" - -// Languages -#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/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" -#include "lang/it-IT.rc" -#include "lang/no-NO.rc" Index: applications/devutils/vgafontedit/mainwnd.c =================================================================== --- applications/devutils/vgafontedit/mainwnd.c (rvision 56877) +++ applications/devutils/vgafontedit/mainwnd.c (copie de travail) @@ -137,11 +137,11 @@ // Add the toolbar bitmaps tbab.hInst = HINST_COMMCTRL; tbab.nID = IDB_STD_SMALL_COLOR; - iStandardBitmaps = SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + iStandardBitmaps = (INT)SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); tbab.hInst = hInstance; tbab.nID = IDB_MAIN_TOOLBAR; - iCustomBitmaps = SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + iCustomBitmaps = (INT)SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); // Add the toolbar buttons AddToolbarButton(Info, iStandardBitmaps + STD_FILENEW, ID_FILE_NEW, IDS_TOOLTIP_NEW); Index: applications/devutils/vgafontedit/rsrc.rc =================================================================== --- applications/devutils/vgafontedit/rsrc.rc (rvision 0) +++ applications/devutils/vgafontedit/rsrc.rc (copie de travail) @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/rsrc.rc + * PURPOSE: Localized resource file + * COPYRIGHT: Copyright 2008 Colin Finck + */ + +#include +#include "resource.h" +#include "customwndclasses.h" + +/* include localised resources */ +// UTF-8 +#pragma code_page(65001) +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Index: applications/devutils/vgafontedit/vgafontedit.rbuild =================================================================== --- applications/devutils/vgafontedit/vgafontedit.rbuild (rvision 56877) +++ applications/devutils/vgafontedit/vgafontedit.rbuild (copie de travail) @@ -10,7 +10,7 @@ fontboxeswnd.c fontwnd.c main.c - main.rc + vgafontedit.rc mainwnd.c misc.c opensave.c Index: applications/devutils/vgafontedit/vgafontedit.rc =================================================================== --- applications/devutils/vgafontedit/vgafontedit.rc (rvision 0) +++ applications/devutils/vgafontedit/vgafontedit.rc (copie de travail) @@ -0,0 +1,35 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/vgafontedit.rc + * PURPOSE: Main resource file + * COPYRIGHT: Copyright 2008 Colin Finck + */ + +#include +#include +#include "resource.h" + +/* define language neutral resources */ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VGA Font Editor" +#define REACTOS_STR_INTERNAL_NAME "vgafontedit" +#define REACTOS_STR_ORIGINAL_FILENAME "vgafontedit.exe" +#include + +IDA_MAINACCELERATORS ACCELERATORS +BEGIN + "N", ID_FILE_NEW, VIRTKEY, CONTROL + "O", ID_FILE_OPEN, VIRTKEY, CONTROL + "S", ID_FILE_SAVE, VIRTKEY, CONTROL + "C", ID_EDIT_COPY, VIRTKEY, CONTROL + "V", ID_EDIT_PASTE, VIRTKEY, CONTROL +END + +IDB_MAIN_TOOLBAR BITMAP "res/toolbar.bmp" +IDB_EDIT_GLYPH_TOOLBOX BITMAP "res/toolbox.bmp" +IDI_MAIN ICON "res/main.ico" +IDI_DOC ICON "res/doc.ico" + +#include "rsrc.rc"