[ros-diffs] [spetreolle] 57200: [ROSAPPS] Add vgafontedit to build. Convert the language resource files into UTF-8. Fix x64 warnings. Patch by Hermes Belusca. Bug 7152.

Author: spetreolle
Date: Wed Aug 29 18:06:24 2012
New Revision: 57200

URL: http://svn.reactos.org/svn/reactos?rev=57200&view=rev
Log:
[ROSAPPS]
Add vgafontedit to build.
Convert the language resource files into UTF-8.
Fix x64 warnings.
Patch by Hermes Belusca.
Bug 7152.

Added:
    trunk/rosapps/applications/devutils/CMakeLists.txt   (with props)
    trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt   (with props)
    trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc   (with props)
    trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc   (with props)
Removed:
    trunk/rosapps/applications/devutils/vgafontedit/main.rc
Modified:
    trunk/rosapps/applications/CMakeLists.txt
    trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c
    trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
    trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c
    trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild

Modified: trunk/rosapps/applications/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx…
==============================================================================
--- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Wed Aug 29 18:06:24 2012
@@ -1,5 +1,5 @@
 add_subdirectory(cmdutils)
-#add_subdirectory(devutils)
+add_subdirectory(devutils)
 #add_subdirectory(fraginator)
 #add_subdirectory(net)
 add_subdirectory(notevil)

Added: trunk/rosapps/applications/devutils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/CMak…
==============================================================================
--- trunk/rosapps/applications/devutils/CMakeLists.txt (added)
+++ trunk/rosapps/applications/devutils/CMakeLists.txt [iso-8859-1] Wed Aug 29 18:06:24
2012
@@ -1,0 +1,6 @@
+#add_subdirectory(gdb2)
+#add_subdirectory(gdihv)
+#add_subdirectory(genguid)
+#add_subdirectory(symdump)
+#add_subdirectory(syscalldump)
+add_subdirectory(vgafontedit)

Propchange: trunk/rosapps/applications/devutils/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt (added)
+++ trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -1,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)

Propchange: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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);
 }

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -38,8 +38,8 @@
     POPUP "&Datei"
     BEGIN
         MENUITEM "&Neu\tStrg+N", ID_FILE_NEW
-        MENUITEM "&Öffnen...\tStrg+O", ID_FILE_OPEN
-        MENUITEM "Schließen", 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 "Einfügen\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 "Nächs&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 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_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 unterstütztes Dateiformat!"
-    IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF-Format! Der Editor unterstützt 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 geändert.\n\nMöchten
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 schließen 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, "Einfügen"
+    IDS_TOOLTIP_PASTE, "Einfügen"
 END

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -47,7 +47,7 @@
         MENUITEM "Salir\tAlt+F4", ID_FILE_EXIT
     END
 
-    POPUP "&Edición"
+    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 Versión 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 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_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\n¿Quiere 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 Edición abiertas
primero!"
+    IDS_CLOSEEDIT, "¡Por favor, cierre todas las ventanas de Edición abiertas
primero!"
 
     IDS_TOOLTIP_NEW, "Nuevo"
     IDS_TOOLTIP_OPEN, "Abrir"

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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 "Fenêtres"
+    POPUP "Fenêtres"
     BEGIN
         MENUITEM "En &cascade", ID_WINDOW_CASCADE
-        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 "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 supportés (*.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 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_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 fenêtres 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

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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!"
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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 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_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 først!"
+    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"

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -22,7 +22,7 @@
 
 IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Edycja Glifów"
+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 "&Otwórz.\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 "&Uporz¹dkuj ikony", ID_WINDOW_ARRANGE
+        MENUITEM "&Uporządkuj ikony", ID_WINDOW_ARRANGE
         MENUITEM SEPARATOR
-        MENUITEM "Nas&têpne\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 obs³ugiwane (*.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, "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_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, "Otwórz"
+    IDS_TOOLTIP_OPEN, "Otwórz"
     IDS_TOOLTIP_SAVE, "Zapisz"
     IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify"
     IDS_TOOLTIP_COPY, "Copy"

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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

Removed: trunk/rosapps/applications/devutils/vgafontedit/main.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/main.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/main.rc (removed)
@@ -1,43 +1,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 <mail(a)colinfinck.de>
- */
-
-#include <windows.h>
-#include <commctrl.h>
-#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 <reactos/version.rc>
-
-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"

Modified: trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -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);

Added: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc (added)
+++ trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -1,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 &lt;mail(a)colinfinck.de&gt;
+ */
+
+#include <windows.h>
+#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

Propchange: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild [iso-8859-1] Wed
Aug 29 18:06:24 2012
@@ -10,7 +10,7 @@
 	<file>fontboxeswnd.c</file>
 	<file>fontwnd.c</file>
 	<file>main.c</file>
-	<file>main.rc</file>
+	<file>vgafontedit.rc</file>
 	<file>mainwnd.c</file>
 	<file>misc.c</file>
 	<file>opensave.c</file>

Added: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc (added)
+++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc [iso-8859-1] Wed Aug 29
18:06:24 2012
@@ -1,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 &lt;mail(a)colinfinck.de&gt;
+ */
+
+#include <windows.h>
+#include <commctrl.h>
+#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 <reactos/version.rc>
+
+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"

Propchange: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
------------------------------------------------------------------------------
    svn:eol-style = native