[mjansen] 73755: [FONTVIEW] Add support for font collections + show some extra font properties. Patch by Katayama Hirofumi MZ. CORE-6621 Some minor changes by me

Author: mjansen
Date: Wed Feb  8 17:56:22 2017
New Revision: 73755

URL: http://svn.reactos.org/svn/reactos?rev=73755&view=rev
Log:
[FONTVIEW] Add support for font collections + show some extra font properties. Patch by Katayama Hirofumi MZ. CORE-6621
Some minor changes by me

Modified:
    trunk/reactos/base/applications/fontview/display.c
    trunk/reactos/base/applications/fontview/fontview.c
    trunk/reactos/base/applications/fontview/fontview.h
    trunk/reactos/base/applications/fontview/lang/bg-BG.rc
    trunk/reactos/base/applications/fontview/lang/cs-CZ.rc
    trunk/reactos/base/applications/fontview/lang/de-DE.rc
    trunk/reactos/base/applications/fontview/lang/en-US.rc
    trunk/reactos/base/applications/fontview/lang/es-ES.rc
    trunk/reactos/base/applications/fontview/lang/fr-FR.rc
    trunk/reactos/base/applications/fontview/lang/he-IL.rc
    trunk/reactos/base/applications/fontview/lang/it-IT.rc
    trunk/reactos/base/applications/fontview/lang/lt-LT.rc
    trunk/reactos/base/applications/fontview/lang/ms-MY.rc
    trunk/reactos/base/applications/fontview/lang/no-NO.rc
    trunk/reactos/base/applications/fontview/lang/pl-PL.rc
    trunk/reactos/base/applications/fontview/lang/pt-BR.rc
    trunk/reactos/base/applications/fontview/lang/ro-RO.rc
    trunk/reactos/base/applications/fontview/lang/ru-RU.rc
    trunk/reactos/base/applications/fontview/lang/sk-SK.rc
    trunk/reactos/base/applications/fontview/lang/sq-AL.rc
    trunk/reactos/base/applications/fontview/lang/sv-SE.rc
    trunk/reactos/base/applications/fontview/lang/tr-TR.rc
    trunk/reactos/base/applications/fontview/lang/uk-UA.rc
    trunk/reactos/base/applications/fontview/lang/zh-CN.rc
    trunk/reactos/base/applications/fontview/lang/zh-TW.rc
    trunk/reactos/base/applications/fontview/resource.h

Modified: trunk/reactos/base/applications/fontview/display.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/display.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/display.c	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -28,6 +28,9 @@
 #define SPACING1 8
 #define SPACING2 5

+extern INT g_NumFonts;
+extern WCHAR g_FontTitle[];
+
 const WCHAR g_szFontDisplayClassName[] = L"FontDisplayClass";
 LRESULT CALLBACK DisplayProc(HWND, UINT, WPARAM, LPARAM);

@@ -162,7 +165,7 @@
 }

static LRESULT
-Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
+Display_SetTypeFace(HWND hwnd, PLOGFONTW pLogFont)
 {
    DISPLAYDATA* pData;
    TEXTMETRIC tm;
@@ -171,16 +174,21 @@
    SCROLLINFO si;
    int i;
    LOGFONTW logfont;
+	BOOL fOpenType;
+	BYTE Buffer[512];
+	LPOUTLINETEXTMETRICW pOTM = (LPOUTLINETEXTMETRICW)Buffer;
+	LPWSTR pch;

/* Set the new type face name */
    pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-	_snwprintf(pData->szTypeFaceName, LF_FULLFACESIZE, pExtLogFont->elfFullName);
+	lstrcpynW(pData->szTypeFaceName, pLogFont->lfFaceName,
+	          ARRAYSIZE(pData->szTypeFaceName));

/* Create the new fonts */
    hDC = GetDC(hwnd);
    DeleteObject(pData->hCharSetFont);

-	logfont = pExtLogFont->elfLogFont;
+	logfont = *pLogFont;
    logfont.lfHeight = -MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72);
    pData->hCharSetFont = CreateFontIndirectW(&logfont);

@@ -189,8 +197,19 @@
    GetTextMetrics(hDC, &tm);
    if (tm.tmPitchAndFamily & TMPF_TRUETYPE)
    {
-		BOOL fOpenType = FALSE;
-
+		if (GetOutlineTextMetricsW(hDC, sizeof(Buffer), pOTM))
+		{
+			LPBYTE pb = Buffer;
+			pb += (WORD)(DWORD_PTR)pOTM->otmpStyleName;
+			pch = (LPWSTR)pb;
+			if (*pch)
+			{
+				lstrcatW(pData->szTypeFaceName, L" ");
+				lstrcatW(pData->szTypeFaceName, pch);
+			}
+		}
+
+		fOpenType = FALSE;
    	EnumFontFamiliesExW(hDC, &logfont,
    		EnumFontFamProcW, (LPARAM)&fOpenType, 0);

@@ -234,12 +253,12 @@
 }

static LRESULT
-Display_SetString(HWND hwnd, LPARAM lParam)
+Display_SetString(HWND hwnd, LPCWSTR pszString)
 {
    DISPLAYDATA* pData;

pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-	_snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam);
+	lstrcpynW(pData->szString, pszString, ARRAYSIZE(pData->szString));

InvalidateRect(hwnd, NULL, TRUE);

@@ -252,11 +271,10 @@
    DISPLAYDATA* pData;
    const int nSizes[MAX_SIZES] = {8, 12, 18, 24, 36, 48, 60, 72};
    int i;
-	EXTLOGFONTW ExtLogFont = {{50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
-	                          ANSI_CHARSET, OUT_DEFAULT_PRECIS,
-	                          CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
-	                          DEFAULT_PITCH , L"Ms Shell Dlg"},
-	                          L"Ms Shell Dlg"};
+	LOGFONTW LogFont = {50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
+	                    ANSI_CHARSET, OUT_DEFAULT_PRECIS,
+	                    CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
+	                    DEFAULT_PITCH , L"MS Shell Dlg"};

/* Create data structure */
    pData = malloc(sizeof(DISPLAYDATA));
@@ -270,13 +288,14 @@
    	pData->nSizes[i] = nSizes[i];
    }

-	pData->hCaptionFont = CreateFontIndirectW(&ExtLogFont.elfLogFont);
-	ExtLogFont.elfLogFont.lfHeight = 12;
-	pData->hSizeFont = CreateFontIndirectW(&ExtLogFont.elfLogFont);
-
-	Display_SetString(hwnd, (LPARAM)L"Jackdaws love my big sphinx of quartz. 1234567890");
-
-	Display_SetTypeFace(hwnd, &ExtLogFont);
+	pData->hCaptionFont = CreateFontIndirectW(&LogFont);
+	LogFont.lfHeight = 12;
+	pData->hSizeFont = CreateFontIndirectW(&LogFont);
+
+	Display_SetString(hwnd,
+		L"Jackdaws love my big sphinx of quartz. 1234567890");
+
+	Display_SetTypeFace(hwnd, &LogFont);

return 0;
 }
@@ -520,10 +539,10 @@
    		return Display_OnVScroll(hwnd, wParam);

case FVM_SETTYPEFACE:
-			return Display_SetTypeFace(hwnd, (PEXTLOGFONTW)lParam);
+			return Display_SetTypeFace(hwnd, (PLOGFONTW)lParam);

case FVM_SETSTRING:
-			return Display_SetString(hwnd, lParam);
+			return Display_SetString(hwnd, (WCHAR *)lParam);

case WM_DESTROY:
    		return Display_OnDestroy(hwnd);

Modified: trunk/reactos/base/applications/fontview/fontview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.c	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -4,6 +4,7 @@
  *  fontview.c
  *
  *  Copyright (C) 2007  Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org>
+ *  Copyright (C) 2016-2017  Katayama Hirofumi MZ [e-mail]
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,8 +31,11 @@
 #include "resource.h"

HINSTANCE g_hInstance;
-EXTLOGFONTW g_ExtLogFontW;
+INT g_FontIndex = 0;
+INT g_NumFonts = 0;
+LOGFONTW g_LogFonts[64];
 LPCWSTR g_fileName;
+WCHAR g_FontTitle[1024] = L"";

static const WCHAR g_szFontViewClassName[] = L"FontViewWClass";

@@ -93,6 +97,7 @@
          int nCmdShow)
 {
    int argc;
+	INT i;
    WCHAR** argv;
    WCHAR szFileName[MAX_PATH] = L"";
    DWORD dwSize;
@@ -118,10 +123,10 @@
    if (argc < 2)
    {
    	OPENFILENAMEW fontOpen;
-        WCHAR filter[MAX_PATH], dialogTitle[MAX_PATH];
-
-		LoadStringW(NULL, IDS_OPEN, dialogTitle, MAX_PATH);
-		LoadStringW(NULL, IDS_FILTER_LIST, filter, MAX_PATH);
+        WCHAR filter[MAX_PATH*2], dialogTitle[MAX_PATH];
+
+		LoadStringW(NULL, IDS_OPEN, dialogTitle, ARRAYSIZE(dialogTitle));
+		LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter));

/* Clears out any values of fontOpen before we use it */
    	ZeroMemory(&fontOpen, sizeof(fontOpen));
@@ -161,19 +166,31 @@
    }

/* Get the font name */
-	dwSize = sizeof(g_ExtLogFontW.elfFullName);
-	if (!GetFontResourceInfoW(fileName, &dwSize, g_ExtLogFontW.elfFullName, 1))
+	dwSize = sizeof(g_LogFonts);
+	ZeroMemory(g_LogFonts, sizeof(g_LogFonts));
+	if (!GetFontResourceInfoW(fileName, &dwSize, g_LogFonts, 2))
    {
    	ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
    	return -1;
    }
-
-	dwSize = sizeof(LOGFONTW);
-	if (!GetFontResourceInfoW(fileName, &dwSize, &g_ExtLogFontW.elfLogFont, 2))
+	g_NumFonts = 0;
+	for (i = 0; i < ARRAYSIZE(g_LogFonts); ++i)
+	{
+		if (g_LogFonts[i].lfFaceName[0] == 0)
+			break;
+
+		++g_NumFonts;
+	}
+	if (g_NumFonts == 0)
    {
    	ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
    	return -1;
    }
+
+	/* get font title */
+	dwSize = sizeof(g_FontTitle);
+	ZeroMemory(g_FontTitle, sizeof(g_FontTitle));
+	GetFontResourceInfoW(fileName, &dwSize, g_FontTitle, 1);

if (!Display_InitClass(hThisInstance))
    {
@@ -206,7 +223,7 @@
    hMainWnd = CreateWindowExW(
    			0,						/* Extended possibilities for variation */
    			g_szFontViewClassName,	/* Classname */
-				g_ExtLogFontW.elfFullName,/* Title Text */
+				g_FontTitle,			/* Title Text */
    			WS_OVERLAPPEDWINDOW,	/* default window */
    			CW_USEDEFAULT,			/* Windows decides the position */
    			CW_USEDEFAULT,			/* where the window ends up on the screen */
@@ -222,6 +239,8 @@
    /* Main message loop */
    while (GetMessage (&msg, NULL, 0, 0))
    {
+		if (IsDialogMessage(hMainWnd, &msg))
+			continue;
    	TranslateMessage(&msg);
    	DispatchMessage(&msg);
    }
@@ -237,7 +256,9 @@
    WCHAR szQuit[MAX_BUTTONNAME];
    WCHAR szPrint[MAX_BUTTONNAME];
    WCHAR szString[MAX_STRING];
-	HWND hDisplay, hButtonInstall, hButtonPrint;
+	WCHAR szPrevious[MAX_STRING];
+	WCHAR szNext[MAX_STRING];
+	HWND hDisplay, hButtonInstall, hButtonPrint, hButtonPrev, hButtonNext;

/* create the display window */
    hDisplay = CreateWindowExW(
@@ -257,10 +278,6 @@

LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING);
    SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString);
-
-	/* Init the display window with the font name */
-	SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_ExtLogFontW);
-	ShowWindow(hDisplay, SW_SHOWNORMAL);

/* Create the install button */
    LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME);
@@ -298,6 +315,51 @@
    		);
    SendMessage(hButtonPrint, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE);

+	/* Create the previous button */
+	LoadStringW(g_hInstance, IDS_PREVIOUS, szPrevious, MAX_BUTTONNAME);
+	hButtonPrev = CreateWindowExW(
+				0,						/* Extended style */
+				L"button",				/* Classname */
+				szPrevious,				/* Title text */
+				WS_CHILD | WS_VISIBLE,	/* Window style */
+				450,					/* X-pos */
+				BUTTON_POS_Y,			/* Y-Pos */
+				BUTTON_WIDTH,			/* Width */
+				BUTTON_HEIGHT,			/* Height */
+				hwnd,					/* Parent */
+				(HMENU)IDC_PREV,		/* Identifier */
+				g_hInstance,			/* Program Instance handler */
+				NULL					/* Window Creation data */
+			);
+	SendMessage(hButtonPrev, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE);
+
+	/* Create the next button */
+	LoadStringW(g_hInstance, IDS_NEXT, szNext, MAX_BUTTONNAME);
+	hButtonNext = CreateWindowExW(
+				0,						/* Extended style */
+				L"button",				/* Classname */
+				szNext,					/* Title text */
+				WS_CHILD | WS_VISIBLE,	/* Window style */
+				450,					/* X-pos */
+				BUTTON_POS_Y,			/* Y-Pos */
+				BUTTON_WIDTH,			/* Width */
+				BUTTON_HEIGHT,			/* Height */
+				hwnd,					/* Parent */
+				(HMENU)IDC_NEXT,		/* Identifier */
+				g_hInstance,			/* Program Instance handler */
+				NULL					/* Window Creation data */
+			);
+	SendMessage(hButtonNext, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE);
+
+	EnableWindow(hButtonPrev, FALSE);
+	if (g_NumFonts <= 1)
+		EnableWindow(hButtonNext, FALSE);
+
+	/* Init the display window with the font name */
+	g_FontIndex = 0;
+	SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]);
+	ShowWindow(hDisplay, SW_SHOWNORMAL);
+
    return 0;
 }

@@ -305,10 +367,36 @@
 MainWnd_OnSize(HWND hwnd)
 {
    RECT rc;
+	HWND hInstall, hPrint, hPrev, hNext, hDisplay;
+	HDWP hDWP;

GetClientRect(hwnd, &rc);
-	MoveWindow(GetDlgItem(hwnd, IDC_PRINT), rc.right - BUTTON_WIDTH - BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, TRUE);
-	MoveWindow(GetDlgItem(hwnd, IDC_DISPLAY), 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, TRUE);
+
+	hDWP = BeginDeferWindowPos(5);
+
+	hInstall = GetDlgItem(hwnd, IDC_INSTALL);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hInstall, NULL, BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hPrint = GetDlgItem(hwnd, IDC_PRINT);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hPrint, NULL, BUTTON_POS_X + BUTTON_WIDTH + BUTTON_PADDING, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hPrev = GetDlgItem(hwnd, IDC_PREV);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hPrev, NULL, rc.right - (BUTTON_WIDTH * 2 + BUTTON_PADDING + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hNext = GetDlgItem(hwnd, IDC_NEXT);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hNext, NULL, rc.right - (BUTTON_WIDTH + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hDisplay = GetDlgItem(hwnd, IDC_DISPLAY);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hDisplay, NULL, 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, SWP_NOZORDER);
+
+	EndDeferWindowPos(hDWP);
+
+	InvalidateRect(hwnd, NULL, TRUE);

return 0;
 }
@@ -349,6 +437,42 @@
    return 0;
 }

+static LRESULT
+MainWnd_OnPrev(HWND hwnd)
+{
+	HWND hDisplay;
+	if (g_FontIndex > 0)
+	{
+		--g_FontIndex;
+		EnableWindow(GetDlgItem(hwnd, IDC_NEXT), TRUE);
+		if (g_FontIndex == 0)
+			EnableWindow(GetDlgItem(hwnd, IDC_PREV), FALSE);
+
+		hDisplay = GetDlgItem(hwnd, IDC_DISPLAY);
+		SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]);
+		InvalidateRect(hDisplay, NULL, TRUE);
+	}
+	return 0;
+}
+
+static LRESULT
+MainWnd_OnNext(HWND hwnd)
+{
+	HWND hDisplay;
+	if (g_FontIndex + 1 < g_NumFonts)
+	{
+		++g_FontIndex;
+		EnableWindow(GetDlgItem(hwnd, IDC_PREV), TRUE);
+		if (g_FontIndex == g_NumFonts - 1)
+			EnableWindow(GetDlgItem(hwnd, IDC_NEXT), FALSE);
+
+		hDisplay = GetDlgItem(hwnd, IDC_DISPLAY);
+		SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]);
+		InvalidateRect(hDisplay, NULL, TRUE);
+	}
+	return 0;
+}
+
 LRESULT CALLBACK
 MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -368,11 +492,15 @@
    		{
    			case IDC_INSTALL:
    				return MainWnd_OnInstall(hwnd);
-					break;

case IDC_PRINT:
    				return Display_OnPrint(hwnd);
-					break;
+
+				case IDC_PREV:
+					return MainWnd_OnPrev(hwnd);
+
+				case IDC_NEXT:
+					return MainWnd_OnNext(hwnd);
    		}
    		break;

Modified: trunk/reactos/base/applications/fontview/fontview.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.h	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -8,11 +8,16 @@
 #define BUTTON_POS_Y 8
 #define BUTTON_WIDTH 72
 #define BUTTON_HEIGHT 21
+#define BUTTON_PADDING 8

#define IDC_INSTALL 1001
 #define IDC_PRINT 1002
 #define IDC_DISPLAY 1003
+#define IDC_PREV 1004
+#define IDC_NEXT 1005

LRESULT CALLBACK MainWndProc(HWND, UINT, WPARAM, LPARAM);

BOOL LoadFont(LPWSTR lpCmdLine);
+
+extern INT g_FontIndex;

Modified: trunk/reactos/base/applications/fontview/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/bg-BG.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,7 +2,7 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
+    IDS_INSTALL "&Install"
     IDS_PRINT "Печат"
     IDS_STRING "Абвгд ежзий клмно прсту фхцчш щъьюя. 1234567890"
     IDS_OPEN "Open Font..."
@@ -10,9 +10,12 @@
     IDS_ERROR_NOMEM "Няма достатъчно място за завършване на действието."
     IDS_ERROR_NOFONT "%1 не е редовен шрифтов файл."
     IDS_ERROR_NOCLASS "Неуспешно изпълнение на класа на прозореца."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/cs-CZ.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,17 +2,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Nainstalovat"
-    IDS_PRINT "Tisk"
+    IDS_INSTALL "&Nainstalovat"
+    IDS_PRINT "&Tisk"
     IDS_STRING "Příliš žluťoučký kůň úpěl ďábelské ódy. 1234567890"
     IDS_OPEN "Otevřít soubor písma..."
     IDS_ERROR "Chyba"
     IDS_ERROR_NOMEM "K dokončení operace není dostatek paměti."
     IDS_ERROR_NOFONT "Soubor %1 není platným souborem písma."
     IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala."
-    IDS_FILTER_LIST "Podporované soubory písem (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Podporované soubory písem (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 Písmo TrueType (*.ttf)\0*.ttf\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
 Písmo OpenType (*.otf)\0*.otf\0\
 Písmo Font (*.fon)\0*.fon\0\
 VÅ¡echny soubory (*.*)\0*.*\0"
+    IDS_PREVIOUS "< &Previous"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/de-DE.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,17 +2,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Installieren"
-    IDS_PRINT "Drucken"
+    IDS_INSTALL "&Installieren"
+    IDS_PRINT "&Drucken"
     IDS_STRING "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern. 1234567890"
     IDS_OPEN "Schriftartendatei öffnen..."
     IDS_ERROR "Fehler"
     IDS_ERROR_NOMEM "Es steht nicht genügend Speicher zur Verfügung."
     IDS_ERROR_NOFONT "Die angegebene Datei %1 ist keine gültige Schriftartendatei."
     IDS_ERROR_NOCLASS "Fehler beim Initialisieren der Fensterklasse."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/en-US.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,17 +2,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Print"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Print"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Error"
     IDS_ERROR_NOMEM "There's not enough memory to complete the operation."
     IDS_ERROR_NOFONT "The file %1 is not a valid font file."
     IDS_ERROR_NOCLASS "Could not initialize window class."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/es-ES.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -4,17 +4,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Instalar"
-    IDS_PRINT "Imprimir"
+    IDS_INSTALL "&Instalar"
+    IDS_PRINT "Im&primir"
     IDS_STRING "Jovencillo emponzoñado de whisky: ¡qué figurota exhibe! 1234567890"
     IDS_OPEN "Abrir fuente..."
     IDS_ERROR "Error"
     IDS_ERROR_NOMEM "No hay memoria suficiente para completar la operación."
     IDS_ERROR_NOFONT "El archivo %1 no es un archivo de fuente válido."
     IDS_ERROR_NOCLASS "No es posible iniciar la clase de ventana."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
-All Files (*.*)\0*.*\0"
+    IDS_FILTER_LIST "Todas las tipografías (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+Tipografía TrueType (*.ttf)\0*.ttf\0\
+Colección de tipografías TrueType (*.ttc)\0*.ttc\0\
+Tipografía OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
+Tipografía de mapa de bits (*.fon;*.fnt)\0*.fon;*.fnt\0\
+Todos los archivos (*.*)\0*.*\0"
+    IDS_PREVIOUS "< Ante&rior"
+    IDS_NEXT "Siguie&nte >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/fr-FR.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,17 +2,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Installer"
-    IDS_PRINT "Imprimer"
+    IDS_INSTALL "&Installer"
+    IDS_PRINT "Im&primer"
     IDS_STRING "Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis. 1234567890"
     IDS_OPEN "Ouvrir un fichier police..."
     IDS_ERROR "Erreur"
     IDS_ERROR_NOMEM "Mémoire insuffisante pour terminer l'opération."
-    IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier police valide."
+    IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier de polices valide."
     IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Toutes polices supportées (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Fichier de polices (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&récédent"
+    IDS_NEXT "Suiva&nt >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/he-IL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/he-IL.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -12,9 +12,12 @@
     IDS_ERROR_NOMEM "אין מספיק זיכרון כדי להשלים את הפעולה."
     IDS_ERROR_NOFONT "הקובץ %1 ××™× ×• קובץ ×’×•×¤× ×™× חוקי."
     IDS_ERROR_NOCLASS "Could not initialize window class."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/it-IT.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,17 +2,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Installa"
-    IDS_PRINT "Stampa"
+    IDS_INSTALL "&Installa"
+    IDS_PRINT "Stam&pa"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Apri Font..."
     IDS_ERROR "Errore"
     IDS_ERROR_NOMEM "Memoria insufficiente per completare l'operazione."
     IDS_ERROR_NOFONT "Il file% 1 non è un file di origine valido."
     IDS_ERROR_NOCLASS "Impossibile avviare la classe."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+    IDS_FILTER_LIST "Tutti i font supportati (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+Font TrueType (*.ttf)\0*.ttf\0\
+Collezione Font TrueType (*.ttc)\0*.ttc\0\
+Font OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&recedente"
+    IDS_NEXT "Ava&nti >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/lt-LT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/lt-LT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/lt-LT.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -4,17 +4,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Spausdinti"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Spausdinti"
     IDS_STRING "ABCDEFGHIYJKLMNOPQRSTUVWXZ ąčęėįšųūž 1234567890"
     IDS_OPEN "Aatvira Å¡riftas..."
     IDS_ERROR "Klaida"
     IDS_ERROR_NOMEM "Užduočiai užbaigti, nepakanka atminties."
     IDS_ERROR_NOFONT "%1 nėra teisinga šrifto byla."
     IDS_ERROR_NOCLASS "Nepavyko inicijuoti lango klasės."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/ms-MY.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/ms-MY.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/ms-MY.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -4,17 +4,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Memasang"
-    IDS_PRINT "Mencetak"
+    IDS_INSTALL "&Memasang"
+    IDS_PRINT "M&encetak"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Buka fon..."
     IDS_ERROR "Ralat"
     IDS_ERROR_NOMEM "Terdapat tidak cukup ingatan untuk melengkapkan operasi ini."
     IDS_ERROR_NOFONT "Fail %1 bukanlah fail fon yang sah."
     IDS_ERROR_NOCLASS "Tidak dapat mengawalkan kelas tetingkap."
-    IDS_FILTER_LIST "Semuanya disokong fon (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-Fon TrueType (*.ttf)\0*.ttf\0\
-Fon OpenType (*.otf)\0*.otf\0\
-Fail fon (*.fon)\0*.fon\0\
-Semua fail (*.*)\0*.*\0"
+    IDS_FILTER_LIST "Semuanya disokong fon (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+TrueType Font (*.ttf)\0*.ttf\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/no-NO.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -2,17 +2,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Skriv"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Skriv"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Feil"
     IDS_ERROR_NOMEM "Det er ikke nok minne for å fullføre oppgaven."
     IDS_ERROR_NOFONT "Filen %1 er ikke et gyldig skriftfil."
     IDS_ERROR_NOCLASS "Kunne ikke initialise vindu klassen."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/pl-PL.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -10,17 +10,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Instaluj"
-    IDS_PRINT "Drukuj"
+    IDS_INSTALL "&Instaluj"
+    IDS_PRINT "&Drukuj"
     IDS_STRING "Zażółć gęślą Jaźń żółwiątkiem. 1234567890. !@#$%^&*()_+=-/?"
     IDS_OPEN "Otwórz czcionkę..."
     IDS_ERROR "Błąd"
     IDS_ERROR_NOMEM "Brakuje pamięci do ukończenia tej operacji."
     IDS_ERROR_NOFONT "Plik %1 nie jest poprawnym plikiem czcionki."
     IDS_ERROR_NOCLASS "Nie udało się zainicjować klasy window."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/pt-BR.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -4,17 +4,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Imprimir"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "Im&primir"
     IDS_STRING "Jackdaws ama minha grande esfinge de quartzo. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Erro"
     IDS_ERROR_NOMEM "Não há memória suficiente para completar a operação."
     IDS_ERROR_NOFONT "O arquivo %1 não é um arquivo de fonte válida."
     IDS_ERROR_NOCLASS "Não foi possível inicializar a janela."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -12,9 +12,12 @@
     IDS_ERROR_NOMEM "Nu e destulă memorie pentru a încheia operația."
     IDS_ERROR_NOFONT "Fișierul «%1» este un fișier font deteriorat."
     IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată."
-    IDS_FILTER_LIST "Toate fonturile recunoscute (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Toate fonturile recunoscute (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;.ttc;*.fon;*.otf;*.otc\0\
 Fonturi de tip TrueType (*.ttf)\0*.ttf\0\
-Fonturi de tip OpenType (*.otf)\0*.otf\0\
-Fișiere de tip Font (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+Fonturi de tip OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
+Fișiere de tip Font (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Orice fișier (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -12,9 +12,12 @@
     IDS_ERROR_NOMEM "Недостаточно памяти для выполнения операции."
     IDS_ERROR_NOFONT "%1 не является корректным файлом шрифта."
     IDS_ERROR_NOCLASS "Невозможно инициализировать класс окна."
-    IDS_FILTER_LIST "Все поддерживаемые шрифты (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Все поддерживаемые шрифты (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType шрифты (*.ttf)\0*.ttf\0\
-OpenType шрифты (*.otf)\0*.otf\0\
-Файлы шрифтов (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType шрифты (*.otf;*.otc)\0*.otf;*.otc\0\
+Файлы шрифтов (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Все файлы (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/sk-SK.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -15,9 +15,12 @@
     IDS_ERROR_NOMEM "Na vykonanie tejto operácie nie je dostatok voľnej pamäte."
     IDS_ERROR_NOFONT "Požadovaný súbor %1 nie je platným súborom písiem."
     IDS_ERROR_NOCLASS "Nepodarilo sa inicializovať triedu window."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/sq-AL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/sq-AL.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -6,17 +6,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Instalo"
-    IDS_PRINT "Printo"
+    IDS_INSTALL "&Instalo"
+    IDS_PRINT "&Printo"
     IDS_STRING "Jackdaws dashuron sphinxin tim të madh  prej kuartzi. 1234567890"
     IDS_OPEN "Hap fontin..."
     IDS_ERROR "Error"
     IDS_ERROR_NOMEM "Nuk ka memorie të mjaftueshme për të përfunduar operacionin."
     IDS_ERROR_NOFONT "Dokumenti %1 nuk është një font i vlefshem."
     IDS_ERROR_NOCLASS "Nuk mund të fillojë dritaren e klases."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/sv-SE.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -9,17 +9,20 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Skriv ut"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Skriv ut"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Fel"
     IDS_ERROR_NOMEM "Det er inte nog minne för att slutföre operationen."
     IDS_ERROR_NOFONT "Filen %1 är inte en giltig typsnittsfil."
     IDS_ERROR_NOCLASS "Kunde inte initialisera Windows klassen."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/tr-TR.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -3,17 +3,20 @@
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Kur..."
-    IDS_PRINT "Yazdır..."
+    IDS_INSTALL "&Kur..."
+    IDS_PRINT "&Yazdır..."
     IDS_STRING "Küçük karga, benim büyük kuvars sfenksimi seviyor. 1234567890"
     IDS_OPEN "Yazı Tipi Aç..."
     IDS_ERROR "Yanlışlık"
     IDS_ERROR_NOMEM "Bu işlemi bitirmek için yeterli bellek yok."
     IDS_ERROR_NOFONT "%1 kütüğü, geçerli bir yazı tipi kütüğü değil."
     IDS_ERROR_NOCLASS "Pencere sınıfı başlatılamadı."
-    IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.ttf, *.fon, *.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Yazı Tipi (*.ttf)\0*.ttf\0\
-OpenType Yazı Tipi (*.otf)\0*.otf\0\
-Yazı Tipi Kütüğü (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Yazı Tipi (*.otf;*.otc)\0*.otf;*.otc\0\
+Yazı Tipi Kütüğü (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Tüm Kütükler (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -10,7 +10,7 @@

STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
+    IDS_INSTALL "&Install"
     IDS_PRINT "Друк"
     IDS_STRING "Чуєш їх, доцю, га? Кумедна ж ти, прощайся без ґольфів! 1234567890"
     IDS_OPEN "Open Font..."
@@ -18,9 +18,12 @@
     IDS_ERROR_NOMEM "Недостатньо пам'яті для завершення операції."
     IDS_ERROR_NOFONT "Файл %1 не є коректним файлом шрифту."
     IDS_ERROR_NOCLASS "Неможливо ініціалізувати віконний клас."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -18,9 +18,12 @@
     IDS_ERROR_NOMEM "没有足够的内存来完成操作。"
     IDS_ERROR_NOFONT "％1不是一个有效的字体档案。"
     IDS_ERROR_NOCLASS "çª—å£æ— æ³•åˆå§‹åŒ–ã€‚"
-    IDS_FILTER_LIST "支持所有的字体 (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "支持所有的字体 (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType 字体 (*.ttf)\0*.ttf\0\
-OpenType 字体 (*.otf)\0*.otf\0\
-字体文件 (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType 字体 (*.otf;*.otc)\0*.otf;*.otc\0\
+字体文件 (*.fon;*.fnt)\0*.fon;*.fnt\0\
 所有文件 (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/lang/zh-TW.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -18,9 +18,12 @@
     IDS_ERROR_NOMEM "æ²’æœ‰è¶³å¤ çš„è¨˜æ†¶é«”ä¾†å®Œæˆæ“ä½œã€‚"
     IDS_ERROR_NOFONT "%1 不是一個有效的字體檔案。"
     IDS_ERROR_NOCLASS "窗口無法初始化。"
-    IDS_FILTER_LIST "所有支援的字體 (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "所有支援的字體 (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType 字體 (*.ttf)\0*.ttf\0\
-OpenType 字體 (*.otf)\0*.otf\0\
-字體檔 (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType 字體 (*.otf;*.otc)\0*.otf;*.otc\0\
+字體檔 (*.fon;*.fnt)\0*.fon;*.fnt\0\
 所有檔 (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

Modified: trunk/reactos/base/applications/fontview/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/resource.h	[iso-8859-1] Wed Feb  8 17:56:22 2017
@@ -15,4 +15,7 @@
 #define IDS_CHARSUPPER   701
 #define IDS_SPECIALCHARS 702

+#define IDS_PREVIOUS   800
+#define IDS_NEXT       801
+
 #define IDI_TT 800