Sub-module update

Version set to 2.0-beta8
"ZRCola" font name mainstream now
2016-07-18 08:51:20 +02:00 · 2016-07-18 08:29:30 +02:00 · 2016-07-15 21:44:28 +02:00 · 2016-07-15 21:27:51 +02:00 · 2016-07-15 12:48:07 +02:00 · 2016-07-15 10:32:26 +02:00
60 changed files with 3477 additions and 883 deletions
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSI/MSICA
+++ b/MSI/MSICA
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -53,19 +53,22 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
 Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
-!IF "$(LANG)" == "Sl"
-compwxstd.mo.sl_SI	{A5FEEA94-08CA-4E12-993F-A115601EF258}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.sl_SI
-!ENDIF
 compLocalizationRepositoryPath	{0E96110A-C38D-4600-9AE2-B8B59AF53A00}	ZRCOLALOCDIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regLocalizationRepositoryPath
 compLanguage	{B78359AC-9484-402C-8384-3A4595B39389}	ZRCOLALOCDIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regLanguage
 compDatabasePath	{DF3C720D-50BB-4377-9EE0-9AC21C02B9DD}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		regDatabasePath
 compZRCola.zrcdb	{0585A51F-1411-43A3-AC50-F04A253FDED4}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.zrcdb
 compZRCola_keyboard.pdf	{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola_keyboard.pdf
-comp00_ZRCola_Re.ttf	{B6CE8B39-11DC-4B59-B10C-3F0FFE8F81AF}	FontsFolder	0		file00_ZRCola_Re.ttf
-comp00_ZRCola_It.ttf	{10613965-2874-470D-9D5A-B7D535AA3317}	FontsFolder	0		file00_ZRCola_It.ttf
-comp00_ZRCola_Bd.ttf	{C036BE8D-6D2F-4DBF-99D6-F53702EAEBB6}	FontsFolder	0		file00_ZRCola_Bd.ttf
-comp00_ZRCola_BI.ttf	{883DDA9A-DA85-4FC4-95B7-EF0E08766DEF}	FontsFolder	0		file00_ZRCola_BI.ttf
+compZRCola_Re.otf	{CE2403F5-DD07-4116-B4D1-010AB0E4F899}	FontsFolder	8		fileZRCola_Re.otf
+compZRCola_It.otf	{FFBD408C-9FC1-4CD1-88BF-A0284AD17F96}	FontsFolder	8		fileZRCola_It.otf
+compZRCola_Bd.otf	{E84BB37C-1079-4299-A4BA-4EE48AFE5BCE}	FontsFolder	8		fileZRCola_Bd.otf
+compZRCola_BI.otf	{FDFE77E4-45CC-450A-9543-0A83C01A0A48}	FontsFolder	8		fileZRCola_BI.otf
+comp00_ZRCola	{63E512B4-33AC-4DB1-A762-071099CAA0DE}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		reg00_ZRCola
+!IF "$(LANG)" == "Ru"
+compwxstd.mo.ru_RU	{342BD930-C88B-4759-A4A8-F62054E7EA88}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.ru_RU
+compZRCola.zrcdb.mo.ru_RU	{BED0B2D2-CC08-4309-A2DB-A18B904B8D13}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.zrcdb.mo.ru_RU
+!ENDIF
 !IF "$(LANG)" == "Sl"
+compwxstd.mo.sl_SI	{A5FEEA94-08CA-4E12-993F-A115601EF258}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.sl_SI
 compZRCola.zrcdb.mo.sl_SI	{6572EAD1-EE48-46A1-A28E-77985B667F67}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.zrcdb.mo.sl_SI
 !ENDIF
 <<NOKEEP
@@ -101,6 +104,9 @@ dlgDeclaration	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap
 "It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

@@ -204,7 +210,12 @@ ZRCOLABINDIR	ZRCOLADIR	.:X64~1.DEB|x64.Debug
 ZRCOLABINDIR	ZRCOLADIR	.:X64~1.REL|x64.Release
 !ENDIF
 ZRCOLALOCDIR	ZRCOLADIR	locale
+!IF "$(LANG)" == "Ru"
+ZRCOLALOCRURUDIR	ZRCOLALOCDIR	ru_RU
+!ENDIF
+!IF "$(LANG)" == "Sl"
 ZRCOLALOCSLSIDIR	ZRCOLALOCDIR	sl_SI
+!ENDIF
 ZRCOLADATADIR	ZRCOLADIR	data
 <<NOKEEP

@@ -226,6 +237,9 @@ ZRCOLADIR	PROGRAMFILESDIR	ZRCola:.
 "It.$(PLAT).$(CFG).Directory-2.idt" : "En.$(PLAT).$(CFG).Directory-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Directory-2.idt" : "En.$(PLAT).$(CFG).Directory-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Directory-2.idt" : "En.$(PLAT).$(CFG).Directory-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

@@ -242,7 +256,7 @@ Feature	Feature_Parent	Title	Description	Display	Level	Directory_	Attributes
 s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	L64	L255	I2	i2	S$(MSIBUILD_LENGTH_ID)	i2
 1252	Feature	Feature
 featZRColaFonts		Fonts	Fonts used by ZRCola	101	1	ZRCOLAFONTDIR	8
-featZRColaFonts00	featZRColaFonts	00 ZRCola	Times New Roman based font	1	1	ZRCOLAFONTDIR	8
+featZRColaFontsZRCola	featZRColaFonts	ZRCola	Times New Roman based font	1	1	ZRCOLAFONTDIR	8
 featZRColaDoc		Documentation	ZRCola Documentation	201	3	ZRCOLADATADIR	8
 featZRCola_keyboard	featZRColaDoc	Keyboard Shortcuts	PDF document with a list of ZRCola keyboard shortcuts	1	3	ZRCOLADATADIR	8
 <<NOKEEP
@@ -256,6 +270,9 @@ featZRCola_keyboard	featZRColaDoc	Keyboard Shortcuts	PDF document with a list of
 "It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

@@ -272,10 +289,11 @@ Feature_	Component_
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
 FeatureComponents	Feature_	Component_
 featZRCola_keyboard	compZRCola_keyboard.pdf
-featZRColaFonts00	comp00_ZRCola_Re.ttf
-featZRColaFonts00	comp00_ZRCola_It.ttf
-featZRColaFonts00	comp00_ZRCola_Bd.ttf
-featZRColaFonts00	comp00_ZRCola_BI.ttf
+featZRColaFontsZRCola	compZRCola_Re.otf
+featZRColaFontsZRCola	compZRCola_It.otf
+featZRColaFontsZRCola	compZRCola_Bd.otf
+featZRColaFontsZRCola	compZRCola_BI.otf
+featZRColaFontsZRCola	comp00_ZRCola
 <<NOKEEP


@@ -290,16 +308,18 @@ All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
 File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
 File	File
-!IF "$(LANG)" == "Sl"
-filewxstd.mo.sl_SI	compwxstd.mo.sl_SI	wxstd.mo	0		1060	0	1
-!ENDIF
 fileZRCola.zrcdb	compZRCola.zrcdb	ZRCOLA~1.ZRC|ZRCola.zrcdb	0			0	1
 fileZRCola_keyboard.pdf	compZRCola_keyboard.pdf	ZRCOLA~1.PDF|ZRCola_keyboard.pdf	0			0	1
-file00_ZRCola_Re.ttf	comp00_ZRCola_Re.ttf	00_ZRC~1.TTF|00_ZRCola_Re.ttf	0			0	1
-file00_ZRCola_It.ttf	comp00_ZRCola_It.ttf	00_ZRC~2.TTF|00_ZRCola_It.ttf	0			0	1
-file00_ZRCola_Bd.ttf	comp00_ZRCola_Bd.ttf	00_ZRC~3.TTF|00_ZRCola_Bd.ttf	0			0	1
-file00_ZRCola_BI.ttf	comp00_ZRCola_BI.ttf	00_ZRC~4.TTF|00_ZRCola_BI.ttf	0			0	1
+fileZRCola_Re.otf	compZRCola_Re.otf	ZRCOLA~1.OTF|ZRCola_Re.otf	0			0	1
+fileZRCola_It.otf	compZRCola_It.otf	ZRCOLA~2.OTF|ZRCola_It.otf	0			0	1
+fileZRCola_Bd.otf	compZRCola_Bd.otf	ZRCOLA~3.OTF|ZRCola_Bd.otf	0			0	1
+fileZRCola_BI.otf	compZRCola_BI.otf	ZRCOLA~4.OTF|ZRCola_BI.otf	0			0	1
+!IF "$(LANG)" == "Ru"
+filewxstd.mo.ru_RU	compwxstd.mo.ru_RU	wxstd.mo	0		1060	0	1
+fileZRCola.zrcdb.mo.ru_RU	compZRCola.zrcdb.mo.ru_RU	ZRCOLA~1.MO|ZRCola-zrcdb.mo	0		1060	0	1
+!ENDIF
 !IF "$(LANG)" == "Sl"
+filewxstd.mo.sl_SI	compwxstd.mo.sl_SI	wxstd.mo	0		1060	0	1
 fileZRCola.zrcdb.mo.sl_SI	compZRCola.zrcdb.mo.sl_SI	ZRCOLA~1.MO|ZRCola-zrcdb.mo	0		1060	0	1
 !ENDIF
 <<NOKEEP
@@ -316,10 +336,10 @@ All :: "$(LANG).$(PLAT).$(CFG).Font-1.idt"
 File_	FontTitle
 s$(MSIBUILD_LENGTH_ID)	S255
 Font	File_
-file00_ZRCola_Re.ttf	
-file00_ZRCola_It.ttf	
-file00_ZRCola_Bd.ttf	
-file00_ZRCola_BI.ttf	
+fileZRCola_Re.otf	
+fileZRCola_It.otf	
+fileZRCola_Bd.otf	
+fileZRCola_BI.otf	
 <<NOKEEP


@@ -356,6 +376,7 @@ s$(MSIBUILD_LENGTH_ID)	S255	I2
 InstallExecuteSequence	Action
 caSetZRCOLADIR1	OLDZRCOLADIR AND UILevel < 4	1001
 caSetZRCOLADIR2	INSTALLDIR AND UILevel < 4	1002
+ScheduleReboot	?comp00_ZRCola<>3 AND $$comp00_ZRCola=3	1580
 <<NOKEEP


@@ -394,7 +415,9 @@ Media	DiskId
 ######################################################################
 # Property

-All :: "$(LANG).$(PLAT).$(CFG).Property-1.idt"
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Property-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Property-2.idt"

 "$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
@@ -402,7 +425,7 @@ All :: "$(LANG).$(PLAT).$(CFG).Property-1.idt"
 Property	Value
 s$(MSIBUILD_LENGTH_ID)	l0
 Property	Property
-ARPPRODUCTICON	iconPDF.ico
+ARPPRODUCTICON	iconZRCola.ico
 ALLUSERS	1
 DISABLEADVTSHORTCUTS	1
 INSTALLLEVEL	3
@@ -410,6 +433,35 @@ InstallMode	Typical
 SecureCustomProperties	OLDPRODUCTFOUND;NEWPRODUCTFOUND
 <<NOKEEP

+"En.$(PLAT).$(CFG).Property-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Property	Value
+s$(MSIBUILD_LENGTH_ID)	l0
+1252	Property	Property
+Manufacturer	Amebis, Slovenia, E.U.
+ARPCONTACT	Fran Ramov<EFBFBD> Institute of Slovenian Language SRC SASA
+ARPHELPTELEPHONE	+386 1 470 6170
+ARPURLINFOABOUT	http://zrcola-2.amebis.si/en/contact/
+ARPHELPLINK	http://zrcola-2.amebis.si/en/info/instructions/
+ARPURLUPDATEINFO	http://zrcola-2.amebis.si/en/install/
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Ru.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+

 ######################################################################
 # Registry
@@ -426,6 +478,7 @@ s$(MSIBUILD_LENGTH_ID)	i2	l255	L255	L0	s$(MSIBUILD_LENGTH_ID)
 Registry	Registry
 regLocalizationRepositoryPath	2	SOFTWARE\Amebis\ZRCola	LocalizationRepositoryPath	[ZRCOLALOCDIR]	compLocalizationRepositoryPath
 regDatabasePath	2	SOFTWARE\Amebis\ZRCola	DatabasePath	[ZRCOLADATADIR]	compDatabasePath
+reg00_ZRCola	2	SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes	00 ZRCola	ZRCola	comp00_ZRCola
 <<NOKEEP

 "En.$(PLAT).$(CFG).Registry-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
@@ -446,6 +499,9 @@ regLanguage	2	SOFTWARE\Amebis\ZRCola	Language	#60	compLanguage
 "It.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

@@ -488,6 +544,9 @@ shctZRCola_keyboard	ZRColaShortcutDir	ZRCOLA~1|ZRCola Keyboard Shortcuts	compZRC
 "It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

--- a/MSI/ZRCola/locale/ZRCola.pot
+++ b/MSI/ZRCola/locale/ZRCola.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola MSI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-01 19:00+0200\n"
+"POT-Creation-Date: 2016-07-15 21:43+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -782,17 +782,23 @@ msgstr ""
 "pripravljeno z vna\\'9aalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil dr. Peter Weiss."
 "\\i0\\f1\\par}"

-#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6
 #, fuzzy
-msgid "00 ZRCola"
-msgstr "00 ZRCola"
+msgid "+386 1 470 6170"
+msgstr "01 470 6170"

-#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
+#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3
+#: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3
+#: En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
 #, fuzzy
 msgid "1252"
 msgstr "1250"

+#: En.Win32.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4
+#, fuzzy
+msgid "Amebis, Slovenia, E.U."
+msgstr "Amebis, d. o. o., Kamnik"
+
 #: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
 #, fuzzy
 msgid "binUIHeader.bmp"
@@ -813,6 +819,26 @@ msgstr "Pisave"
 msgid "Fonts used by ZRCola"
 msgstr "Pisave, ki jih uporablja ZRCola"

+#: En.Win32.Release.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5
+#, fuzzy
+msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgstr "Inštitut za slovenski jezik Frana Ramovša ZRC SAZU"
+
+#: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7
+#, fuzzy
+msgid "http://zrcola-2.amebis.si/en/contact/"
+msgstr "http://zrcola-2.amebis.si/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+#, fuzzy
+msgid "http://zrcola-2.amebis.si/en/info/instructions/"
+msgstr "http://zrcola-2.amebis.si/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+#, fuzzy
+msgid "http://zrcola-2.amebis.si/en/install/"
+msgstr "http://zrcola-2.amebis.si/install/"
+
 #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 #, fuzzy
 msgid "I &agree."
@@ -843,6 +869,11 @@ msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v
 msgid "Times New Roman based font"
 msgstr "Pisava na osnovi Times New Roman"

+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+#, fuzzy
+msgid "ZRCola"
+msgstr "ZRCola"
+
 #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 #, fuzzy
 msgid "ZRCola Documentation"
@@ -859,5 +890,6 @@ msgid "ZRCola:."
 msgstr "ZRCola:."

 #: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#, fuzzy
 msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
-msgstr ""
+msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici"
--- a/MSI/ZRCola/locale/de_DE.po
+++ b/MSI/ZRCola/locale/de_DE.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola MSI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-01 19:01+0200\n"
+"POT-Creation-Date: 2016-07-15 21:44+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -1516,16 +1516,21 @@ msgid ""
 "using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Dr. Peter Weiss.\\f1\\par}"
 msgstr ""

-#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
-msgid "00 ZRCola"
-msgstr "00 ZRCola"
+#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6
+msgid "+386 1 470 6170"
+msgstr "+386 1 470 6170"

 # Windows charset for this language (decimal)
-#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
+#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3
+#: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3
+#: En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
 msgid "1252"
 msgstr "1252"

+#: En.Win32.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4
+msgid "Amebis, Slovenia, E.U."
+msgstr ""
+
 #: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"
@@ -1544,6 +1549,22 @@ msgstr "Listet die verfügbaren Schriftarten auf."
 msgid "Fonts used by ZRCola"
 msgstr ""

+#: En.Win32.Release.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5
+msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgstr ""
+
+#: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7
+msgid "http://zrcola-2.amebis.si/en/contact/"
+msgstr "http://zrcola-2.amebis.si/de/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+msgid "http://zrcola-2.amebis.si/en/info/instructions/"
+msgstr "http://zrcola-2.amebis.si/de/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola-2.amebis.si/en/install/"
+msgstr "http://zrcola-2.amebis.si/de/install/"
+
 #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 msgid "I &agree."
 msgstr ""
@@ -1568,6 +1589,10 @@ msgstr ""
 msgid "Times New Roman based font"
 msgstr ""

+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+msgid "ZRCola"
+msgstr "ZRCola"
+
 #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 msgid "ZRCola Documentation"
 msgstr ""
@@ -1583,3 +1608,9 @@ msgstr "ZRCola:."
 #: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
 msgstr ""
+
+#~ msgid "00 ZRCola"
+#~ msgstr "00 ZRCola"
+
+#~ msgid "http://zrcola-2.amebis.si/en/"
+#~ msgstr "http://zrcola-2.amebis.si/de/"
--- a/MSI/ZRCola/locale/ru_RU.po
+++ b/MSI/ZRCola/locale/ru_RU.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola MSI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-01 19:00+0200\n"
+"POT-Creation-Date: 2016-07-15 21:43+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -1516,16 +1516,21 @@ msgid ""
 "using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Dr. Peter Weiss.\\f1\\par}"
 msgstr ""

-#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
-msgid "00 ZRCola"
-msgstr "00 ZRCola"
+#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6
+msgid "+386 1 470 6170"
+msgstr "+386 1 470 6170"

 # Windows charset for this language (decimal)
-#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
+#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3
+#: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3
+#: En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
 msgid "1252"
 msgstr "1251"

+#: En.Win32.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4
+msgid "Amebis, Slovenia, E.U."
+msgstr "Amebis, Словения, ЕС"
+
 #: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"
@@ -1542,6 +1547,22 @@ msgstr ""
 msgid "Fonts used by ZRCola"
 msgstr ""

+#: En.Win32.Release.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5
+msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgstr ""
+
+#: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7
+msgid "http://zrcola-2.amebis.si/en/contact/"
+msgstr "http://zrcola-2.amebis.si/ru/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+msgid "http://zrcola-2.amebis.si/en/info/instructions/"
+msgstr "http://zrcola-2.amebis.si/ru/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola-2.amebis.si/en/install/"
+msgstr "http://zrcola-2.amebis.si/ru/install/"
+
 #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 msgid "I &agree."
 msgstr ""
@@ -1566,6 +1587,10 @@ msgstr ""
 msgid "Times New Roman based font"
 msgstr ""

+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+msgid "ZRCola"
+msgstr "ZRCola"
+
 #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 msgid "ZRCola Documentation"
 msgstr ""
@@ -1581,3 +1606,12 @@ msgstr "ZRCola:."
 #: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
 msgstr ""
+
+#~ msgid "00 ZRCola"
+#~ msgstr "00 ZRCola"
+
+#~ msgid "http://zrcola-2.amebis.si/en/"
+#~ msgstr "http://zrcola-2.amebis.si/ru/"
+
+#~ msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U."
+#~ msgstr "Amebis, p. p. 69, SI-1241 Kamnik, Словения, ЕС"
--- a/MSI/ZRCola/locale/sl_SI.po
+++ b/MSI/ZRCola/locale/sl_SI.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola MSI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-01 19:00+0200\n"
+"POT-Creation-Date: 2016-07-15 21:43+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -1520,16 +1520,21 @@ msgstr ""
 "pripravljeno z vna\\'9aalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil dr. Peter Weiss."
 "\\i0\\f1\\par}"

-#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
-msgid "00 ZRCola"
-msgstr "00 ZRCola"
+#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6
+msgid "+386 1 470 6170"
+msgstr "01 470 6170"

 # Windows charset for this language (decimal)
-#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
+#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Property-2.idtx:3 En.Win32.Release.Registry-2.idtx:3
+#: En.Win32.Release.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Property-2.idtx:3
+#: En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3
 msgid "1252"
 msgstr "1250"

+#: En.Win32.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4
+msgid "Amebis, Slovenia, E.U."
+msgstr "Amebis, d. o. o., Kamnik"
+
 #: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"
@@ -1546,6 +1551,22 @@ msgstr "Pisave"
 msgid "Fonts used by ZRCola"
 msgstr "Pisave, ki jih uporablja ZRCola"

+#: En.Win32.Release.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5
+msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgstr "Inštitut za slovenski jezik Frana Ramovša ZRC SAZU"
+
+#: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7
+msgid "http://zrcola-2.amebis.si/en/contact/"
+msgstr "http://zrcola-2.amebis.si/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+msgid "http://zrcola-2.amebis.si/en/info/instructions/"
+msgstr "http://zrcola-2.amebis.si/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola-2.amebis.si/en/install/"
+msgstr "http://zrcola-2.amebis.si/install/"
+
 #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 msgid "I &agree."
 msgstr "&Strinjam se."
@@ -1570,6 +1591,10 @@ msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v
 msgid "Times New Roman based font"
 msgstr "Pisava na osnovi Times New Roman"

+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+msgid "ZRCola"
+msgstr "ZRCola"
+
 #: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 msgid "ZRCola Documentation"
 msgstr "Dokumentacija ZRCola"
@@ -1586,6 +1611,15 @@ msgstr "ZRCola:."
 msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
 msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici"

+#~ msgid "00 ZRCola"
+#~ msgstr "00 ZRCola"
+
+#~ msgid "http://zrcola-2.amebis.si/en/"
+#~ msgstr "http://zrcola-2.amebis.si/"
+
+#~ msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U."
+#~ msgstr "Amebis, p. p. 69, 1241 Kamnik"
+
 #, fuzzy
 #~ msgid "Determining required space for installation..."
 #~ msgstr "Ugotavljanje potrebnega prostora za namestitev ..."
--- a/170
+++ b/170
@@ -37,10 +37,18 @@ Clean ::
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
 	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=Win32 CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=Win32 CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=x64   CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=x64   CFG=Debug
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Release
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Debug
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Release
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=Win32 CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=Win32 CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=x64   CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=x64   CFG=Debug
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Release
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Debug
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Release
@@ -60,10 +68,18 @@ Clean ::
 	devenv.com "Updater\Updater.sln" /clean "Debug|Win32"
 	devenv.com "Updater\Updater.sln" /clean "Release|x64"
 	devenv.com "Updater\Updater.sln" /clean "Debug|x64"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe32.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe64.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu32.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu64.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi"
 	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
@@ -104,8 +120,12 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
 PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
 PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)

+REDIST_DE_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaDe32.msi"
+REDIST_DE_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaDe64.msi"
 REDIST_EN_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi"
 REDIST_EN_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi"
+REDIST_RU_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaRu32.msi"
+REDIST_RU_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaRu64.msi"
 REDIST_SL_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi"
 REDIST_SL_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi"

@@ -119,15 +139,23 @@ All :: \

 Setup :: \
 	"$(OUTPUT_DIR)\Setup" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaDe32.msi" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaDe64.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaRu64.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"

 SetupDebug :: \
 	"$(OUTPUT_DIR)\Setup" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" \
+#	"$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" \
 	"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"

@@ -158,24 +186,26 @@ UnregisterSettings ::
 !ENDIF

 InstallFonts :: \
-	"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" \
-	"$(WINDIR)\Fonts\00_ZRCola_It.ttf" \
-	"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" \
-	"$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             /t REG_SZ /d "00_ZRCola_Re.ttf" $(REG_FLAGS) > NUL
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      /t REG_SZ /d "00_ZRCola_It.ttf" $(REG_FLAGS) > NUL
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        /t REG_SZ /d "00_ZRCola_Bd.ttf" $(REG_FLAGS) > NUL
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" /t REG_SZ /d "00_ZRCola_BI.ttf" $(REG_FLAGS) > NUL
+	"$(WINDIR)\Fonts\ZRCola_Re.otf" \
+	"$(WINDIR)\Fonts\ZRCola_It.otf" \
+	"$(WINDIR)\Fonts\ZRCola_Bd.otf" \
+	"$(WINDIR)\Fonts\ZRCola_BI.otf"
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola (TrueType)"             /t REG_SZ /d "ZRCola_Re.otf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Italic (TrueType)"      /t REG_SZ /d "ZRCola_It.otf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold (TrueType)"        /t REG_SZ /d "ZRCola_Bd.otf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold Italic (TrueType)" /t REG_SZ /d "ZRCola_BI.otf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola"                     /t REG_SZ /d "ZRCola"        $(REG_FLAGS) > NUL

 UninstallFonts::
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             $(REG_FLAGS) > NUL
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_Re.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.ttf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_It.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.ttf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_BI.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola (TrueType)"             $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola"                     $(REG_FLAGS) > NUL
+	-if exist "$(WINDIR)\Fonts\ZRCola_Re.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Re.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_It.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_It.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_Bd.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Bd.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_BI.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_BI.otf"

 RegisterShortcuts :: \
 	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
@@ -186,14 +216,18 @@ UnregisterShortcuts ::

 PublishPre :: \
 	"$(PUBLISH_PACKAGE_DIR)" \
+#	$(REDIST_DE_WIN32) \
+#	$(REDIST_DE_X64) \
 	$(REDIST_EN_WIN32) \
 	$(REDIST_EN_X64) \
+#	$(REDIST_RU_WIN32) \
+#	$(REDIST_RU_X64) \
 	$(REDIST_SL_WIN32) \
 	$(REDIST_SL_X64) \
 	"$(PUBLISH_DIR)" \
-	"$(PUBLISH_DIR)\ZRColaInstallDe.exe" \
+#	"$(PUBLISH_DIR)\ZRColaInstallDe.exe" \
 	"$(PUBLISH_DIR)\ZRColaInstallEn.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallRu.exe" \
+#	"$(PUBLISH_DIR)\ZRColaInstallRu.exe" \
 	"$(PUBLISH_DIR)\ZRColaInstallSl.exe"

 Publish :: \
@@ -223,6 +257,20 @@ Publish :: \
 # File copy
 ######################################################################

+"$(OUTPUT_DIR)\Setup\ZRColaDe32.msi" \
+$(REDIST_DE_WIN32) : "$(OUTPUT_DIR)\ZRColaDe32.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi" : "$(OUTPUT_DIR)\ZRColaDe32D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaDe64.msi" \
+$(REDIST_DE_X64) : "$(OUTPUT_DIR)\ZRColaDe64.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" : "$(OUTPUT_DIR)\ZRColaDe64D.3.msi"
+	copy /y $** $@ > NUL
+
 "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
 $(REDIST_EN_WIN32) : "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
 	copy /y $** $@ > NUL
@@ -237,6 +285,20 @@ $(REDIST_EN_X64) : "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
 "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" : "$(OUTPUT_DIR)\ZRColaEn64D.3.msi"
 	copy /y $** $@ > NUL

+"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \
+$(REDIST_RU_WIN32) : "$(OUTPUT_DIR)\ZRColaRu32.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" : "$(OUTPUT_DIR)\ZRColaRu32D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaRu64.msi" \
+$(REDIST_RU_X64) : "$(OUTPUT_DIR)\ZRColaRu64.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" : "$(OUTPUT_DIR)\ZRColaRu64D.3.msi"
+	copy /y $** $@ > NUL
+
 "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
 $(REDIST_SL_WIN32) : "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
 	copy /y $** $@ > NUL
@@ -251,16 +313,16 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
 	copy /y $** $@ > NUL

-"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Re.ttf"
+"$(WINDIR)\Fonts\ZRCola_Re.otf" : "$(OUTPUT_DIR)\ZRCola_Re.otf"
 	copy /y $** $@ > NUL

-"$(WINDIR)\Fonts\00_ZRCola_It.ttf" : "$(OUTPUT_DIR)\00_ZRCola_It.ttf"
+"$(WINDIR)\Fonts\ZRCola_It.otf" : "$(OUTPUT_DIR)\ZRCola_It.otf"
 	copy /y $** $@ > NUL

-"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.ttf"
+"$(WINDIR)\Fonts\ZRCola_Bd.otf" : "$(OUTPUT_DIR)\ZRCola_Bd.otf"
 	copy /y $** $@ > NUL

-"$(WINDIR)\Fonts\00_ZRCola_BI.ttf" : "$(OUTPUT_DIR)\00_ZRCola_BI.ttf"
+"$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf"
 	copy /y $** $@ > NUL

 "$(PUBLISH_DIR)\ZRColaInstallDe.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallDe.exe"
@@ -293,7 +355,9 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaDe32.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu32.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
 	devenv.com "ZRCola.sln" /build "Release|Win32"

@@ -302,7 +366,9 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaDe32D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu32D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
 	devenv.com "ZRCola.sln" /build "Debug|Win32"

@@ -311,7 +377,9 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaDe64.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu64.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
 	devenv.com "ZRCola.sln" /build "Release|x64"

@@ -320,7 +388,9 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaDe64D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu64D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
 	devenv.com "ZRCola.sln" /build "Debug|x64"

@@ -336,26 +406,54 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(OUTPUT_DIR)\Win32.Debug\ZRColaInstallSl.exe" ::
 	devenv.com "ZRColaUtils.sln" /build "Debug|Win32"

+"$(OUTPUT_DIR)\ZRColaDe32.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu32.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32"
 	devenv.com "Updater\Updater.sln" /build "Release|Win32"

+"$(OUTPUT_DIR)\ZRColaDe32D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu32D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32"
 	devenv.com "Updater\Updater.sln" /build "Debug|Win32"

+"$(OUTPUT_DIR)\ZRColaDe64.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu64.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64"
 	devenv.com "Updater\Updater.sln" /build "Release|x64"

+"$(OUTPUT_DIR)\ZRColaDe64D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaRu64D.3.msi" \
 "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
 	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64"
 	devenv.com "Updater\Updater.sln" /build "Debug|x64"

+"$(OUTPUT_DIR)\ZRColaDe32.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=Win32 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaDe32D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=Win32 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaDe64.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=x64 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaDe64D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=x64 CFG=Debug
+	cd "$(MAKEDIR)"
+
 "$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
 	cd "MSI\ZRCola"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Release
@@ -376,6 +474,26 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Debug
 	cd "$(MAKEDIR)"

+"$(OUTPUT_DIR)\ZRColaRu32.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=Win32 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaRu32D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=Win32 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaRu64.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=x64 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaRu64D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=x64 CFG=Debug
+	cd "$(MAKEDIR)"
+
 "$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
 	cd "MSI\ZRCola"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Release
@@ -401,15 +519,23 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 	output\$(PLAT).Release\UpdSignXML.exe $** $@

 "$(OUTPUT_DIR)\catalog.xml" : \
+#	"$(OUTPUT_DIR)\ZRColaDe32.3.msi" \
+#	"$(OUTPUT_DIR)\ZRColaDe64.3.msi" \
 	"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
 	"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+#	"$(OUTPUT_DIR)\ZRColaRu32.3.msi" \
+#	"$(OUTPUT_DIR)\ZRColaRu64.3.msi" \
 	"$(OUTPUT_DIR)\ZRColaSl32.3.msi" \
 	"$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.3.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.3.msi"
 	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
 	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.3.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.3.msi"
 	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
 	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 	move /y "$(@:"=).tmp" $@ > NUL
--- a/README.md
+++ b/README.md
@@ -1 +1,44 @@
-# ZRCola
+# ZRCola
+
+A Microsoft Windows application for composing texts using a wide range of Slavic (and general) letters from or beyond Unicode.
+
+## Project Website
+http://zrcola-2.amebis.si/en/ (Development version)
+
+## Binaries for Download
+https://www.amebis.si/prenos/ZRCola/
+
+## Building
+
+### Building Environment Requirements
+- Microsoft Windows Vista or later
+- Microsoft Visual Studio 2010 SP1
+- _sed.exe_ and _grep.exe_
+- Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
+- Additional command line utilities from project’s bin folder: add bin folder to path. The source code is provided on request.
+
+### Digital Signing of Build Outputs
+In order to have the build process digitally sign output files, one should provide the following:
+
+1. A signing certificate installed in the current user’s certificate store.
+2. The following variables in the environment:
+  - `ManifestCertificateThumbprint` - set the value to certificate’s SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
+  - `ManifestTimestampUrl` - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+
+Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.
+
+### Building
+Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder.
+
+- `nmake Clean`	Delete all intermediate and output files.
+- `nmake Setup`	Build a release version of project and release MSI setup files.
+- `nmake SetupDebug`	Build a debug version of project and debug MSI setup files.
+- `nmake Register`	Build a debug version of project, install fonts (reboot required), and Start Menu shortcuts. For development purposes only!
+- `nmake Unregister`	Remove Start Menu shortcuts, and fonts. For development purposes only!
+
+The `/ls` flag can be appended to the commands above to reduce NMAKE’s verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+
+## Contact Information
+Please contact the following addressee for further information and help:
+- ZRC SAZU, ZRCola@zrc-sazu.si 
+- Amebis, info@amebis.si
--- a/2
+++ b/2
--- a/ZRCola.sln
+++ b/ZRCola.sln
@@ -5,7 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcx
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtend.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}"
 	ProjectSection(SolutionItems) = preProject
--- a/ZRCola/MSIBuild/Binary/tutorial1.bmp
+++ b/ZRCola/MSIBuild/Binary/tutorial1.bmp
--- a/ZRCola/MSIBuild/Binary/tutorial1.psd
+++ b/ZRCola/MSIBuild/Binary/tutorial1.psd
--- a/ZRCola/MSIBuild/Binary/tutorial2.bmp
+++ b/ZRCola/MSIBuild/Binary/tutorial2.bmp
--- a/ZRCola/MSIBuild/Binary/tutorial2.png
+++ b/ZRCola/MSIBuild/Binary/tutorial2.png
--- a/ZRCola/MSIBuild/Binary/tutorial3.bmp
+++ b/ZRCola/MSIBuild/Binary/tutorial3.bmp
--- a/ZRCola/MSIBuild/Binary/tutorial3.png
+++ b/ZRCola/MSIBuild/Binary/tutorial3.png
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -37,6 +37,36 @@ OLDZRCOLADIR	clZRCola.exe.$(PLAT)
 <<NOKEEP


+######################################################################
+# Binary
+
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial1.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial2.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp"
+
+"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Name	Data
+s$(MSIBUILD_LENGTH_ID)	v0
+Binary	Name
+bintutorial1.bmp	tutorial1.bmp
+bintutorial2.bmp	tutorial2.bmp
+bintutorial3.bmp	tutorial3.bmp
+<<NOKEEP
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial1.bmp" : "Binary\tutorial1.bmp"
+	copy /y $** $@ > NUL
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial2.bmp" : "Binary\tutorial2.bmp"
+	copy /y $** $@ > NUL
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp" : "Binary\tutorial3.bmp"
+	copy /y $** $@ > NUL
+
+
 ######################################################################
 # CompLocator

@@ -74,12 +104,111 @@ compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		file
 !IF "$(PLAT)" == "x64"
 compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
 !ENDIF
+!IF "$(LANG)" == "Ru"
+compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
+!ENDIF
 !IF "$(LANG)" == "Sl"
 compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
 !ENDIF
 <<NOKEEP


+######################################################################
+# Control
+
+All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt"
+
+"En.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
+s$(MSIBUILD_LENGTH_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSIBUILD_LENGTH_HELP)
+1252	Control	Dialog_	Control
+dlgTutorial1	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial1	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Starting	ctlScreenshot	
+dlgTutorial1	ctlScreenshot	Bitmap	154	60	92	54	5		bintutorial1.bmp	ctlText1	
+dlgTutorial1	ctlText1	Text	15	119	370	24	196611		When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5.	ctlText2	
+dlgTutorial1	ctlText2	Text	15	148	370	36	196611		IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!	ctlContinue	
+dlgTutorial1	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgTutorial2	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial2	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Composition	ctlScreenshot	
+dlgTutorial2	ctlScreenshot	Bitmap	81	60	238	137	5		bintutorial2.bmp	ctlText1	
+dlgTutorial2	ctlText1	Text	15	202	370	36	196611		The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used.	ctlContinue	
+dlgTutorial2	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgTutorial3	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial3	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters	ctlScreenshot	
+dlgTutorial3	ctlScreenshot	Bitmap	147	60	106	112	5		bintutorial3.bmp	ctlText1	
+dlgTutorial3	ctlText1	Text	15	177	370	24	196611		Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8).	ctlContinue	
+dlgTutorial3	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Ru.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
+######################################################################
+# ControlEvent
+
+All :: "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog_	Control_	Event	Argument	Condition	Ordering
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
+ControlEvent	Dialog_	Control_	Event	Argument	Condition
+dlgTutorial1	ctlContinue	EndDialog	Return	1	1000
+dlgTutorial2	ctlContinue	EndDialog	Return	1	1000
+dlgTutorial3	ctlContinue	EndDialog	Return	1	1000
+<<NOKEEP
+
+
+######################################################################
+# Dialog
+
+All :: "$(LANG).$(PLAT).$(CFG).Dialog-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Dialog-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
+s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
+Dialog	Dialog
+dlgTutorial1	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+dlgTutorial2	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+dlgTutorial3	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+<<NOKEEP
+
+
+######################################################################
+# InstallUISequence
+
+All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Action	Condition	Sequence
+s$(MSIBUILD_LENGTH_ID)	S255	I2
+InstallUISequence	Action
+dlgTutorial1	NOT Installed	1400
+dlgTutorial2	NOT Installed	1401
+dlgTutorial3	NOT Installed	1402
+<<NOKEEP
+
+
 ######################################################################
 # Feature

@@ -103,6 +232,9 @@ featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
 "It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

@@ -127,7 +259,15 @@ featZRCola	compLocalizationRepositoryPath
 featZRCola	compLanguage
 featZRCola	compDatabasePath
 featZRCola	compZRCola.zrcdb
-featZRCola	comp00_ZRCola_Re.ttf
+featZRCola	compZRCola_Re.otf
+!IF "$(LANG)" == "Ru"
+featZRCola	compZRCola.mo.ru_RU
+featZRCola	compZRCola.zrcdb.mo.ru_RU
+featZRCola	complibZRColaUI.mo.ru_RU
+featZRCola	compwxExtend.mo.ru_RU
+featZRCola	compUpdater.mo.ru_RU
+featZRCola	compwxstd.mo.ru_RU
+!ENDIF
 !IF "$(LANG)" == "Sl"
 featZRCola	compZRCola.mo.sl_SI
 featZRCola	compZRCola.zrcdb.mo.sl_SI
@@ -151,6 +291,9 @@ File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
 File	File
 fileZRCola.exe.$(PLAT)	compZRCola.exe.$(PLAT)	ZRCola.exe	0		0	1536	1
+!IF "$(LANG)" == "Ru"
+fileZRCola.mo.ru_RU	compZRCola.mo.ru_RU	ZRCola.mo	0		1060	0	1
+!ENDIF
 !IF "$(LANG)" == "Sl"
 fileZRCola.mo.sl_SI	compZRCola.mo.sl_SI	ZRCola.mo	0		1060	0	1
 !ENDIF
@@ -215,6 +358,9 @@ shctZRCola	ZRColaShortcutDir	ZRCola	compZRCola.exe.$(PLAT)	featZRCola		Input sys
 "It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**

+"Ru.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\ru_RU.po"
+	rcxgettext.exe idtp $@ $**
+
 "Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**

--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
@@ -1216,7 +1216,7 @@
                                                    <property name="enabled">1</property>
                                                    <property name="fg"></property>
                                                    <property name="floatable">1</property>
-                                                    <property name="font">00 ZRCola,90,90,20,70,0</property>
+                                                    <property name="font">ZRCola,90,90,20,70,0</property>
                                                    <property name="gripper">0</property>
                                                    <property name="hidden">0</property>
                                                    <property name="id">wxID_ANY</property>
@@ -1682,7 +1682,7 @@
                                                    <property name="enabled">1</property>
                                                    <property name="fg"></property>
                                                    <property name="floatable">1</property>
-                                                    <property name="font">00 ZRCola,90,90,20,70,0</property>
+                                                    <property name="font">ZRCola,90,90,20,70,0</property>
                                                    <property name="gripper">0</property>
                                                    <property name="hidden">0</property>
                                                    <property name="id">wxID_ANY</property>
@@ -2062,7 +2062,7 @@
                        <property name="style"></property>
                        <property name="subclass"></property>
                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip"></property>
+                        <property name="tooltip">Select category to display</property>
                        <property name="validator_data_type"></property>
                        <property name="validator_style">wxFILTER_NONE</property>
                        <property name="validator_type">wxDefaultValidator</property>
@@ -2116,7 +2116,7 @@
                        <property name="caption"></property>
                        <property name="caption_visible">1</property>
                        <property name="cell_bg">wxSYS_COLOUR_BTNFACE</property>
-                        <property name="cell_font">00 ZRCola,90,90,20,70,0</property>
+                        <property name="cell_font">ZRCola,90,90,20,70,0</property>
                        <property name="cell_horiz_alignment">wxALIGN_CENTRE</property>
                        <property name="cell_text"></property>
                        <property name="cell_vert_alignment">wxALIGN_CENTRE</property>
@@ -2239,6 +2239,94 @@
                        <event name="OnUpdateUI"></event>
                    </object>
                </object>
+                <object class="sizeritem" expanded="0">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" expanded="0">
+                        <property name="BottomDockable">1</property>
+                        <property name="LeftDockable">1</property>
+                        <property name="RightDockable">1</property>
+                        <property name="TopDockable">1</property>
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="checked">0</property>
+                        <property name="close_button">1</property>
+                        <property name="context_help"></property>
+                        <property name="context_menu">1</property>
+                        <property name="default_pane">0</property>
+                        <property name="dock">Dock</property>
+                        <property name="dock_fixed">0</property>
+                        <property name="docking">Left</property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="floatable">1</property>
+                        <property name="font"></property>
+                        <property name="gripper">0</property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Show &amp;All</property>
+                        <property name="max_size"></property>
+                        <property name="maximize_button">0</property>
+                        <property name="maximum_size"></property>
+                        <property name="min_size"></property>
+                        <property name="minimize_button">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="moveable">1</property>
+                        <property name="name">m_show_all</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip">Toggle display of less frequent characters</property>
+                        <property name="validator_data_type"></property>
+                        <property name="validator_style">wxFILTER_NONE</property>
+                        <property name="validator_type">wxDefaultValidator</property>
+                        <property name="validator_variable"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox">OnShowAll</event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
            </object>
        </object>
        <object class="Dialog" expanded="0">
@@ -2434,7 +2522,7 @@
                                            <property name="border">5</property>
                                            <property name="flag">wxALL|wxEXPAND</property>
                                            <property name="proportion">0</property>
-                                            <object class="wxCheckListBox" expanded="0">
+                                            <object class="wxHyperlinkCtrl" expanded="0">
                                                <property name="BottomDockable">1</property>
                                                <property name="LeftDockable">1</property>
                                                <property name="RightDockable">1</property>
@@ -2448,7 +2536,6 @@
                                                <property name="caption"></property>
                                                <property name="caption_visible">1</property>
                                                <property name="center_pane">0</property>
-                                                <property name="choices"></property>
                                                <property name="close_button">1</property>
                                                <property name="context_help"></property>
                                                <property name="context_menu">1</property>
@@ -2462,15 +2549,18 @@
                                                <property name="font"></property>
                                                <property name="gripper">0</property>
                                                <property name="hidden">0</property>
+                                                <property name="hover_color"></property>
                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Search Options</property>
                                                <property name="max_size"></property>
                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size">-1,-1</property>
+                                                <property name="maximum_size"></property>
                                                <property name="min_size"></property>
                                                <property name="minimize_button">0</property>
                                                <property name="minimum_size"></property>
                                                <property name="moveable">1</property>
-                                                <property name="name">m_categories</property>
+                                                <property name="name">m_search_more</property>
+                                                <property name="normal_color"></property>
                                                <property name="pane_border">1</property>
                                                <property name="pane_position"></property>
                                                <property name="pane_size"></property>
@@ -2479,24 +2569,20 @@
                                                <property name="pos"></property>
                                                <property name="resize">Resizable</property>
                                                <property name="show">1</property>
-                                                <property name="size">-1,60</property>
-                                                <property name="style"></property>
+                                                <property name="size"></property>
+                                                <property name="style">wxHL_DEFAULT_STYLE</property>
                                                <property name="subclass"></property>
                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">List of Unicode character categories to search in</property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
+                                                <property name="tooltip">Shows/hides additional search options</property>
+                                                <property name="url"></property>
+                                                <property name="visited_color"></property>
                                                <property name="window_extra_style"></property>
                                                <property name="window_name"></property>
                                                <property name="window_style"></property>
                                                <event name="OnChar"></event>
-                                                <event name="OnCheckListBox"></event>
-                                                <event name="OnCheckListBoxDClick"></event>
-                                                <event name="OnCheckListBoxToggled">OnCategoriesToggle</event>
                                                <event name="OnEnterWindow"></event>
                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnHyperlink">OnSearchMore</event>
                                                <event name="OnKeyDown"></event>
                                                <event name="OnKeyUp"></event>
                                                <event name="OnKillFocus"></event>
@@ -2521,272 +2607,447 @@
                                        </object>
                                        <object class="sizeritem" expanded="0">
                                            <property name="border">5</property>
-                                            <property name="flag">wxALIGN_RIGHT</property>
+                                            <property name="flag">wxEXPAND</property>
                                            <property name="proportion">0</property>
-                                            <object class="wxBoxSizer" expanded="0">
+                                            <object class="wxPanel" expanded="0">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">1</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
                                                <property name="minimum_size"></property>
-                                                <property name="name">bSizerCategoriesCtrl</property>
-                                                <property name="orient">wxHORIZONTAL</property>
-                                                <property name="permission">none</property>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag">wxALL</property>
-                                                    <property name="proportion">0</property>
-                                                    <object class="wxHyperlinkCtrl" expanded="0">
-                                                        <property name="BottomDockable">1</property>
-                                                        <property name="LeftDockable">1</property>
-                                                        <property name="RightDockable">1</property>
-                                                        <property name="TopDockable">1</property>
-                                                        <property name="aui_layer"></property>
-                                                        <property name="aui_name"></property>
-                                                        <property name="aui_position"></property>
-                                                        <property name="aui_row"></property>
-                                                        <property name="best_size"></property>
-                                                        <property name="bg"></property>
-                                                        <property name="caption"></property>
-                                                        <property name="caption_visible">1</property>
-                                                        <property name="center_pane">0</property>
-                                                        <property name="close_button">1</property>
-                                                        <property name="context_help"></property>
-                                                        <property name="context_menu">1</property>
-                                                        <property name="default_pane">0</property>
-                                                        <property name="dock">Dock</property>
-                                                        <property name="dock_fixed">0</property>
-                                                        <property name="docking">Left</property>
-                                                        <property name="enabled">1</property>
-                                                        <property name="fg"></property>
-                                                        <property name="floatable">1</property>
-                                                        <property name="font"></property>
-                                                        <property name="gripper">0</property>
-                                                        <property name="hidden">0</property>
-                                                        <property name="hover_color"></property>
-                                                        <property name="id">wxID_ANY</property>
-                                                        <property name="label">All</property>
-                                                        <property name="max_size"></property>
-                                                        <property name="maximize_button">0</property>
-                                                        <property name="maximum_size"></property>
-                                                        <property name="min_size"></property>
-                                                        <property name="minimize_button">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="moveable">1</property>
-                                                        <property name="name">m_categoriesAll</property>
-                                                        <property name="normal_color"></property>
-                                                        <property name="pane_border">1</property>
-                                                        <property name="pane_position"></property>
-                                                        <property name="pane_size"></property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="pin_button">1</property>
-                                                        <property name="pos"></property>
-                                                        <property name="resize">Resizable</property>
-                                                        <property name="show">1</property>
-                                                        <property name="size"></property>
-                                                        <property name="style">wxHL_DEFAULT_STYLE</property>
-                                                        <property name="subclass"></property>
-                                                        <property name="toolbar_pane">0</property>
-                                                        <property name="tooltip">Select all categories</property>
-                                                        <property name="url"></property>
-                                                        <property name="visited_color"></property>
-                                                        <property name="window_extra_style"></property>
-                                                        <property name="window_name"></property>
-                                                        <property name="window_style"></property>
-                                                        <event name="OnChar"></event>
-                                                        <event name="OnEnterWindow"></event>
-                                                        <event name="OnEraseBackground"></event>
-                                                        <event name="OnHyperlink">OnCategoriesAll</event>
-                                                        <event name="OnKeyDown"></event>
-                                                        <event name="OnKeyUp"></event>
-                                                        <event name="OnKillFocus"></event>
-                                                        <event name="OnLeaveWindow"></event>
-                                                        <event name="OnLeftDClick"></event>
-                                                        <event name="OnLeftDown"></event>
-                                                        <event name="OnLeftUp"></event>
-                                                        <event name="OnMiddleDClick"></event>
-                                                        <event name="OnMiddleDown"></event>
-                                                        <event name="OnMiddleUp"></event>
-                                                        <event name="OnMotion"></event>
-                                                        <event name="OnMouseEvents"></event>
-                                                        <event name="OnMouseWheel"></event>
-                                                        <event name="OnPaint"></event>
-                                                        <event name="OnRightDClick"></event>
-                                                        <event name="OnRightDown"></event>
-                                                        <event name="OnRightUp"></event>
-                                                        <event name="OnSetFocus"></event>
-                                                        <event name="OnSize"></event>
-                                                        <event name="OnUpdateUI"></event>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_search_panel</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style">wxTAB_TRAVERSAL</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                                <object class="wxBoxSizer" expanded="0">
+                                                    <property name="minimum_size"></property>
+                                                    <property name="name">sbSizerSearch</property>
+                                                    <property name="orient">wxVERTICAL</property>
+                                                    <property name="permission">none</property>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxEXPAND</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxCheckListBox" expanded="0">
+                                                            <property name="BottomDockable">1</property>
+                                                            <property name="LeftDockable">1</property>
+                                                            <property name="RightDockable">1</property>
+                                                            <property name="TopDockable">1</property>
+                                                            <property name="aui_layer"></property>
+                                                            <property name="aui_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</property>
+                                                            <property name="center_pane">0</property>
+                                                            <property name="choices"></property>
+                                                            <property name="close_button">1</property>
+                                                            <property name="context_help"></property>
+                                                            <property name="context_menu">1</property>
+                                                            <property name="default_pane">0</property>
+                                                            <property name="dock">Dock</property>
+                                                            <property name="dock_fixed">0</property>
+                                                            <property name="docking">Left</property>
+                                                            <property name="enabled">1</property>
+                                                            <property name="fg"></property>
+                                                            <property name="floatable">1</property>
+                                                            <property name="font"></property>
+                                                            <property name="gripper">0</property>
+                                                            <property name="hidden">0</property>
+                                                            <property name="id">wxID_ANY</property>
+                                                            <property name="max_size"></property>
+                                                            <property name="maximize_button">0</property>
+                                                            <property name="maximum_size">-1,-1</property>
+                                                            <property name="min_size"></property>
+                                                            <property name="minimize_button">0</property>
+                                                            <property name="minimum_size"></property>
+                                                            <property name="moveable">1</property>
+                                                            <property name="name">m_categories</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size">-1,60</property>
+                                                            <property name="style"></property>
+                                                            <property name="subclass"></property>
+                                                            <property name="toolbar_pane">0</property>
+                                                            <property name="tooltip">List of Unicode character categories to search in</property>
+                                                            <property name="validator_data_type"></property>
+                                                            <property name="validator_style">wxFILTER_NONE</property>
+                                                            <property name="validator_type">wxDefaultValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnCheckListBox"></event>
+                                                            <event name="OnCheckListBoxDClick"></event>
+                                                            <event name="OnCheckListBoxToggled">OnCategoriesToggle</event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
                                                    </object>
-                                                </object>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag">wxALL</property>
-                                                    <property name="proportion">0</property>
-                                                    <object class="wxHyperlinkCtrl" expanded="0">
-                                                        <property name="BottomDockable">1</property>
-                                                        <property name="LeftDockable">1</property>
-                                                        <property name="RightDockable">1</property>
-                                                        <property name="TopDockable">1</property>
-                                                        <property name="aui_layer"></property>
-                                                        <property name="aui_name"></property>
-                                                        <property name="aui_position"></property>
-                                                        <property name="aui_row"></property>
-                                                        <property name="best_size"></property>
-                                                        <property name="bg"></property>
-                                                        <property name="caption"></property>
-                                                        <property name="caption_visible">1</property>
-                                                        <property name="center_pane">0</property>
-                                                        <property name="close_button">1</property>
-                                                        <property name="context_help"></property>
-                                                        <property name="context_menu">1</property>
-                                                        <property name="default_pane">0</property>
-                                                        <property name="dock">Dock</property>
-                                                        <property name="dock_fixed">0</property>
-                                                        <property name="docking">Left</property>
-                                                        <property name="enabled">1</property>
-                                                        <property name="fg"></property>
-                                                        <property name="floatable">1</property>
-                                                        <property name="font"></property>
-                                                        <property name="gripper">0</property>
-                                                        <property name="hidden">0</property>
-                                                        <property name="hover_color"></property>
-                                                        <property name="id">wxID_ANY</property>
-                                                        <property name="label">None</property>
-                                                        <property name="max_size"></property>
-                                                        <property name="maximize_button">0</property>
-                                                        <property name="maximum_size"></property>
-                                                        <property name="min_size"></property>
-                                                        <property name="minimize_button">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="moveable">1</property>
-                                                        <property name="name">m_categoriesNone</property>
-                                                        <property name="normal_color"></property>
-                                                        <property name="pane_border">1</property>
-                                                        <property name="pane_position"></property>
-                                                        <property name="pane_size"></property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="pin_button">1</property>
-                                                        <property name="pos"></property>
-                                                        <property name="resize">Resizable</property>
-                                                        <property name="show">1</property>
-                                                        <property name="size"></property>
-                                                        <property name="style">wxHL_DEFAULT_STYLE</property>
-                                                        <property name="subclass"></property>
-                                                        <property name="toolbar_pane">0</property>
-                                                        <property name="tooltip">Clear category selection</property>
-                                                        <property name="url"></property>
-                                                        <property name="visited_color"></property>
-                                                        <property name="window_extra_style"></property>
-                                                        <property name="window_name"></property>
-                                                        <property name="window_style"></property>
-                                                        <event name="OnChar"></event>
-                                                        <event name="OnEnterWindow"></event>
-                                                        <event name="OnEraseBackground"></event>
-                                                        <event name="OnHyperlink">OnCategoriesNone</event>
-                                                        <event name="OnKeyDown"></event>
-                                                        <event name="OnKeyUp"></event>
-                                                        <event name="OnKillFocus"></event>
-                                                        <event name="OnLeaveWindow"></event>
-                                                        <event name="OnLeftDClick"></event>
-                                                        <event name="OnLeftDown"></event>
-                                                        <event name="OnLeftUp"></event>
-                                                        <event name="OnMiddleDClick"></event>
-                                                        <event name="OnMiddleDown"></event>
-                                                        <event name="OnMiddleUp"></event>
-                                                        <event name="OnMotion"></event>
-                                                        <event name="OnMouseEvents"></event>
-                                                        <event name="OnMouseWheel"></event>
-                                                        <event name="OnPaint"></event>
-                                                        <event name="OnRightDClick"></event>
-                                                        <event name="OnRightDown"></event>
-                                                        <event name="OnRightUp"></event>
-                                                        <event name="OnSetFocus"></event>
-                                                        <event name="OnSize"></event>
-                                                        <event name="OnUpdateUI"></event>
-                                                    </object>
-                                                </object>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag">wxALL</property>
-                                                    <property name="proportion">0</property>
-                                                    <object class="wxHyperlinkCtrl" expanded="0">
-                                                        <property name="BottomDockable">1</property>
-                                                        <property name="LeftDockable">1</property>
-                                                        <property name="RightDockable">1</property>
-                                                        <property name="TopDockable">1</property>
-                                                        <property name="aui_layer"></property>
-                                                        <property name="aui_name"></property>
-                                                        <property name="aui_position"></property>
-                                                        <property name="aui_row"></property>
-                                                        <property name="best_size"></property>
-                                                        <property name="bg"></property>
-                                                        <property name="caption"></property>
-                                                        <property name="caption_visible">1</property>
-                                                        <property name="center_pane">0</property>
-                                                        <property name="close_button">1</property>
-                                                        <property name="context_help"></property>
-                                                        <property name="context_menu">1</property>
-                                                        <property name="default_pane">0</property>
-                                                        <property name="dock">Dock</property>
-                                                        <property name="dock_fixed">0</property>
-                                                        <property name="docking">Left</property>
-                                                        <property name="enabled">1</property>
-                                                        <property name="fg"></property>
-                                                        <property name="floatable">1</property>
-                                                        <property name="font"></property>
-                                                        <property name="gripper">0</property>
-                                                        <property name="hidden">0</property>
-                                                        <property name="hover_color"></property>
-                                                        <property name="id">wxID_ANY</property>
-                                                        <property name="label">Invert</property>
-                                                        <property name="max_size"></property>
-                                                        <property name="maximize_button">0</property>
-                                                        <property name="maximum_size"></property>
-                                                        <property name="min_size"></property>
-                                                        <property name="minimize_button">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="moveable">1</property>
-                                                        <property name="name">m_categoriesInvert</property>
-                                                        <property name="normal_color"></property>
-                                                        <property name="pane_border">1</property>
-                                                        <property name="pane_position"></property>
-                                                        <property name="pane_size"></property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="pin_button">1</property>
-                                                        <property name="pos"></property>
-                                                        <property name="resize">Resizable</property>
-                                                        <property name="show">1</property>
-                                                        <property name="size"></property>
-                                                        <property name="style">wxHL_DEFAULT_STYLE</property>
-                                                        <property name="subclass"></property>
-                                                        <property name="toolbar_pane">0</property>
-                                                        <property name="tooltip">Invert category selection</property>
-                                                        <property name="url"></property>
-                                                        <property name="visited_color"></property>
-                                                        <property name="window_extra_style"></property>
-                                                        <property name="window_name"></property>
-                                                        <property name="window_style"></property>
-                                                        <event name="OnChar"></event>
-                                                        <event name="OnEnterWindow"></event>
-                                                        <event name="OnEraseBackground"></event>
-                                                        <event name="OnHyperlink">OnCategoriesInvert</event>
-                                                        <event name="OnKeyDown"></event>
-                                                        <event name="OnKeyUp"></event>
-                                                        <event name="OnKillFocus"></event>
-                                                        <event name="OnLeaveWindow"></event>
-                                                        <event name="OnLeftDClick"></event>
-                                                        <event name="OnLeftDown"></event>
-                                                        <event name="OnLeftUp"></event>
-                                                        <event name="OnMiddleDClick"></event>
-                                                        <event name="OnMiddleDown"></event>
-                                                        <event name="OnMiddleUp"></event>
-                                                        <event name="OnMotion"></event>
-                                                        <event name="OnMouseEvents"></event>
-                                                        <event name="OnMouseWheel"></event>
-                                                        <event name="OnPaint"></event>
-                                                        <event name="OnRightDClick"></event>
-                                                        <event name="OnRightDown"></event>
-                                                        <event name="OnRightUp"></event>
-                                                        <event name="OnSetFocus"></event>
-                                                        <event name="OnSize"></event>
-                                                        <event name="OnUpdateUI"></event>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_RIGHT</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxBoxSizer" expanded="0">
+                                                            <property name="minimum_size"></property>
+                                                            <property name="name">bSizerCategoriesCtrl</property>
+                                                            <property name="orient">wxHORIZONTAL</property>
+                                                            <property name="permission">none</property>
+                                                            <object class="sizeritem" expanded="0">
+                                                                <property name="border">5</property>
+                                                                <property name="flag">wxALL</property>
+                                                                <property name="proportion">0</property>
+                                                                <object class="wxHyperlinkCtrl" expanded="0">
+                                                                    <property name="BottomDockable">1</property>
+                                                                    <property name="LeftDockable">1</property>
+                                                                    <property name="RightDockable">1</property>
+                                                                    <property name="TopDockable">1</property>
+                                                                    <property name="aui_layer"></property>
+                                                                    <property name="aui_name"></property>
+                                                                    <property name="aui_position"></property>
+                                                                    <property name="aui_row"></property>
+                                                                    <property name="best_size"></property>
+                                                                    <property name="bg"></property>
+                                                                    <property name="caption"></property>
+                                                                    <property name="caption_visible">1</property>
+                                                                    <property name="center_pane">0</property>
+                                                                    <property name="close_button">1</property>
+                                                                    <property name="context_help"></property>
+                                                                    <property name="context_menu">1</property>
+                                                                    <property name="default_pane">0</property>
+                                                                    <property name="dock">Dock</property>
+                                                                    <property name="dock_fixed">0</property>
+                                                                    <property name="docking">Left</property>
+                                                                    <property name="enabled">1</property>
+                                                                    <property name="fg"></property>
+                                                                    <property name="floatable">1</property>
+                                                                    <property name="font"></property>
+                                                                    <property name="gripper">0</property>
+                                                                    <property name="hidden">0</property>
+                                                                    <property name="hover_color"></property>
+                                                                    <property name="id">wxID_ANY</property>
+                                                                    <property name="label">All</property>
+                                                                    <property name="max_size"></property>
+                                                                    <property name="maximize_button">0</property>
+                                                                    <property name="maximum_size"></property>
+                                                                    <property name="min_size"></property>
+                                                                    <property name="minimize_button">0</property>
+                                                                    <property name="minimum_size"></property>
+                                                                    <property name="moveable">1</property>
+                                                                    <property name="name">m_categoriesAll</property>
+                                                                    <property name="normal_color"></property>
+                                                                    <property name="pane_border">1</property>
+                                                                    <property name="pane_position"></property>
+                                                                    <property name="pane_size"></property>
+                                                                    <property name="permission">protected</property>
+                                                                    <property name="pin_button">1</property>
+                                                                    <property name="pos"></property>
+                                                                    <property name="resize">Resizable</property>
+                                                                    <property name="show">1</property>
+                                                                    <property name="size"></property>
+                                                                    <property name="style">wxHL_DEFAULT_STYLE</property>
+                                                                    <property name="subclass"></property>
+                                                                    <property name="toolbar_pane">0</property>
+                                                                    <property name="tooltip">Select all categories</property>
+                                                                    <property name="url"></property>
+                                                                    <property name="visited_color"></property>
+                                                                    <property name="window_extra_style"></property>
+                                                                    <property name="window_name"></property>
+                                                                    <property name="window_style"></property>
+                                                                    <event name="OnChar"></event>
+                                                                    <event name="OnEnterWindow"></event>
+                                                                    <event name="OnEraseBackground"></event>
+                                                                    <event name="OnHyperlink">OnCategoriesAll</event>
+                                                                    <event name="OnKeyDown"></event>
+                                                                    <event name="OnKeyUp"></event>
+                                                                    <event name="OnKillFocus"></event>
+                                                                    <event name="OnLeaveWindow"></event>
+                                                                    <event name="OnLeftDClick"></event>
+                                                                    <event name="OnLeftDown"></event>
+                                                                    <event name="OnLeftUp"></event>
+                                                                    <event name="OnMiddleDClick"></event>
+                                                                    <event name="OnMiddleDown"></event>
+                                                                    <event name="OnMiddleUp"></event>
+                                                                    <event name="OnMotion"></event>
+                                                                    <event name="OnMouseEvents"></event>
+                                                                    <event name="OnMouseWheel"></event>
+                                                                    <event name="OnPaint"></event>
+                                                                    <event name="OnRightDClick"></event>
+                                                                    <event name="OnRightDown"></event>
+                                                                    <event name="OnRightUp"></event>
+                                                                    <event name="OnSetFocus"></event>
+                                                                    <event name="OnSize"></event>
+                                                                    <event name="OnUpdateUI"></event>
+                                                                </object>
+                                                            </object>
+                                                            <object class="sizeritem" expanded="0">
+                                                                <property name="border">5</property>
+                                                                <property name="flag">wxALL</property>
+                                                                <property name="proportion">0</property>
+                                                                <object class="wxHyperlinkCtrl" expanded="0">
+                                                                    <property name="BottomDockable">1</property>
+                                                                    <property name="LeftDockable">1</property>
+                                                                    <property name="RightDockable">1</property>
+                                                                    <property name="TopDockable">1</property>
+                                                                    <property name="aui_layer"></property>
+                                                                    <property name="aui_name"></property>
+                                                                    <property name="aui_position"></property>
+                                                                    <property name="aui_row"></property>
+                                                                    <property name="best_size"></property>
+                                                                    <property name="bg"></property>
+                                                                    <property name="caption"></property>
+                                                                    <property name="caption_visible">1</property>
+                                                                    <property name="center_pane">0</property>
+                                                                    <property name="close_button">1</property>
+                                                                    <property name="context_help"></property>
+                                                                    <property name="context_menu">1</property>
+                                                                    <property name="default_pane">0</property>
+                                                                    <property name="dock">Dock</property>
+                                                                    <property name="dock_fixed">0</property>
+                                                                    <property name="docking">Left</property>
+                                                                    <property name="enabled">1</property>
+                                                                    <property name="fg"></property>
+                                                                    <property name="floatable">1</property>
+                                                                    <property name="font"></property>
+                                                                    <property name="gripper">0</property>
+                                                                    <property name="hidden">0</property>
+                                                                    <property name="hover_color"></property>
+                                                                    <property name="id">wxID_ANY</property>
+                                                                    <property name="label">None</property>
+                                                                    <property name="max_size"></property>
+                                                                    <property name="maximize_button">0</property>
+                                                                    <property name="maximum_size"></property>
+                                                                    <property name="min_size"></property>
+                                                                    <property name="minimize_button">0</property>
+                                                                    <property name="minimum_size"></property>
+                                                                    <property name="moveable">1</property>
+                                                                    <property name="name">m_categoriesNone</property>
+                                                                    <property name="normal_color"></property>
+                                                                    <property name="pane_border">1</property>
+                                                                    <property name="pane_position"></property>
+                                                                    <property name="pane_size"></property>
+                                                                    <property name="permission">protected</property>
+                                                                    <property name="pin_button">1</property>
+                                                                    <property name="pos"></property>
+                                                                    <property name="resize">Resizable</property>
+                                                                    <property name="show">1</property>
+                                                                    <property name="size"></property>
+                                                                    <property name="style">wxHL_DEFAULT_STYLE</property>
+                                                                    <property name="subclass"></property>
+                                                                    <property name="toolbar_pane">0</property>
+                                                                    <property name="tooltip">Clear category selection</property>
+                                                                    <property name="url"></property>
+                                                                    <property name="visited_color"></property>
+                                                                    <property name="window_extra_style"></property>
+                                                                    <property name="window_name"></property>
+                                                                    <property name="window_style"></property>
+                                                                    <event name="OnChar"></event>
+                                                                    <event name="OnEnterWindow"></event>
+                                                                    <event name="OnEraseBackground"></event>
+                                                                    <event name="OnHyperlink">OnCategoriesNone</event>
+                                                                    <event name="OnKeyDown"></event>
+                                                                    <event name="OnKeyUp"></event>
+                                                                    <event name="OnKillFocus"></event>
+                                                                    <event name="OnLeaveWindow"></event>
+                                                                    <event name="OnLeftDClick"></event>
+                                                                    <event name="OnLeftDown"></event>
+                                                                    <event name="OnLeftUp"></event>
+                                                                    <event name="OnMiddleDClick"></event>
+                                                                    <event name="OnMiddleDown"></event>
+                                                                    <event name="OnMiddleUp"></event>
+                                                                    <event name="OnMotion"></event>
+                                                                    <event name="OnMouseEvents"></event>
+                                                                    <event name="OnMouseWheel"></event>
+                                                                    <event name="OnPaint"></event>
+                                                                    <event name="OnRightDClick"></event>
+                                                                    <event name="OnRightDown"></event>
+                                                                    <event name="OnRightUp"></event>
+                                                                    <event name="OnSetFocus"></event>
+                                                                    <event name="OnSize"></event>
+                                                                    <event name="OnUpdateUI"></event>
+                                                                </object>
+                                                            </object>
+                                                            <object class="sizeritem" expanded="0">
+                                                                <property name="border">5</property>
+                                                                <property name="flag">wxALL</property>
+                                                                <property name="proportion">0</property>
+                                                                <object class="wxHyperlinkCtrl" expanded="0">
+                                                                    <property name="BottomDockable">1</property>
+                                                                    <property name="LeftDockable">1</property>
+                                                                    <property name="RightDockable">1</property>
+                                                                    <property name="TopDockable">1</property>
+                                                                    <property name="aui_layer"></property>
+                                                                    <property name="aui_name"></property>
+                                                                    <property name="aui_position"></property>
+                                                                    <property name="aui_row"></property>
+                                                                    <property name="best_size"></property>
+                                                                    <property name="bg"></property>
+                                                                    <property name="caption"></property>
+                                                                    <property name="caption_visible">1</property>
+                                                                    <property name="center_pane">0</property>
+                                                                    <property name="close_button">1</property>
+                                                                    <property name="context_help"></property>
+                                                                    <property name="context_menu">1</property>
+                                                                    <property name="default_pane">0</property>
+                                                                    <property name="dock">Dock</property>
+                                                                    <property name="dock_fixed">0</property>
+                                                                    <property name="docking">Left</property>
+                                                                    <property name="enabled">1</property>
+                                                                    <property name="fg"></property>
+                                                                    <property name="floatable">1</property>
+                                                                    <property name="font"></property>
+                                                                    <property name="gripper">0</property>
+                                                                    <property name="hidden">0</property>
+                                                                    <property name="hover_color"></property>
+                                                                    <property name="id">wxID_ANY</property>
+                                                                    <property name="label">Invert</property>
+                                                                    <property name="max_size"></property>
+                                                                    <property name="maximize_button">0</property>
+                                                                    <property name="maximum_size"></property>
+                                                                    <property name="min_size"></property>
+                                                                    <property name="minimize_button">0</property>
+                                                                    <property name="minimum_size"></property>
+                                                                    <property name="moveable">1</property>
+                                                                    <property name="name">m_categoriesInvert</property>
+                                                                    <property name="normal_color"></property>
+                                                                    <property name="pane_border">1</property>
+                                                                    <property name="pane_position"></property>
+                                                                    <property name="pane_size"></property>
+                                                                    <property name="permission">protected</property>
+                                                                    <property name="pin_button">1</property>
+                                                                    <property name="pos"></property>
+                                                                    <property name="resize">Resizable</property>
+                                                                    <property name="show">1</property>
+                                                                    <property name="size"></property>
+                                                                    <property name="style">wxHL_DEFAULT_STYLE</property>
+                                                                    <property name="subclass"></property>
+                                                                    <property name="toolbar_pane">0</property>
+                                                                    <property name="tooltip">Invert category selection</property>
+                                                                    <property name="url"></property>
+                                                                    <property name="visited_color"></property>
+                                                                    <property name="window_extra_style"></property>
+                                                                    <property name="window_name"></property>
+                                                                    <property name="window_style"></property>
+                                                                    <event name="OnChar"></event>
+                                                                    <event name="OnEnterWindow"></event>
+                                                                    <event name="OnEraseBackground"></event>
+                                                                    <event name="OnHyperlink">OnCategoriesInvert</event>
+                                                                    <event name="OnKeyDown"></event>
+                                                                    <event name="OnKeyUp"></event>
+                                                                    <event name="OnKillFocus"></event>
+                                                                    <event name="OnLeaveWindow"></event>
+                                                                    <event name="OnLeftDClick"></event>
+                                                                    <event name="OnLeftDown"></event>
+                                                                    <event name="OnLeftUp"></event>
+                                                                    <event name="OnMiddleDClick"></event>
+                                                                    <event name="OnMiddleDown"></event>
+                                                                    <event name="OnMiddleUp"></event>
+                                                                    <event name="OnMotion"></event>
+                                                                    <event name="OnMouseEvents"></event>
+                                                                    <event name="OnMouseWheel"></event>
+                                                                    <event name="OnPaint"></event>
+                                                                    <event name="OnRightDClick"></event>
+                                                                    <event name="OnRightDown"></event>
+                                                                    <event name="OnRightUp"></event>
+                                                                    <event name="OnSetFocus"></event>
+                                                                    <event name="OnSize"></event>
+                                                                    <event name="OnUpdateUI"></event>
+                                                                </object>
+                                                            </object>
+                                                        </object>
                                                    </object>
                                                </object>
                                            </object>
@@ -2811,7 +3072,7 @@
                                                <property name="caption"></property>
                                                <property name="caption_visible">1</property>
                                                <property name="cell_bg"></property>
-                                                <property name="cell_font">00 ZRCola,90,90,20,70,0</property>
+                                                <property name="cell_font">ZRCola,90,90,20,70,0</property>
                                                <property name="cell_horiz_alignment">wxALIGN_CENTRE</property>
                                                <property name="cell_text"></property>
                                                <property name="cell_vert_alignment">wxALIGN_CENTRE</property>
@@ -2968,7 +3229,7 @@
                                                <property name="caption"></property>
                                                <property name="caption_visible">1</property>
                                                <property name="cell_bg"></property>
-                                                <property name="cell_font">00 ZRCola,90,90,20,70,0</property>
+                                                <property name="cell_font">ZRCola,90,90,20,70,0</property>
                                                <property name="cell_horiz_alignment">wxALIGN_CENTRE</property>
                                                <property name="cell_text"></property>
                                                <property name="cell_vert_alignment">wxALIGN_CENTRE</property>
@@ -3412,7 +3673,7 @@
                                                <property name="caption"></property>
                                                <property name="caption_visible">1</property>
                                                <property name="cell_bg"></property>
-                                                <property name="cell_font">00 ZRCola,90,90,96,70,0</property>
+                                                <property name="cell_font">ZRCola,90,90,96,70,0</property>
                                                <property name="cell_horiz_alignment">wxALIGN_CENTRE</property>
                                                <property name="cell_text"></property>
                                                <property name="cell_vert_alignment">wxALIGN_CENTRE</property>
@@ -3936,7 +4197,7 @@
                                                <property name="caption"></property>
                                                <property name="caption_visible">1</property>
                                                <property name="cell_bg"></property>
-                                                <property name="cell_font">00 ZRCola,90,90,20,70,0</property>
+                                                <property name="cell_font">ZRCola,90,90,20,70,0</property>
                                                <property name="cell_horiz_alignment">wxALIGN_CENTRE</property>
                                                <property name="cell_text"></property>
                                                <property name="cell_vert_alignment">wxALIGN_CENTRE</property>
@@ -5176,7 +5437,7 @@
                                        <property name="enabled">1</property>
                                        <property name="fg"></property>
                                        <property name="floatable">1</property>
-                                        <property name="font">00 ZRCola,90,90,20,70,0</property>
+                                        <property name="font">ZRCola,90,90,20,70,0</property>
                                        <property name="gripper">0</property>
                                        <property name="hidden">0</property>
                                        <property name="id">wxID_ANY</property>
@@ -6354,7 +6615,7 @@
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="floatable">1</property>
-                                <property name="font">00 ZRCola,90,90,20,70,0</property>
+                                <property name="font">ZRCola,90,90,20,70,0</property>
                                <property name="gripper">0</property>
                                <property name="hidden">0</property>
                                <property name="id">wxID_ANY</property>
@@ -6625,7 +6886,7 @@
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="floatable">1</property>
-                                <property name="font">00 ZRCola,90,90,16,70,0</property>
+                                <property name="font">ZRCola,90,90,16,70,0</property>
                                <property name="gripper">0</property>
                                <property name="hidden">0</property>
                                <property name="id">wxID_ANY</property>
--- a/ZRCola/ZRCola.vcxproj
+++ b/ZRCola/ZRCola.vcxproj
@@ -115,7 +115,7 @@
    <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
      <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll.vcxproj">
      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
    </ProjectReference>
    <ProjectReference Include="..\Updater\Updater\build\Updater.vcxproj">
--- a/ZRCola/locale/ZRCola.pot
+++ b/ZRCola/locale/ZRCola.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-02 20:52+0200\n"
+"POT-Creation-Date: 2016-06-14 11:32+0200\n"
 "PO-Revision-Date: 2016-05-13 15:52+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"

-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -32,22 +32,32 @@ msgstr "© 2004-%s ZRC SAZU"
 msgid "ZRCola"
 msgstr "ZRCola"

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:970
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
 #, fuzzy
 msgid "Character"
 msgstr "Znak"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:991
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
 #, fuzzy
 msgid "Context"
 msgstr "Kontekst"

-#: zrcolachrreq.cpp:64 zrcolagui.h:357
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
 #, fuzzy
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"

-#: zrcolafrm.cpp:111
+#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
+#, fuzzy
+msgid "▸ Search Options"
+msgstr "▸ Možnosti iskanja"
+
+#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
+#, fuzzy
+msgid "▾ Search Options"
+msgstr "▾ Možnosti iskanja"
+
+#: zrcolafrm.cpp:141
 #, fuzzy
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
@@ -56,12 +66,12 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."

-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 #, fuzzy
 msgid "Warning"
 msgstr "Opozorilo"

-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 #, fuzzy
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
@@ -110,12 +120,14 @@ msgid "Select all text"
 msgstr "Izberi celotno besedilo"

 #: zrcolagui.cpp:78
+#, fuzzy
 msgid "Find C&haracter..."
-msgstr ""
+msgstr "Poišči &znak ..."

 #: zrcolagui.cpp:78 zrcolagui.cpp:180
+#, fuzzy
 msgid "Display character search to select character to insert into text"
-msgstr ""
+msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"

 #: zrcolagui.cpp:89
 #, fuzzy
@@ -278,8 +290,9 @@ msgid "Edit"
 msgstr "Urejanje"

 #: zrcolagui.cpp:180
+#, fuzzy
 msgid "Find Character"
-msgstr ""
+msgstr "Poišči znak"

 #: zrcolagui.cpp:182
 #, fuzzy
@@ -326,12 +339,25 @@ msgstr "Sestavljeno besedilo"
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"

-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+#, fuzzy
+msgid "Show &All"
+msgstr "Prikaži vse"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
 #, fuzzy
 msgid "&Browse"
 msgstr "Pre&brskaj"

-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
 #, fuzzy
 msgid ""
 "Full or partial terms from Unicode character description (in English) to "
@@ -339,122 +365,132 @@ msgid ""
 msgstr ""
 "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"

-#: zrcolagui.cpp:434
+#: zrcolagui.cpp:441
+#, fuzzy
+msgid "Search Options"
+msgstr "Možnosti iskanja"
+
+#: zrcolagui.cpp:442
+#, fuzzy
+msgid "Shows/hides additional search options"
+msgstr "Prikaže/skrije dodatne možnosti iskanja"
+
+#: zrcolagui.cpp:454
 #, fuzzy
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:461
 #, fuzzy
 msgid "All"
 msgstr "Vse"

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:462
 #, fuzzy
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"

-#: zrcolagui.cpp:446
+#: zrcolagui.cpp:466
 #, fuzzy
 msgid "None"
 msgstr "Nič"

-#: zrcolagui.cpp:447
+#: zrcolagui.cpp:467
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"

-#: zrcolagui.cpp:451
+#: zrcolagui.cpp:471
 #, fuzzy
 msgid "Invert"
 msgstr "Obrni"

-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:472
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"

-#: zrcolagui.cpp:485
+#: zrcolagui.cpp:511
 #, fuzzy
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"

-#: zrcolagui.cpp:495
+#: zrcolagui.cpp:521
 #, fuzzy
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"

-#: zrcolagui.cpp:523
+#: zrcolagui.cpp:549
 #, fuzzy
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"

-#: zrcolagui.cpp:537
+#: zrcolagui.cpp:563
 #, fuzzy
 msgid "Preview"
 msgstr "Predogled:"

-#: zrcolagui.cpp:542
+#: zrcolagui.cpp:568
 #, fuzzy
 msgid "U+"
 msgstr "U+"

-#: zrcolagui.cpp:547
+#: zrcolagui.cpp:573
 #, fuzzy
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"

-#: zrcolagui.cpp:552
+#: zrcolagui.cpp:578
 #, fuzzy
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"

-#: zrcolagui.cpp:587
+#: zrcolagui.cpp:613
 #, fuzzy
 msgid "Character preview"
 msgstr "Predogled znaka"

-#: zrcolagui.cpp:592
+#: zrcolagui.cpp:618
 #, fuzzy
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"

-#: zrcolagui.cpp:597
+#: zrcolagui.cpp:623
 #, fuzzy
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"

-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:630
 #, fuzzy
 msgid "« Back"
 msgstr "< &Nazaj"

-#: zrcolagui.cpp:606
+#: zrcolagui.cpp:632
 #, fuzzy
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"

-#: zrcolagui.cpp:610
+#: zrcolagui.cpp:636
 #, fuzzy
 msgid "Forward »"
 msgstr "Naprej »"

-#: zrcolagui.cpp:612
+#: zrcolagui.cpp:638
 #, fuzzy
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"

-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:649
 #, fuzzy
 msgid "Re&lated"
 msgstr "&Sorodni"

-#: zrcolagui.cpp:650
+#: zrcolagui.cpp:676
 #, fuzzy
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"

-#: zrcolagui.cpp:737
+#: zrcolagui.cpp:765
 #, fuzzy
 msgid ""
 "Some character native to specific language you are working with should not "
@@ -465,22 +501,22 @@ msgstr ""
 "razstaviti v dele.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."

-#: zrcolagui.cpp:741
+#: zrcolagui.cpp:769
 #, fuzzy
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"

-#: zrcolagui.cpp:744
+#: zrcolagui.cpp:772
 #, fuzzy
 msgid "&Manually select the language from the list below:"
 msgstr "Ročno izberi jezik na spodnje&m spisku:"

-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:784
 #, fuzzy
 msgid "Text Language"
 msgstr "Jezik besedila"

-#: zrcolagui.cpp:761
+#: zrcolagui.cpp:789
 #, fuzzy
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
@@ -491,17 +527,17 @@ msgstr ""
 "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
 "bližnjic Win+F5 in Win+F6."

-#: zrcolagui.cpp:765
+#: zrcolagui.cpp:793
 #, fuzzy
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"

-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:800
 #, fuzzy
 msgid "Startup"
 msgstr "Zagon"

-#: zrcolagui.cpp:851
+#: zrcolagui.cpp:879
 #, fuzzy
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
@@ -512,11 +548,12 @@ msgstr ""
 "Razvoj: Amebis, d. o. o., Kamnik\n"
 "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"

-#: zrcolagui.cpp:859
+#: zrcolagui.cpp:887
+#, fuzzy
 msgid "zrcola.zrc-sazu.si"
-msgstr ""
+msgstr "zrcola.zrc-sazu.si"

-#: zrcolagui.cpp:865
+#: zrcolagui.cpp:893
 #, fuzzy
 msgid ""
 "Texts made using ZRCola have to include in the colophon, foreword, footnote "
@@ -526,7 +563,7 @@ msgstr ""
 "opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
 "zapisom:"

-#: zrcolagui.cpp:869
+#: zrcolagui.cpp:897
 #, fuzzy
 msgid ""
 "This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
@@ -537,42 +574,42 @@ msgstr ""
 "sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani "
 "(http://www.zrc-sazu.si) razvil dr. Peter Weiss."

-#: zrcolagui.cpp:910
+#: zrcolagui.cpp:938
 #, fuzzy
 msgid "Log"
 msgstr "Dnevnik"

-#: zrcolagui.cpp:926
+#: zrcolagui.cpp:954
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."

-#: zrcolagui.cpp:928
+#: zrcolagui.cpp:956
 #, fuzzy
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi ta program in zaženi posodobitev izdelka"

-#: zrcolagui.cpp:932
+#: zrcolagui.cpp:960
 #, fuzzy
 msgid "&Close"
 msgstr "&Zapri"

-#: zrcolagui.cpp:933
+#: zrcolagui.cpp:961
 #, fuzzy
 msgid "Close this window"
 msgstr "Zapri to okno"

-#: zrcolagui.cpp:972
+#: zrcolagui.cpp:1000
 #, fuzzy
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"

-#: zrcolagui.cpp:979
+#: zrcolagui.cpp:1007
 #, fuzzy
 msgid "Decomposed character to request"
 msgstr "Razstavljen znak, ki ga zahtevate"

-#: zrcolagui.cpp:983
+#: zrcolagui.cpp:1011
 #, fuzzy
 msgid ""
 "Please, use the decomposed form.\n"
@@ -583,19 +620,19 @@ msgstr ""
 "Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate "
 "in prilepite iz okna z razstavljenim besedilom."

-#: zrcolagui.cpp:993
+#: zrcolagui.cpp:1021
 #, fuzzy
 msgid ""
 "The &context, examples or short description why and where the character is "
 "required:"
 msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:"

-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:1027
 #, fuzzy
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1034
 #, fuzzy
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you "
@@ -633,34 +670,115 @@ msgstr ""
 "Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
 "Ali ste prepričani?"

-#: zrcolaupdater.cpp:94 zrcolagui.h:328
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
 #, fuzzy
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"

-#: zrcolagui.h:240
+#: zrcolagui.h:245
 #, fuzzy
 msgid "Character Search"
-msgstr "Rezultati iskanja znakov"
+msgstr "Poišči znak"

-#: zrcolagui.h:277
+#: zrcolagui.h:282
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavitve"

-#: zrcolagui.h:303
+#: zrcolagui.h:308
 #, fuzzy
 msgid "About ZRCola"
 msgstr "O ZRColi"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+#, fuzzy
+msgid "&Continue"
+msgstr "&Nadaljuj"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+#, fuzzy
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+#, fuzzy
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+#, fuzzy
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 #, fuzzy
 msgid "1252"
 msgstr "1250"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+#, fuzzy
+msgid "bintutorial1.bmp"
+msgstr "bintutorial1.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+#, fuzzy
+msgid "bintutorial2.bmp"
+msgstr "bintutorial2.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+#, fuzzy
+msgid "bintutorial3.bmp"
+msgstr "bintutorial3.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+#, fuzzy
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+#, fuzzy
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
+"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+#, fuzzy
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+"POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v "
+"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
+"vedel, kam vstaviti želene znake!"
+
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -669,6 +787,28 @@ msgstr "1250"
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+#, fuzzy
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+"Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v "
+"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
+"vnesemo s pritiskom na tipko F5."
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+#, fuzzy
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
+"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
+
 #~ msgid "Auto Start"
 #~ msgstr "Samodejni zagon"

--- a/ZRCola/locale/de_DE.po
+++ b/ZRCola/locale/de_DE.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-02 20:53+0200\n"
-"PO-Revision-Date: 2016-06-02 20:53+0200\n"
+"POT-Creation-Date: 2016-06-14 11:33+0200\n"
+"PO-Revision-Date: 2016-06-14 11:34+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: de_DE\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""

-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -29,32 +29,40 @@ msgstr ""
 msgid "ZRCola"
 msgstr "ZRCola:."

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:970
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
 #, fuzzy
 msgid "Character"
 msgstr "Eingabe eines Zeichenstils"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:991
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
 #, fuzzy
 msgid "Context"
 msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."

-#: zrcolachrreq.cpp:64 zrcolagui.h:357
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
 msgid "Request a New Character"
 msgstr ""

-#: zrcolafrm.cpp:111
+#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
+msgid "▸ Search Options"
+msgstr ""
+
+#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
+msgid "▾ Search Options"
+msgstr ""
+
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
 msgstr ""

-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 #, fuzzy
 msgid "Warning"
 msgstr "Warnung: "

-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -287,227 +295,248 @@ msgstr ""
 msgid "Composed Unicode Dump"
 msgstr ""

-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+#, fuzzy
+msgid "Show &All"
+msgstr "Alles zeigen"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
 #, fuzzy
 msgid "&Browse"
 msgstr "Durchsuchen"

-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
 msgid ""
 "Full or partial terms from Unicode character description (in English) to "
 "search for"
 msgstr ""

-#: zrcolagui.cpp:434
+#: zrcolagui.cpp:441
+msgid "Search Options"
+msgstr ""
+
+#: zrcolagui.cpp:442
+msgid "Shows/hides additional search options"
+msgstr ""
+
+#: zrcolagui.cpp:454
 msgid "List of Unicode character categories to search in"
 msgstr ""

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:461
 #, fuzzy
 msgid "All"
 msgstr "Alle"

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:462
 msgid "Select all categories"
 msgstr ""

-#: zrcolagui.cpp:446
+#: zrcolagui.cpp:466
 #, fuzzy
 msgid "None"
 msgstr "Kein"

-#: zrcolagui.cpp:447
+#: zrcolagui.cpp:467
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Auswahl kopieren"

-#: zrcolagui.cpp:451
+#: zrcolagui.cpp:471
 msgid "Invert"
 msgstr ""

-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:472
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Auswahl einfügen"

-#: zrcolagui.cpp:485
+#: zrcolagui.cpp:511
 #, fuzzy
 msgid "Character search results"
 msgstr "Skupine &znakov"

-#: zrcolagui.cpp:495
+#: zrcolagui.cpp:521
 msgid "Re&cently Used"
 msgstr ""

-#: zrcolagui.cpp:523
+#: zrcolagui.cpp:549
 msgid "List of recently inserted characters"
 msgstr ""

-#: zrcolagui.cpp:537
+#: zrcolagui.cpp:563
 #, fuzzy
 msgid "Preview"
 msgstr " Vorschau"

-#: zrcolagui.cpp:542
+#: zrcolagui.cpp:568
 #, fuzzy
 msgid "U+"
 msgstr "Hilfeverzeichnis %u nicht gefunden."

-#: zrcolagui.cpp:547
+#: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
 msgstr ""

-#: zrcolagui.cpp:552
+#: zrcolagui.cpp:578
 msgid "Keyboard shortcut in Composer window"
 msgstr ""

-#: zrcolagui.cpp:587
+#: zrcolagui.cpp:613
 #, fuzzy
 msgid "Character preview"
 msgstr "Skupine &znakov"

-#: zrcolagui.cpp:592
+#: zrcolagui.cpp:618
 msgid "Unicode character description"
 msgstr ""

-#: zrcolagui.cpp:597
+#: zrcolagui.cpp:623
 msgid "Unicode character category"
 msgstr ""

-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:630
 #, fuzzy
 msgid "« Back"
 msgstr "< &Zurück"

-#: zrcolagui.cpp:606
+#: zrcolagui.cpp:632
 msgid "To previously viewed character"
 msgstr ""

-#: zrcolagui.cpp:610
+#: zrcolagui.cpp:636
 #, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"

-#: zrcolagui.cpp:612
+#: zrcolagui.cpp:638
 msgid "To following viewed character"
 msgstr ""

-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:649
 msgid "Re&lated"
 msgstr ""

-#: zrcolagui.cpp:650
+#: zrcolagui.cpp:676
 msgid "List of related characters"
 msgstr ""

-#: zrcolagui.cpp:737
+#: zrcolagui.cpp:765
 msgid ""
 "Some character native to specific language you are working with should not "
 "decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
 msgstr ""

-#: zrcolagui.cpp:741
+#: zrcolagui.cpp:769
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""

-#: zrcolagui.cpp:744
+#: zrcolagui.cpp:772
 msgid "&Manually select the language from the list below:"
 msgstr ""

-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:784
 msgid "Text Language"
 msgstr ""

-#: zrcolagui.cpp:761
+#: zrcolagui.cpp:789
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
 "It will be available on the system tray and via registered shortcuts Win+F5 "
 "and Win+F6."
 msgstr ""

-#: zrcolagui.cpp:765
+#: zrcolagui.cpp:793
 msgid "Start ZRCola &automatically on logon"
 msgstr ""

-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:800
 msgid "Startup"
 msgstr ""

-#: zrcolagui.cpp:851
+#: zrcolagui.cpp:879
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Development and maintenance (2004-2015): dr. Peter Weiss"
 msgstr ""

-#: zrcolagui.cpp:859
+#: zrcolagui.cpp:887
 msgid "zrcola.zrc-sazu.si"
 msgstr ""

-#: zrcolagui.cpp:865
+#: zrcolagui.cpp:893
 msgid ""
 "Texts made using ZRCola have to include in the colophon, foreword, footnote "
 "or some other appropriate part of the publication the note below:"
 msgstr ""

-#: zrcolagui.cpp:869
+#: zrcolagui.cpp:897
 msgid ""
 "This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
 "si), developed at the Science and Research Centre of SAZU in Ljubljana "
 "(http://www.zrc-sazu.si) by Dr. Peter Weiss."
 msgstr ""

-#: zrcolagui.cpp:910
+#: zrcolagui.cpp:938
 #, fuzzy
 msgid "Log"
 msgstr "&Log"

-#: zrcolagui.cpp:926
+#: zrcolagui.cpp:954
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."

-#: zrcolagui.cpp:928
+#: zrcolagui.cpp:956
 msgid "Exit this program and launch product update"
 msgstr ""

-#: zrcolagui.cpp:932
+#: zrcolagui.cpp:960
 #, fuzzy
 msgid "&Close"
 msgstr "&Schließen"

-#: zrcolagui.cpp:933
+#: zrcolagui.cpp:961
 #, fuzzy
 msgid "Close this window"
 msgstr "Fenster schließen"

-#: zrcolagui.cpp:972
+#: zrcolagui.cpp:1000
 msgid "Enter the &character you would like to request:"
 msgstr ""

-#: zrcolagui.cpp:979
+#: zrcolagui.cpp:1007
 msgid "Decomposed character to request"
 msgstr ""

-#: zrcolagui.cpp:983
+#: zrcolagui.cpp:1011
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
 "it from the Decomposed window."
 msgstr ""

-#: zrcolagui.cpp:993
+#: zrcolagui.cpp:1021
 msgid ""
 "The &context, examples or short description why and where the character is "
 "required:"
 msgstr ""

-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:1027
 msgid "Additional notes for character request"
 msgstr ""

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1034
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you "
 "to submit the new character request to ZRCola Editor.\n"
@@ -532,35 +561,372 @@ msgid ""
 "Are you sure?"
 msgstr ""

-#: zrcolaupdater.cpp:94 zrcolagui.h:328
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
 msgid "Product Update"
 msgstr ""

-#: zrcolagui.h:240
+#: zrcolagui.h:245
 #, fuzzy
 msgid "Character Search"
 msgstr "Skupine &znakov"

-#: zrcolagui.h:277
+#: zrcolagui.h:282
 msgid "Settings"
 msgstr ""

-#: zrcolagui.h:303
+#: zrcolagui.h:308
 msgid "About ZRCola"
 msgstr ""

+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+#, fuzzy
+msgid "&Continue"
+msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr ""
+
 # Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 #, fuzzy
 msgid "1252"
 msgstr "1252"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+msgid "bintutorial1.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+msgid "bintutorial2.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+msgid "bintutorial3.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+#, fuzzy
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
 msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+
+#~ msgid "Auto Start"
+#~ msgstr "Samodejni zagon"
+
+#~ msgid "Select %s language for decomposition"
+#~ msgstr "Izberi jezik %s za razstavljanje"
+
+#~ msgid "&Start on Logon"
+#~ msgstr "Z&aženi ob prijavi"
+
+#~ msgid "Start this program automatically on logon"
+#~ msgstr "Samodejno zaženi ta program ob prijavi"
+
+#~ msgid "Set language according to keyboard layout automatically"
+#~ msgstr "Samodejno nastavi jezik glede na izbrano tipkovnico"
+
+#~ msgid "&Unicode"
+#~ msgstr "&Unicode"
+
+#~ msgid "Esc"
+#~ msgstr "Esc"
+
+#~ msgid "F1"
+#~ msgstr "F1"
+
+#~ msgid "F2"
+#~ msgstr "F2"
+
+#~ msgid "F3"
+#~ msgstr "F3"
+
+#~ msgid "F4"
+#~ msgstr "F4"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#~ msgid "F6"
+#~ msgstr "F6"
+
+#~ msgid "F7"
+#~ msgstr "F7"
+
+#~ msgid "F8"
+#~ msgstr "F8"
+
+#~ msgid "F9"
+#~ msgstr "F9"
+
+#~ msgid "F10"
+#~ msgstr "F10"
+
+#~ msgid "F11"
+#~ msgstr "F11"
+
+#~ msgid "F12"
+#~ msgstr "F12"
+
+#~ msgid "Print Screen"
+#~ msgstr "Print Screen"
+
+#~ msgid "Scroll Lock"
+#~ msgstr "Scroll Lock"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Backspace"
+#~ msgstr "Backspace"
+
+#~ msgid "Tab"
+#~ msgstr "Tab"
+
+#~ msgid "Caps Lock"
+#~ msgstr "Caps Lock"
+
+#~ msgid "Return"
+#~ msgstr "Return"
+
+#~ msgid "Space"
+#~ msgstr "preslednica"
+
+#~ msgid "Shift"
+#~ msgstr "Shift"
+
+#, fuzzy
+#~ msgid "Alt"
+#~ msgstr "Alle"
+
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Insert"
+#~ msgstr "Insert"
+
+#~ msgid "Delete"
+#~ msgstr "Delete"
+
+#~ msgid "Page Up"
+#~ msgstr "Page Up"
+
+#~ msgid "Page Down"
+#~ msgstr "Page Down"
+
+#~ msgid "Home"
+#~ msgstr "Home"
+
+#~ msgid "End"
+#~ msgstr "End"
+
+#~ msgid "Left"
+#~ msgstr "Left"
+
+#~ msgid "Up"
+#~ msgstr "Up"
+
+#~ msgid "Right"
+#~ msgstr "Right"
+
+#~ msgid "Down"
+#~ msgstr "Down"
+
+#~ msgid "Num Lock"
+#~ msgstr "Num Lock"
+
+#~ msgid "`"
+#~ msgstr "`"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "["
+#~ msgstr "["
+
+#~ msgid "]"
+#~ msgstr "]"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "'"
+#~ msgstr "'"
+
+#~ msgid "\\"
+#~ msgstr "\\"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "/"
+#~ msgstr "/"
+
+#~ msgid "INS"
+#~ msgstr "INS"
+
+#, fuzzy
+#~ msgid "Character &Groups"
+#~ msgstr "Eingabe eines Zeichenstils"
+
+#~ msgid "Language:"
+#~ msgstr "Jezik:"
+
+#~ msgid "&About"
+#~ msgstr "O progr&amu"
+
+#~ msgid "Cuts selected text and puts it on the clipboard"
+#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#~ msgid "Copies selected text to the clipboard"
+#~ msgstr "Kopira izbrano besedilo na odložišče"
+
+#~ msgid "Inserts text from the clipboard"
+#~ msgstr "Vstavi besedilo z odložišča"
+
+#, fuzzy
+#~ msgid "&Copy"
+#~ msgstr "Kopieren"
+
+#, fuzzy
+#~ msgid "&Paste"
+#~ msgstr "Einfügen"
+
+#~ msgid "&File"
+#~ msgstr "&Datoteka"
+
+#, fuzzy
+#~ msgid "Send Decomposed (F6)"
+#~ msgstr "Pošlji razstavljeno (F6)"
+
+#, fuzzy
+#~ msgid "Send Composed (F5)"
+#~ msgstr "Pošlji sestavljeno (F5)"
+
+#~ msgid ""
+#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
+#~ "functionality will not be available."
+#~ msgstr ""
+#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
+#~ "Nekaj funkcionalnosti ne bo na voljo."
+
+#, fuzzy
+#~ msgid "Authentication progress real time monitor"
+#~ msgstr "Nadzira postopek overovljanja v realnem času"
+
+#~ msgid "Grave\t&7"
+#~ msgstr "Krativec\t&7"
+
+#~ msgid "Acute\t&9"
+#~ msgstr "Ostrivec\t&9"
+
+#~ msgid "Circumflex\t&3"
+#~ msgstr "Cirkumfleks\t&3"
+
+#~ msgid "Inverted &breve"
+#~ msgstr "O&brnjen polkrog"
+
+#~ msgid "&Accents"
+#~ msgstr "N&aglasi"
+
+#~ msgid ""
+#~ "There is already an auto hidden bar on this edge.\n"
+#~ "Only one auto hidden bar is allowed on each edge.\n"
+#~ "Auto-hide feature is now off."
+#~ msgstr ""
+#~ "Ob tem robu je že samodejno skrita pasica.\n"
+#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n"
+#~ "Samodejno skrivanje je zdaj izklopljeno."
+
+#~ msgid "Hello World"
+#~ msgstr "Zdravo svet"
+
+#~ msgid "&Hello...\tCtrl+H"
+#~ msgstr "&Pozdrav ...\tCtrl+H"
+
+#~ msgid "Help string shown in status bar for this menu item"
+#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija"
+
+#~ msgid "This is a wxWidgets' Hello world sample"
+#~ msgstr "To je primer Zdravo svet v wxWidgets"
+
+#~ msgid "About Hello World"
+#~ msgstr "O Zdravo svet"
+
+#~ msgid "Hello world from wxWidgets!"
+#~ msgstr "Zdravo svet iz wxWidgets!"
+
+#~ msgid "Welcome to wxWidgets!"
+#~ msgstr "Dobrodošli v wxWidgets!"
--- a/ZRCola/locale/ru_RU.po
+++ b/ZRCola/locale/ru_RU.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-02 20:53+0200\n"
-"PO-Revision-Date: 2016-06-02 20:53+0200\n"
+"POT-Creation-Date: 2016-06-14 11:33+0200\n"
+"PO-Revision-Date: 2016-07-14 17:50+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""

-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -30,30 +30,38 @@ msgstr ""
 msgid "ZRCola"
 msgstr "ZRCola:."

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:970
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
 #, fuzzy
 msgid "Character"
 msgstr "Skupine &znakov"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:991
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
 msgid "Context"
 msgstr ""

-#: zrcolachrreq.cpp:64 zrcolagui.h:357
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
 msgid "Request a New Character"
 msgstr ""

-#: zrcolafrm.cpp:111
+#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
+msgid "▸ Search Options"
+msgstr ""
+
+#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
+msgid "▾ Search Options"
+msgstr ""
+
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
 msgstr ""

-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 msgid "Warning"
 msgstr ""

-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -275,215 +283,235 @@ msgstr ""
 msgid "Composed Unicode Dump"
 msgstr ""

-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+msgid "Show &All"
+msgstr ""
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
 msgid "&Browse"
 msgstr ""

-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
 msgid ""
 "Full or partial terms from Unicode character description (in English) to "
 "search for"
 msgstr ""

-#: zrcolagui.cpp:434
+#: zrcolagui.cpp:441
+msgid "Search Options"
+msgstr ""
+
+#: zrcolagui.cpp:442
+msgid "Shows/hides additional search options"
+msgstr ""
+
+#: zrcolagui.cpp:454
 msgid "List of Unicode character categories to search in"
 msgstr ""

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:461
 #, fuzzy
 msgid "All"
 msgstr "Alt"

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:462
 msgid "Select all categories"
 msgstr ""

-#: zrcolagui.cpp:446
+#: zrcolagui.cpp:466
 msgid "None"
 msgstr ""

-#: zrcolagui.cpp:447
+#: zrcolagui.cpp:467
 msgid "Clear category selection"
 msgstr ""

-#: zrcolagui.cpp:451
+#: zrcolagui.cpp:471
 msgid "Invert"
 msgstr ""

-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:472
 msgid "Invert category selection"
 msgstr ""

-#: zrcolagui.cpp:485
+#: zrcolagui.cpp:511
 #, fuzzy
 msgid "Character search results"
 msgstr "Skupine &znakov"

-#: zrcolagui.cpp:495
+#: zrcolagui.cpp:521
 msgid "Re&cently Used"
 msgstr ""

-#: zrcolagui.cpp:523
+#: zrcolagui.cpp:549
 msgid "List of recently inserted characters"
 msgstr ""

-#: zrcolagui.cpp:537
+#: zrcolagui.cpp:563
 msgid "Preview"
 msgstr ""

-#: zrcolagui.cpp:542
+#: zrcolagui.cpp:568
 msgid "U+"
-msgstr ""
+msgstr "U+"

-#: zrcolagui.cpp:547
+#: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
 msgstr ""

-#: zrcolagui.cpp:552
+#: zrcolagui.cpp:578
 msgid "Keyboard shortcut in Composer window"
 msgstr ""

-#: zrcolagui.cpp:587
+#: zrcolagui.cpp:613
 #, fuzzy
 msgid "Character preview"
 msgstr "Skupine &znakov"

-#: zrcolagui.cpp:592
+#: zrcolagui.cpp:618
 msgid "Unicode character description"
 msgstr ""

-#: zrcolagui.cpp:597
+#: zrcolagui.cpp:623
 msgid "Unicode character category"
 msgstr ""

-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:630
 msgid "« Back"
 msgstr ""

-#: zrcolagui.cpp:606
+#: zrcolagui.cpp:632
 msgid "To previously viewed character"
 msgstr ""

-#: zrcolagui.cpp:610
+#: zrcolagui.cpp:636
 msgid "Forward »"
 msgstr ""

-#: zrcolagui.cpp:612
+#: zrcolagui.cpp:638
 msgid "To following viewed character"
 msgstr ""

-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:649
 msgid "Re&lated"
 msgstr ""

-#: zrcolagui.cpp:650
+#: zrcolagui.cpp:676
 msgid "List of related characters"
 msgstr ""

-#: zrcolagui.cpp:737
+#: zrcolagui.cpp:765
 msgid ""
 "Some character native to specific language you are working with should not "
 "decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
 msgstr ""

-#: zrcolagui.cpp:741
+#: zrcolagui.cpp:769
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""

-#: zrcolagui.cpp:744
+#: zrcolagui.cpp:772
 msgid "&Manually select the language from the list below:"
 msgstr ""

-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:784
 msgid "Text Language"
 msgstr ""

-#: zrcolagui.cpp:761
+#: zrcolagui.cpp:789
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
 "It will be available on the system tray and via registered shortcuts Win+F5 "
 "and Win+F6."
 msgstr ""

-#: zrcolagui.cpp:765
+#: zrcolagui.cpp:793
 msgid "Start ZRCola &automatically on logon"
 msgstr ""

-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:800
 msgid "Startup"
 msgstr ""

-#: zrcolagui.cpp:851
+#: zrcolagui.cpp:879
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Development and maintenance (2004-2015): dr. Peter Weiss"
 msgstr ""

-#: zrcolagui.cpp:859
+#: zrcolagui.cpp:887
 msgid "zrcola.zrc-sazu.si"
-msgstr ""
+msgstr "zrcola.zrc-sazu.si"

-#: zrcolagui.cpp:865
+#: zrcolagui.cpp:893
 msgid ""
 "Texts made using ZRCola have to include in the colophon, foreword, footnote "
 "or some other appropriate part of the publication the note below:"
 msgstr ""

-#: zrcolagui.cpp:869
+#: zrcolagui.cpp:897
 msgid ""
 "This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
 "si), developed at the Science and Research Centre of SAZU in Ljubljana "
 "(http://www.zrc-sazu.si) by Dr. Peter Weiss."
 msgstr ""

-#: zrcolagui.cpp:910
+#: zrcolagui.cpp:938
 msgid "Log"
 msgstr ""

-#: zrcolagui.cpp:926
+#: zrcolagui.cpp:954
 msgid "Quit and &Update..."
 msgstr ""

-#: zrcolagui.cpp:928
+#: zrcolagui.cpp:956
 msgid "Exit this program and launch product update"
 msgstr ""

-#: zrcolagui.cpp:932
+#: zrcolagui.cpp:960
 msgid "&Close"
 msgstr ""

-#: zrcolagui.cpp:933
+#: zrcolagui.cpp:961
 msgid "Close this window"
 msgstr ""

-#: zrcolagui.cpp:972
+#: zrcolagui.cpp:1000
 msgid "Enter the &character you would like to request:"
 msgstr ""

-#: zrcolagui.cpp:979
+#: zrcolagui.cpp:1007
 msgid "Decomposed character to request"
 msgstr ""

-#: zrcolagui.cpp:983
+#: zrcolagui.cpp:1011
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
 "it from the Decomposed window."
 msgstr ""

-#: zrcolagui.cpp:993
+#: zrcolagui.cpp:1021
 msgid ""
 "The &context, examples or short description why and where the character is "
 "required:"
 msgstr ""

-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:1027
 msgid "Additional notes for character request"
 msgstr ""

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1034
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you "
 "to submit the new character request to ZRCola Editor.\n"
@@ -508,35 +536,369 @@ msgid ""
 "Are you sure?"
 msgstr ""

-#: zrcolaupdater.cpp:94 zrcolagui.h:328
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
 msgid "Product Update"
 msgstr ""

-#: zrcolagui.h:240
+#: zrcolagui.h:245
 #, fuzzy
 msgid "Character Search"
 msgstr "Skupine &znakov"

-#: zrcolagui.h:277
+#: zrcolagui.h:282
 msgid "Settings"
 msgstr ""

-#: zrcolagui.h:303
+#: zrcolagui.h:308
 msgid "About ZRCola"
 msgstr ""

+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+msgid "&Continue"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr ""
+
 # Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
-#, fuzzy
 msgid "1252"
 msgstr "1251"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+msgid "bintutorial1.bmp"
+msgstr "bintutorial1.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+msgid "bintutorial2.bmp"
+msgstr "bintutorial2.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+msgid "bintutorial3.bmp"
+msgstr "bintutorial3.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
 msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+
+#~ msgid "Auto Start"
+#~ msgstr "Samodejni zagon"
+
+#~ msgid "Select %s language for decomposition"
+#~ msgstr "Izberi jezik %s za razstavljanje"
+
+#~ msgid "&Start on Logon"
+#~ msgstr "Z&aženi ob prijavi"
+
+#~ msgid "Start this program automatically on logon"
+#~ msgstr "Samodejno zaženi ta program ob prijavi"
+
+#~ msgid "Set language according to keyboard layout automatically"
+#~ msgstr "Samodejno nastavi jezik glede na izbrano tipkovnico"
+
+#~ msgid "&Unicode"
+#~ msgstr "&Unicode"
+
+#~ msgid "Esc"
+#~ msgstr "Esc"
+
+#~ msgid "F1"
+#~ msgstr "F1"
+
+#~ msgid "F2"
+#~ msgstr "F2"
+
+#~ msgid "F3"
+#~ msgstr "F3"
+
+#~ msgid "F4"
+#~ msgstr "F4"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#~ msgid "F6"
+#~ msgstr "F6"
+
+#~ msgid "F7"
+#~ msgstr "F7"
+
+#~ msgid "F8"
+#~ msgstr "F8"
+
+#~ msgid "F9"
+#~ msgstr "F9"
+
+#~ msgid "F10"
+#~ msgstr "F10"
+
+#~ msgid "F11"
+#~ msgstr "F11"
+
+#~ msgid "F12"
+#~ msgstr "F12"
+
+#~ msgid "Print Screen"
+#~ msgstr "Print Screen"
+
+#~ msgid "Scroll Lock"
+#~ msgstr "Scroll Lock"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Backspace"
+#~ msgstr "Backspace"
+
+#~ msgid "Tab"
+#~ msgstr "Tab"
+
+#~ msgid "Caps Lock"
+#~ msgstr "Caps Lock"
+
+#~ msgid "Return"
+#~ msgstr "Return"
+
+#~ msgid "Space"
+#~ msgstr "preslednica"
+
+#~ msgid "Shift"
+#~ msgstr "Shift"
+
+#, fuzzy
+#~ msgid "Alt"
+#~ msgstr "Alt"
+
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Insert"
+#~ msgstr "Insert"
+
+#~ msgid "Delete"
+#~ msgstr "Delete"
+
+#~ msgid "Page Up"
+#~ msgstr "Page Up"
+
+#~ msgid "Page Down"
+#~ msgstr "Page Down"
+
+#~ msgid "Home"
+#~ msgstr "Home"
+
+#~ msgid "End"
+#~ msgstr "End"
+
+#~ msgid "Left"
+#~ msgstr "Left"
+
+#~ msgid "Up"
+#~ msgstr "Up"
+
+#~ msgid "Right"
+#~ msgstr "Right"
+
+#~ msgid "Down"
+#~ msgstr "Down"
+
+#~ msgid "Num Lock"
+#~ msgstr "Num Lock"
+
+#~ msgid "`"
+#~ msgstr "`"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "["
+#~ msgstr "["
+
+#~ msgid "]"
+#~ msgstr "]"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "'"
+#~ msgstr "'"
+
+#~ msgid "\\"
+#~ msgstr "\\"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "/"
+#~ msgstr "/"
+
+#~ msgid "INS"
+#~ msgstr "INS"
+
+#, fuzzy
+#~ msgid "Character &Groups"
+#~ msgstr "Skupine &znakov"
+
+#~ msgid "Language:"
+#~ msgstr "Jezik:"
+
+#~ msgid "&About"
+#~ msgstr "O progr&amu"
+
+#~ msgid "Cuts selected text and puts it on the clipboard"
+#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#~ msgid "Copies selected text to the clipboard"
+#~ msgstr "Kopira izbrano besedilo na odložišče"
+
+#~ msgid "Inserts text from the clipboard"
+#~ msgstr "Vstavi besedilo z odložišča"
+
+#, fuzzy
+#~ msgid "&Copy"
+#~ msgstr "&Kopiraj"
+
+#, fuzzy
+#~ msgid "&Paste"
+#~ msgstr "&Prilepi"
+
+#~ msgid "&File"
+#~ msgstr "&Datoteka"
+
+#, fuzzy
+#~ msgid "Send Decomposed (F6)"
+#~ msgstr "Pošlji razstavljeno (F6)"
+
+#, fuzzy
+#~ msgid "Send Composed (F5)"
+#~ msgstr "Pošlji sestavljeno (F5)"
+
+#~ msgid ""
+#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
+#~ "functionality will not be available."
+#~ msgstr ""
+#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
+#~ "Nekaj funkcionalnosti ne bo na voljo."
+
+#, fuzzy
+#~ msgid "Authentication progress real time monitor"
+#~ msgstr "Nadzira postopek overovljanja v realnem času"
+
+#~ msgid "Grave\t&7"
+#~ msgstr "Krativec\t&7"
+
+#~ msgid "Acute\t&9"
+#~ msgstr "Ostrivec\t&9"
+
+#~ msgid "Circumflex\t&3"
+#~ msgstr "Cirkumfleks\t&3"
+
+#~ msgid "Inverted &breve"
+#~ msgstr "O&brnjen polkrog"
+
+#~ msgid "&Accents"
+#~ msgstr "N&aglasi"
+
+#~ msgid ""
+#~ "There is already an auto hidden bar on this edge.\n"
+#~ "Only one auto hidden bar is allowed on each edge.\n"
+#~ "Auto-hide feature is now off."
+#~ msgstr ""
+#~ "Ob tem robu je že samodejno skrita pasica.\n"
+#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n"
+#~ "Samodejno skrivanje je zdaj izklopljeno."
+
+#~ msgid "Hello World"
+#~ msgstr "Zdravo svet"
+
+#~ msgid "&Hello...\tCtrl+H"
+#~ msgstr "&Pozdrav ...\tCtrl+H"
+
+#~ msgid "Help string shown in status bar for this menu item"
+#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija"
+
+#~ msgid "This is a wxWidgets' Hello world sample"
+#~ msgstr "To je primer Zdravo svet v wxWidgets"
+
+#~ msgid "About Hello World"
+#~ msgstr "O Zdravo svet"
+
+#~ msgid "Hello world from wxWidgets!"
+#~ msgstr "Zdravo svet iz wxWidgets!"
+
+#~ msgid "Welcome to wxWidgets!"
+#~ msgstr "Dobrodošli v wxWidgets!"
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-02 20:52+0200\n"
-"PO-Revision-Date: 2016-06-02 20:52+0200\n"
+"POT-Creation-Date: 2016-06-14 11:33+0200\n"
+"PO-Revision-Date: 2016-06-14 11:33+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: sl_SI\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"

-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -29,19 +29,27 @@ msgstr "© 2004-%s ZRC SAZU"
 msgid "ZRCola"
 msgstr "ZRCola"

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:970
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
 msgid "Character"
 msgstr "Znak"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:991
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
 msgid "Context"
 msgstr "Kontekst"

-#: zrcolachrreq.cpp:64 zrcolagui.h:357
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"

-#: zrcolafrm.cpp:111
+#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
+msgid "▸ Search Options"
+msgstr "▸ Možnosti iskanja"
+
+#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
+msgid "▾ Search Options"
+msgstr "▾ Možnosti iskanja"
+
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
@@ -49,11 +57,11 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."

-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 msgid "Warning"
 msgstr "Opozorilo"

-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -269,110 +277,130 @@ msgstr "Sestavljeno besedilo"
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"

-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr "Izberi kategorijo za prikaz"
+
+#: zrcolagui.cpp:389
+msgid "Show &All"
+msgstr "Prik&aži vse"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr "Prikaži/skrij manj pogoste znake"
+
+#: zrcolagui.cpp:430
 msgid "&Browse"
 msgstr "Pre&brskaj"

-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
 msgid ""
 "Full or partial terms from Unicode character description (in English) to "
 "search for"
 msgstr ""
 "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"

-#: zrcolagui.cpp:434
+#: zrcolagui.cpp:441
+msgid "Search Options"
+msgstr "Možnosti iskanja"
+
+#: zrcolagui.cpp:442
+msgid "Shows/hides additional search options"
+msgstr "Prikaže/skrije dodatne možnosti iskanja"
+
+#: zrcolagui.cpp:454
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:461
 msgid "All"
 msgstr "Vse"

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:462
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"

-#: zrcolagui.cpp:446
+#: zrcolagui.cpp:466
 msgid "None"
 msgstr "Nič"

-#: zrcolagui.cpp:447
+#: zrcolagui.cpp:467
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"

-#: zrcolagui.cpp:451
+#: zrcolagui.cpp:471
 msgid "Invert"
 msgstr "Obrni"

-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:472
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"

-#: zrcolagui.cpp:485
+#: zrcolagui.cpp:511
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"

-#: zrcolagui.cpp:495
+#: zrcolagui.cpp:521
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"

-#: zrcolagui.cpp:523
+#: zrcolagui.cpp:549
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"

-#: zrcolagui.cpp:537
+#: zrcolagui.cpp:563
 msgid "Preview"
 msgstr "Predogled"

-#: zrcolagui.cpp:542
+#: zrcolagui.cpp:568
 msgid "U+"
 msgstr "U+"

-#: zrcolagui.cpp:547
+#: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"

-#: zrcolagui.cpp:552
+#: zrcolagui.cpp:578
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"

-#: zrcolagui.cpp:587
+#: zrcolagui.cpp:613
 msgid "Character preview"
 msgstr "Predogled znaka"

-#: zrcolagui.cpp:592
+#: zrcolagui.cpp:618
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"

-#: zrcolagui.cpp:597
+#: zrcolagui.cpp:623
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"

-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:630
 msgid "« Back"
 msgstr "« Nazaj"

-#: zrcolagui.cpp:606
+#: zrcolagui.cpp:632
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"

-#: zrcolagui.cpp:610
+#: zrcolagui.cpp:636
 msgid "Forward »"
 msgstr "Naprej »"

-#: zrcolagui.cpp:612
+#: zrcolagui.cpp:638
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"

-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:649
 msgid "Re&lated"
 msgstr "&Sorodni"

-#: zrcolagui.cpp:650
+#: zrcolagui.cpp:676
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"

-#: zrcolagui.cpp:737
+#: zrcolagui.cpp:765
 msgid ""
 "Some character native to specific language you are working with should not "
 "decompose to primitives.\n"
@@ -382,19 +410,19 @@ msgstr ""
 "razstaviti v dele.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."

-#: zrcolagui.cpp:741
+#: zrcolagui.cpp:769
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"

-#: zrcolagui.cpp:744
+#: zrcolagui.cpp:772
 msgid "&Manually select the language from the list below:"
 msgstr "Ročno izberi jezik na spodnje&m spisku:"

-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:784
 msgid "Text Language"
 msgstr "Jezik besedila"

-#: zrcolagui.cpp:761
+#: zrcolagui.cpp:789
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
 "It will be available on the system tray and via registered shortcuts Win+F5 "
@@ -404,15 +432,15 @@ msgstr ""
 "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
 "bližnjic Win+F5 in Win+F6."

-#: zrcolagui.cpp:765
+#: zrcolagui.cpp:793
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"

-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:800
 msgid "Startup"
 msgstr "Zagon"

-#: zrcolagui.cpp:851
+#: zrcolagui.cpp:879
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -422,11 +450,11 @@ msgstr ""
 "Razvoj: Amebis, d. o. o., Kamnik\n"
 "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"

-#: zrcolagui.cpp:859
+#: zrcolagui.cpp:887
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"

-#: zrcolagui.cpp:865
+#: zrcolagui.cpp:893
 msgid ""
 "Texts made using ZRCola have to include in the colophon, foreword, footnote "
 "or some other appropriate part of the publication the note below:"
@@ -435,7 +463,7 @@ msgstr ""
 "opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
 "zapisom:"

-#: zrcolagui.cpp:869
+#: zrcolagui.cpp:897
 msgid ""
 "This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
 "si), developed at the Science and Research Centre of SAZU in Ljubljana "
@@ -445,36 +473,36 @@ msgstr ""
 "sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani "
 "(http://www.zrc-sazu.si) razvil dr. Peter Weiss."

-#: zrcolagui.cpp:910
+#: zrcolagui.cpp:938
 msgid "Log"
 msgstr "Dnevnik"

-#: zrcolagui.cpp:926
+#: zrcolagui.cpp:954
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."

-#: zrcolagui.cpp:928
+#: zrcolagui.cpp:956
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi ta program in zaženi posodobitev izdelka"

-#: zrcolagui.cpp:932
+#: zrcolagui.cpp:960
 msgid "&Close"
 msgstr "&Zapri"

-#: zrcolagui.cpp:933
+#: zrcolagui.cpp:961
 msgid "Close this window"
 msgstr "Zapri to okno"

-#: zrcolagui.cpp:972
+#: zrcolagui.cpp:1000
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"

-#: zrcolagui.cpp:979
+#: zrcolagui.cpp:1007
 msgid "Decomposed character to request"
 msgstr "Razstavljen znak, ki ga zahtevate"

 # Please use a double && for final "&" character
-#: zrcolagui.cpp:983
+#: zrcolagui.cpp:1011
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
@@ -484,17 +512,17 @@ msgstr ""
 "Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate "
 "in prilepite iz okna z razstavljenim besedilom."

-#: zrcolagui.cpp:993
+#: zrcolagui.cpp:1021
 msgid ""
 "The &context, examples or short description why and where the character is "
 "required:"
 msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:"

-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:1027
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1034
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you "
 "to submit the new character request to ZRCola Editor.\n"
@@ -528,30 +556,101 @@ msgstr ""
 "Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
 "Ali ste prepričani?"

-#: zrcolaupdater.cpp:94 zrcolagui.h:328
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"

-#: zrcolagui.h:240
+#: zrcolagui.h:245
 msgid "Character Search"
 msgstr "Poišči znak"

-#: zrcolagui.h:277
+#: zrcolagui.h:282
 msgid "Settings"
 msgstr "Nastavitve"

-#: zrcolagui.h:303
+#: zrcolagui.h:308
 msgid "About ZRCola"
 msgstr "O ZRColi"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+msgid "&Continue"
+msgstr "&Nadaljuj"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
+
 # Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 msgid "1252"
 msgstr "1250"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+msgid "bintutorial1.bmp"
+msgstr "bintutorial1.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+msgid "bintutorial2.bmp"
+msgstr "bintutorial2.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+msgid "bintutorial3.bmp"
+msgstr "bintutorial3.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
+"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+"POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v "
+"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
+"vedel, kam vstaviti želene znake!"
+
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -559,6 +658,26 @@ msgstr "1250"
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"

+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+"Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v "
+"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
+"vnesemo s pritiskom na tipko F5."
+
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
+"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
+
 #~ msgid "Auto Start"
 #~ msgstr "Samodejni zagon"

@@ -816,6 +935,12 @@ msgstr "Vnašalni sistem za jezikoslovno rabo"
 #~ msgid "Welcome to wxWidgets!"
 #~ msgstr "Dobrodošli v wxWidgets!"

+#~ msgid "▼ Search Options"
+#~ msgstr "▼ Možnosti iskanja"
+
+#~ msgid "Less Search Options ▲"
+#~ msgstr "Manj možnosti iskanja ▲"
+
 #~ msgid "Character Selector"
 #~ msgstr "Izbirnik znaka"

--- a/ZRCola/zrcolachrcatpnl.cpp
+++ b/ZRCola/zrcolachrcatpnl.cpp
@@ -64,10 +64,7 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
        m_cg_id = m_cg_db.idxRnk[0].id;
        m_choice->Select(0);

-        // Update grid by simulating wxEVT_COMMAND_CHOICE_SELECTED event.
-        wxCommandEvent e(wxEVT_COMMAND_CHOICE_SELECTED, m_grid->GetId());
-        e.SetInt(0);
-        OnChoice(e);
+        Update();
    }

    // Register frame specific hotkey(s).
@@ -86,13 +83,12 @@ wxZRColaCharacterCatalogPanel::~wxZRColaCharacterCatalogPanel()

 void wxZRColaCharacterCatalogPanel::OnChoice(wxCommandEvent& event)
 {
-    ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];

-    m_cg_id = cg.id;
-    m_grid->SetCharacters(wxString(cg.data + cg.name_len, cg.char_len));
-
-    // As size of the grid might have changed, relayout the panel.
-    Layout();
+    if (m_cg_id != cg.id) {
+        m_cg_id = cg.id;
+        Update();
+    }

    event.Skip();
 }
@@ -129,6 +125,16 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
 }


+void wxZRColaCharacterCatalogPanel::OnShowAll(wxCommandEvent& event)
+{
+    UNREFERENCED_PARAMETER(event);
+
+    Update();
+
+    event.Skip();
+}
+
+
 void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
 {
    ZRColaApp *app = (ZRColaApp*)wxTheApp;
@@ -143,6 +149,33 @@ void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
 }


+void wxZRColaCharacterCatalogPanel::Update()
+{
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[m_choice->GetSelection()];
+
+    if (m_show_all->GetValue()) {
+        m_grid->SetCharacters(
+            wxString(cg.get_chars(), cg.char_len),
+            wxArrayShort((const short*)cg.get_char_shown(), (const short*)cg.get_char_shown() + (cg.char_len + 15)/16));
+    } else {
+        // Select frequently used characters only.
+        const wchar_t *src = cg.get_chars();
+        const unsigned __int16 *shown = cg.get_char_shown();
+        wxString chars;
+        for (unsigned __int16 i = 0, j = 0; i < cg.char_len; j++) {
+            for (unsigned __int16 k = 0, mask = shown[j]; k < 16 && i < cg.char_len; k++, mask >>= 1, i++) {
+                if (mask & 1)
+                    chars += src[i];
+            }
+        }
+        m_grid->SetCharacters(chars);
+    }
+
+    // As size of the grid might have changed, relayout the panel.
+    Layout();
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentZRColaCharacterCatalogPanel
 //////////////////////////////////////////////////////////////////////////
@@ -163,6 +196,7 @@ void wxPersistentZRColaCharacterCatalogPanel::Save() const
    const wxZRColaCharacterCatalogPanel * const wnd = static_cast<const wxZRColaCharacterCatalogPanel*>(GetWindow());

    SaveValue(wxT("charGroup"), wnd->m_cg_id);
+    SaveValue(wxT("showAll"  ), wnd->m_show_all->GetValue());
 }


@@ -170,24 +204,35 @@ bool wxPersistentZRColaCharacterCatalogPanel::Restore()
 {
    wxZRColaCharacterCatalogPanel * const wnd = static_cast<wxZRColaCharacterCatalogPanel*>(GetWindow());

+    bool update = false;
+
    // Restore selected character group.
    int cg_id;
    if (RestoreValue(wxT("charGroup"), &cg_id)) {
        for (size_t i = 0, n = wnd->m_cg_db.idxRnk.size(); i < n; i++) {
            const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRnk[i];
            if (cg.id == cg_id) {
-                wnd->m_cg_id = cg.id;
-                wnd->m_choice->Select(i);
-
-                // Update grid by simulating wxEVT_COMMAND_CHOICE_SELECTED event.
-                wxCommandEvent e(wxEVT_COMMAND_CHOICE_SELECTED, wnd->m_grid->GetId());
-                e.SetInt(i);
-                wnd->OnChoice(e);
+                if (wnd->m_cg_id != cg.id) {
+                    wnd->m_cg_id = cg.id;
+                    wnd->m_choice->Select(i);
+                    update = true;
+                }

                break;
            }
        }
    }

+    bool show_all;
+    if (RestoreValue(wxT("showAll"), &show_all)) {
+        if (wnd->m_show_all->GetValue() != show_all) {
+            wnd->m_show_all->SetValue(show_all);
+            update = true;
+        }
+    }
+
+    if (update)
+        wnd->Update();
+
    return true;
 }
--- a/ZRCola/zrcolachrcatpnl.h
+++ b/ZRCola/zrcolachrcatpnl.h
@@ -50,9 +50,12 @@ protected:
    virtual void OnChoice(wxCommandEvent& event);
    virtual void OnGridClick(wxGridEvent& event);
    virtual void OnGridKeyDown(wxKeyEvent& event);
+    virtual void OnShowAll(wxCommandEvent& event);
    void OnFocusDecomposed(wxCommandEvent& event);
    DECLARE_EVENT_TABLE()

+    void Update();
+
 protected:
    ZRCola::chrgrp_db m_cg_db;      ///< Character group database
    int m_cg_id;                    ///< Selected character group ID
--- a/ZRCola/zrcolachrgrid.cpp
+++ b/ZRCola/zrcolachrgrid.cpp
@@ -68,8 +68,22 @@ void wxZRColaCharGrid::Init()


 void wxZRColaCharGrid::SetCharacters(const wxString &chars)
+{
+    m_chars = chars;
+    m_relevance.Clear();
+    m_regenerate = true;
+
+    // Invoke OnSize(), which will populate the grid.
+    wxSizeEvent e(GetSize(), m_windowId);
+    e.SetEventObject(this);
+    HandleWindowEvent(e);
+}
+
+
+void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &relevance)
 {
    m_chars      = chars;
+    m_relevance  = relevance;
    m_regenerate = true;

    // Invoke OnSize(), which will populate the grid.
@@ -137,6 +151,17 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
            for (int c = 0; c < cols; c++, i++)
                table->SetValue(r, c, i < (int)char_len ? wxString(1, m_chars[i]) : wxEmptyString);
        SetTable(table, true);
+        if (!m_relevance.IsEmpty()) {
+            const wxColour colour_def;
+            const wxColour colour_irr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT);
+            for (int r = 0, i = 0; r < rows; r++)
+                for (int c = 0; c < cols; c++, i++)
+                    SetCellBackgroundColour(r, c, i >= (int)char_len || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
+        } else {
+            for (int r = 0, i = 0; r < rows; r++)
+                for (int c = 0; c < cols; c++, i++)
+                    SetAttr(r, c, NULL);
+        }
        m_regenerate = false;
    }

--- a/ZRCola/zrcolachrgrid.h
+++ b/ZRCola/zrcolachrgrid.h
@@ -58,6 +58,14 @@ public:
    ///
    void SetCharacters(const wxString &chars);

+    ///
+    /// Sets new array of characters to display
+    ///
+    /// \param[in] chars      The string containing characters to display
+    /// \param[in] relevance  Bit-array of \p chars relevance (1=more relevant, 0=less relevant)
+    ///
+    void SetCharacters(const wxString &chars, const wxArrayShort &relevance);
+
    ///
    /// Returns displayed characters
    ///
@@ -91,14 +99,15 @@ protected:
    DECLARE_EVENT_TABLE()

 private:
-    void Init();            // common part of all ctors
+    void Init();                // common part of all ctors

 protected:
-    wxString m_chars;       ///< Array of Unicode characters to display in the grid
+    wxString m_chars;           ///< Array of Unicode characters to display in the grid
+    wxArrayShort m_relevance;   ///< Bit-array of `m_chars` relevance

 private:
-    bool m_regenerate;      ///< Force regenerate grid table
-    bool m_isResizing;      ///< Prevents nesting of OnSize() method.
-    wxTimer m_timerToolTip; ///< Timer for displaying tooltip
-    size_t m_toolTipIdx;    ///< Index of cell for tooltip display
+    bool m_regenerate;          ///< Force regenerate grid table
+    bool m_isResizing;          ///< Prevents nesting of OnSize() method.
+    wxTimer m_timerToolTip;     ///< Timer for displaying tooltip
+    size_t m_toolTipIdx;        ///< Index of cell for tooltip display
 };
--- a/ZRCola/zrcolachrslct.cpp
+++ b/ZRCola/zrcolachrslct.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2016 Amebis

    This file is part of ZRCola.
@@ -36,6 +36,8 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
 {
    Connect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this);

+    m_search_more->SetLabel(_(L"▸ Search Options"));
+
    m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char, wxNUM_VAL_DEFAULT, 4));

    // Fill categories.
@@ -169,6 +171,22 @@ void wxZRColaCharSelect::OnSearchText(wxCommandEvent& event)
 }


+void wxZRColaCharSelect::OnSearchMore(wxHyperlinkEvent& event)
+{
+    event.StopPropagation();
+
+    if (m_search_panel->IsShown()) {
+        m_search_panel->Show(false);
+        m_search_more->SetLabel(_(L"▸ Search Options"));
+    } else {
+        m_search_panel->Show(true);
+        m_search_more->SetLabel(_(L"▾ Search Options"));
+    }
+
+    this->Layout();
+}
+
+
 void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event)
 {
    event.StopPropagation();
@@ -573,6 +591,8 @@ void wxPersistentZRColaCharSelect::Save() const
        name.Append(cc.id.data, _countof(cc.id.data));
        SaveValue(name, wnd->m_categories->IsChecked(i));
    }
+
+    SaveValue(wxT("searchPanel"), wnd->m_search_panel->IsShown());
 }


@@ -593,6 +613,18 @@ bool wxPersistentZRColaCharSelect::Restore()
        if (RestoreValue(name, &val))
            wnd->m_categories->Check(i, val);
    }
+
+    bool search_panel;
+    if (RestoreValue(wxT("searchPanel"), &search_panel)) {
+        if (search_panel) {
+            wnd->m_search_panel->Show(true);
+            wnd->m_search_more->SetLabel(_(L"▾ Search Options"));
+        } else {
+            wnd->m_search_panel->Show(false);
+            wnd->m_search_more->SetLabel(_(L"▸ Search Options"));
+        }
+    }
+
    wnd->ResetResults();

    return wxPersistentDialog::Restore();
--- a/ZRCola/zrcolachrslct.h
+++ b/ZRCola/zrcolachrslct.h
@@ -55,6 +55,7 @@ public:
 protected:
    virtual void OnIdle(wxIdleEvent& event);
    virtual void OnSearchText(wxCommandEvent& event);
+    virtual void OnSearchMore(wxHyperlinkEvent& event);
    virtual void OnCategoriesAll(wxHyperlinkEvent& event);
    virtual void OnCategoriesNone(wxHyperlinkEvent& event);
    virtual void OnCategoriesInvert(wxHyperlinkEvent& event);
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -106,12 +106,6 @@ wxZRColaFrame::wxZRColaFrame() :
    // Set focus.
    m_panel->m_decomposed->SetFocus();

-    // Register global hotkey(s).
-    if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, wxMOD_WIN, VK_F5))
-        wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
-    if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
-        wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
-
 #if defined(__WXMSW__)
    // Register notification sink for language detection.
    m_ulRefCount = 1;
@@ -141,11 +135,21 @@ wxZRColaFrame::wxZRColaFrame() :

    // Restore persistent state of wxAuiManager manually, since m_mgr is not on the heap.
    wxPersistentAuiManager(&m_mgr).Restore();
+
+    // Register global hotkey(s).
+    if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, wxMOD_WIN, VK_F5))
+        wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
+    if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
+        wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
 }


 wxZRColaFrame::~wxZRColaFrame()
 {
+    // Unregister global hotkey(s).
+    UnregisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE);
+    UnregisterHotKey(wxZRColaHKID_INVOKE_COMPOSE);
+
 #if defined(__WXMSW__)
    if (m_tfSource) {
        m_tfSource->UnadviseSink(m_dwCookie);
@@ -153,10 +157,6 @@ wxZRColaFrame::~wxZRColaFrame()
    }
 #endif

-    // Unregister global hotkey(s).
-    UnregisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE);
-    UnregisterHotKey(wxZRColaHKID_INVOKE_COMPOSE);
-
    if (m_chrReq)
        delete m_chrReq;

--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -234,7 +234,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
 	bSizerDecomposedEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDecomposedEdit, wxID_ANY, _("Decomposed Text") ), wxVERTICAL );
 	
 	m_decomposed = new wxTextCtrl( bSizerDecomposedEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_decomposed->SetMinSize( wxSize( 100,25 ) );
 	
 	bSizerDecomposedEdit2->Add( m_decomposed, 1, wxEXPAND, 5 );
@@ -281,7 +281,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
 	bSizerComposedEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelComposedEdit, wxID_ANY, _("Composed Text") ), wxVERTICAL );
 	
 	m_composed = new wxTextCtrl( bSizerComposedEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_composed->SetMinSize( wxSize( 100,25 ) );
 	
 	bSizerComposedEdit2->Add( m_composed, 1, wxEXPAND, 5 );
@@ -352,6 +352,8 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
 	wxArrayString m_choiceChoices;
 	m_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceChoices, 0 );
 	m_choice->SetSelection( 0 );
+	m_choice->SetToolTip( _("Select category to display") );
+	
 	bSizer->Add( m_choice, 0, wxALL|wxEXPAND, 5 );
 	
 	m_grid = new wxZRColaCharGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
@@ -378,12 +380,17 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
 	
 	// Cell Defaults
 	m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	m_grid->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_grid->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_grid->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_grid->SetMinSize( wxSize( 35,35 ) );
 	
 	bSizer->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
 	
+	m_show_all = new wxCheckBox( this, wxID_ANY, _("Show &All"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_show_all->SetToolTip( _("Toggle display of less frequent characters") );
+	
+	bSizer->Add( m_show_all, 0, wxALL|wxEXPAND, 5 );
+	
 	
 	this->SetSizer( bSizer );
 	this->Layout();
@@ -393,6 +400,7 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
 	m_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnChoice ), NULL, this );
 	m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this );
 	m_grid->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridKeyDown ), NULL, this );
+	m_show_all->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnShowAll ), NULL, this );
 }

 wxZRColaCharacterCatalogPanelBase::~wxZRColaCharacterCatalogPanelBase()
@@ -401,6 +409,7 @@ wxZRColaCharacterCatalogPanelBase::~wxZRColaCharacterCatalogPanelBase()
 	m_choice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnChoice ), NULL, this );
 	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this );
 	m_grid->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridKeyDown ), NULL, this );
+	m_show_all->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnShowAll ), NULL, this );
 	
 }

@@ -429,32 +438,49 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	
 	sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 );
 	
+	m_search_more = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Search Options"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_search_more->SetToolTip( _("Shows/hides additional search options") );
+	
+	sbSizerBrowse->Add( m_search_more, 0, wxALL|wxEXPAND, 5 );
+	
+	m_search_panel = new wxPanel( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_search_panel->Hide();
+	
+	wxBoxSizer* sbSizerSearch;
+	sbSizerSearch = new wxBoxSizer( wxVERTICAL );
+	
 	wxArrayString m_categoriesChoices;
-	m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
+	m_categories = new wxCheckListBox( m_search_panel, wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
 	m_categories->SetToolTip( _("List of Unicode character categories to search in") );
 	
-	sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
+	sbSizerSearch->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizerCategoriesCtrl;
 	bSizerCategoriesCtrl = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_categoriesAll = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_categoriesAll = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
 	m_categoriesAll->SetToolTip( _("Select all categories") );
 	
 	bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, 5 );
 	
-	m_categoriesNone = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_categoriesNone = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
 	m_categoriesNone->SetToolTip( _("Clear category selection") );
 	
 	bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, 5 );
 	
-	m_categoriesInvert = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_categoriesInvert = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
 	m_categoriesInvert->SetToolTip( _("Invert category selection") );
 	
 	bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, 5 );
 	
 	
-	sbSizerBrowse->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 );
+	sbSizerSearch->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	m_search_panel->SetSizer( sbSizerSearch );
+	m_search_panel->Layout();
+	sbSizerSearch->Fit( m_search_panel );
+	sbSizerBrowse->Add( m_search_panel, 0, wxEXPAND, 5 );
 	
 	m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSTATIC_BORDER );
 	
@@ -479,7 +505,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridResults->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_gridResults->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridResults->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
 	m_gridResults->SetToolTip( _("Character search results") );
@@ -517,7 +543,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridRecent->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_gridRecent->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridRecent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
 	m_gridRecent->SetToolTip( _("List of recently inserted characters") );
@@ -581,7 +607,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridPreview->SetDefaultCellFont( wxFont( 96, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_gridPreview->SetDefaultCellFont( wxFont( 96, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridPreview->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 	m_gridPreview->SetToolTip( _("Character preview") );
@@ -645,7 +671,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridRelated->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_gridRelated->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridRelated->SetToolTip( _("List of related characters") );
 	
@@ -680,6 +706,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Connect Events
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) );
 	m_search->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this );
+	m_search_more->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnSearchMore ), NULL, this );
 	m_categories->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
 	m_categoriesAll->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this );
 	m_categoriesNone->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this );
@@ -703,6 +730,7 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
 	// Disconnect Events
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) );
 	m_search->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this );
+	m_search_more->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnSearchMore ), NULL, this );
 	m_categories->Disconnect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
 	m_categoriesAll->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this );
 	m_categoriesNone->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this );
@@ -840,7 +868,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_staticTextZRCola = new wxStaticText( this, wxID_ANY, _("ZRCola"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextZRCola->Wrap( -1 );
-	m_staticTextZRCola->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_staticTextZRCola->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	
 	bSizerText->Add( m_staticTextZRCola, 0, wxALL|wxEXPAND, 5 );
 	
@@ -975,7 +1003,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i
 	
 	m_character = new wxTextCtrl( sbSizerCharacter->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	m_character->SetMaxLength( 20 ); 
-	m_character->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_character->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_character->SetToolTip( _("Decomposed character to request") );
 	
 	sbSizerCharacter->Add( m_character, 0, wxALL|wxEXPAND, 5 );
@@ -995,7 +1023,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i
 	sbSizerContext->Add( m_contextLbl, 0, wxALL|wxEXPAND, 5 );
 	
 	m_context = new wxTextCtrl( sbSizerContext->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_context->SetFont( wxFont( 16, 70, 90, 90, false, wxT("00 ZRCola") ) );
+	m_context->SetFont( wxFont( 16, 70, 90, 90, false, wxT("ZRCola") ) );
 	m_context->SetToolTip( _("Additional notes for character request") );
 	
 	sbSizerContext->Add( m_context, 1, wxALL|wxEXPAND, 5 );
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -37,15 +37,15 @@ class wxZRColaComposerPanel;
 #include <wx/timer.h>
 #include <wx/choice.h>
 #include <wx/grid.h>
+#include <wx/checkbox.h>
 #include <wx/srchctrl.h>
-#include <wx/checklst.h>
 #include <wx/hyperlink.h>
+#include <wx/checklst.h>
 #include <wx/stattext.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/radiobut.h>
 #include <wx/listbox.h>
-#include <wx/checkbox.h>
 #include <wx/listbook.h>
 #include <wx/listctrl.h>
 #include <wx/statbmp.h>
@@ -172,11 +172,13 @@ class wxZRColaCharacterCatalogPanelBase : public wxPanel
 	protected:
 		wxChoice* m_choice;
 		wxZRColaCharGrid* m_grid;
+		wxCheckBox* m_show_all;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); }
 		virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
@@ -195,6 +197,8 @@ class wxZRColaCharSelectBase : public wxDialog
 	
 	protected:
 		wxSearchCtrl* m_search;
+		wxHyperlinkCtrl* m_search_more;
+		wxPanel* m_search_panel;
 		wxCheckListBox* m_categories;
 		wxHyperlinkCtrl* m_categoriesAll;
 		wxHyperlinkCtrl* m_categoriesNone;
@@ -217,6 +221,7 @@ class wxZRColaCharSelectBase : public wxDialog
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
 		virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSearchMore( wxHyperlinkEvent& event ) { event.Skip(); }
 		virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnCategoriesAll( wxHyperlinkEvent& event ) { event.Skip(); }
 		virtual void OnCategoriesNone( wxHyperlinkEvent& event ) { event.Skip(); }
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -44,6 +44,11 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                pFrame->SetStatusText(_("INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."));
        } else if (m_is_insert) {
            wxChar chr = e.GetUnicodeKey();
+            if (!chr) {
+                int key = e.GetKeyCode();
+                if (WXK_NUMPAD0 <= key && key <= WXK_NUMPAD9)
+                    chr = '0' + (key - WXK_NUMPAD0);
+            }
            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
            if (('0' <= chr && chr <= '9' || 'A' <= chr && chr <= 'F') && m_insert_seq.size() < 4) {
                // A hex-digit pressed. Save it.
--- a/ZRColaCompile/ZRColaCompile.vcxproj
+++ b/ZRColaCompile/ZRColaCompile.vcxproj
@@ -63,7 +63,7 @@
    <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
      <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll.vcxproj">
      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -300,7 +300,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
            wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comCharacterGroup)));
            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_ActiveConnection(ATL::CComVariant(m_db))));
            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandType(adCmdText)));
-            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [VRS_SkupineZnakov].[Znak] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
+            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [VRS_SkupineZnakov].[Znak], [VRS_SkupineZnakov].[pogost] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
            {
                // Create and add command parameters.
                ATL::CComPtr<ADOParameters> params;
@@ -844,12 +844,20 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr<ADORecordset>& rs, c
        cg.chars.clear();
        ATL::CComPtr<ADOFields> flds;
        wxVERIFY(SUCCEEDED(rs_chars->get_Fields(&flds)));
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Znak"), &f)));
+        ATL::CComPtr<ADOField> f_char, f_show;
+        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Znak"  ), &f_char)));
+        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"pogost"), &f_show)));
        for (VARIANT_BOOL eof = VARIANT_TRUE; SUCCEEDED(rs_chars->get_EOF(&eof)) && !eof; rs_chars->MoveNext()) {
            wchar_t c;
-            wxCHECK(GetUnicodeCharacter(f, c), false);
+            wxCHECK(GetUnicodeCharacter(f_char, c), false);
+            size_t n = cg.chars.length();
            cg.chars += c;
+            bool show;
+            wxCHECK(GetValue(f_show, show), false);
+            if ((n % 16) == 0)
+                cg.show.push_back(show ? 1 : 0);
+            else if (show)
+                cg.show[n / 16] |= 1 << (n % 16);
        }
    }

--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -109,10 +109,11 @@ namespace ZRCola {
        ///
        class chrgrp {
        public:
-            int id;                     ///< Character group ID
-            int rank;                   ///< Character group rank
-            std::wstring name;          ///< Character group name
-            std::wstring chars;         ///< Character group characters
+            int id;                             ///< Character group ID
+            int rank;                           ///< Character group rank
+            std::wstring name;                  ///< Character group name
+            std::wstring chars;                 ///< Character group characters
+            std::vector<unsigned __int16> show; ///< Bit vector if particular character is displayed initially
        };


--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -120,7 +120,7 @@ int _tmain(int argc, _TCHAR *argv[])
                db.data     .reserve(count*4);

                // Parse translations and build index and data.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read translation from the database.
                    if (src.GetTranslation(rs, trans)) {
                        // Add translation to index and data.
@@ -137,8 +137,6 @@ int _tmain(int argc, _TCHAR *argv[])
                        db.idxDecomp.push_back(idx);
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Sort indices.
@@ -172,7 +170,7 @@ int _tmain(int argc, _TCHAR *argv[])
                db.data  .reserve(count*4);

                // Parse key sequences and build index and data.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read key sequence from the database.
                    if (src.GetKeySequence(rs, ks)) {
                        // Add key sequence to index and data.
@@ -193,8 +191,6 @@ int _tmain(int argc, _TCHAR *argv[])
                        db.idxKey.push_back(idx);
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Sort indices.
@@ -240,9 +236,12 @@ int _tmain(int argc, _TCHAR *argv[])
                db.data  .reserve(count*4);

                // Parse languages and build index and data.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read language from the database.
                    if (src.GetLanguage(rs, lang)) {
+                        if (build_pot)
+                            pot.insert(lang.name);
+
                        // Add language to index and data.
                        unsigned __int32 idx = db.data.size();
                        for (wstring::size_type i = 0; i < sizeof(ZRCola::langid_t)/sizeof(unsigned __int16); i++)
@@ -253,12 +252,8 @@ int _tmain(int argc, _TCHAR *argv[])
                        for (wstring::size_type i = 0; i < n; i++)
                            db.data.push_back(lang.name[i]);
                        db.idxLng.push_back(idx);
-                        if (build_pot)
-                            pot.insert(lang.name);
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Sort indices.
@@ -293,7 +288,7 @@ int _tmain(int argc, _TCHAR *argv[])
                db.data  .reserve(count*4);

                // Parse language characters and build index and data.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read language characters from the database.
                    if (src.GetLanguageCharacter(rs, lc)) {
                        // Add language characters to index and data.
@@ -307,8 +302,6 @@ int _tmain(int argc, _TCHAR *argv[])
 #endif
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Sort indices.
@@ -343,9 +336,12 @@ int _tmain(int argc, _TCHAR *argv[])
                db.data  .reserve(count*4);

                // Parse character groups and build index and data.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read character group from the database.
                    if (src.GetCharacterGroup(rs, cg)) {
+                        if (build_pot)
+                            pot.insert(cg.name);
+
                        if (cg.chars.empty()) {
                            // Skip empty character groups.
                            continue;
@@ -367,13 +363,11 @@ int _tmain(int argc, _TCHAR *argv[])
                            db.data.push_back(cg.name[i]);
                        for (wstring::size_type i = 0; i < n_char; i++)
                            db.data.push_back(cg.chars[i]);
+                        for (std::vector<unsigned __int16>::size_type i = 0, n = cg.show.size(); i < n; i++)
+                            db.data.push_back(cg.show[i]);
                        db.idxRnk.push_back(idx);
-                        if (build_pot)
-                            pot.insert(cg.name);
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Sort indices.
@@ -404,7 +398,7 @@ int _tmain(int argc, _TCHAR *argv[])
                ZRCola::DBSource::character_bank chrs;

                // Phase 1: Parse characters and build indexes.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read character from the database.
                    unique_ptr<ZRCola::DBSource::character> c(new ZRCola::DBSource::character);
                    if (src.GetCharacter(rs, *c)) {
@@ -412,8 +406,6 @@ int _tmain(int argc, _TCHAR *argv[])
                        chrs[chr.chr].swap(c);
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Phase 2: Build related character lists.
@@ -489,31 +481,32 @@ int _tmain(int argc, _TCHAR *argv[])
                db.data     .reserve(count*4);

                // Parse character categories and build index and data.
-                while (!ZRCola::DBSource::IsEOF(rs)) {
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                    // Read character category from the database.
                    if (src.GetCharacterCategory(rs, cc)) {
-                        if (categories_used.find(cc.id) != categories_used.end()) {
-                            // Add character category to index and data.
-                            unsigned __int32 idx = db.data.size();
-                            for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++)
-                                db.data.push_back(((const unsigned __int16*)cc.id.data)[i]);
-                            wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
-                            db.data.push_back((unsigned __int16)cc.rank);
-                            wstring::size_type n_name = cc.name.length();
-                            wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long"));
-                            db.data.push_back((unsigned __int16)n_name);
-                            for (wstring::size_type i = 0; i < n_name; i++)
-                                db.data.push_back(cc.name[i]);
-                            db.idxChrCat.push_back(idx);
-                            db.idxRnk   .push_back(idx);
-                            if (build_pot)
-                                pot.insert(cc.name);
-                        } else
-                            _ftprintf(stderr, wxT("%s: warning ZCC0019: Ommiting empty category %ls.\n"), (LPCTSTR)filenameIn.c_str(), (LPCWSTR)cc.name.c_str());
+                        if (build_pot)
+                            pot.insert(cc.name);
+
+                        if (categories_used.find(cc.id) == categories_used.end()) {
+                            // Skip empty character categories.
+                            continue;
+                        }
+
+                        // Add character category to index and data.
+                        unsigned __int32 idx = db.data.size();
+                        for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++)
+                            db.data.push_back(((const unsigned __int16*)cc.id.data)[i]);
+                        wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
+                        db.data.push_back((unsigned __int16)cc.rank);
+                        wstring::size_type n_name = cc.name.length();
+                        wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long"));
+                        db.data.push_back((unsigned __int16)n_name);
+                        for (wstring::size_type i = 0; i < n_name; i++)
+                            db.data.push_back(cc.name[i]);
+                        db.idxChrCat.push_back(idx);
+                        db.idxRnk   .push_back(idx);
                    } else
                        has_errors = true;
-
-                    wxVERIFY(SUCCEEDED(rs->MoveNext()));
                }

                // Sort indices.
--- a/ZRColaUtils.sln
+++ b/ZRColaUtils.sln
@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtend.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
 EndProject
--- a/include/MSIBuildCfg.mak
+++ b/include/MSIBuildCfg.mak
--- a/include/common.props
+++ b/include/common.props
@@ -23,9 +23,9 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <IntDir>temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>
    <_PropertySheetDisplayName>ZRCola Common</_PropertySheetDisplayName>
-    <OutDir>temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</OutDir>
+    <IntDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>
+    <OutDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</OutDir>
    <IncludePath>$(WXWIN)\include\msvc;$(WXWIN)\include;$(IncludePath)</IncludePath>
    <SourcePath>$(WXWIN)\src\aui;$(WXWIN)\src\cocoa;$(WXWIN)\src\common;$(WXWIN)\src\dfb;$(WXWIN)\src\expat;$(WXWIN)\src\generic;$(WXWIN)\src\gtk;$(WXWIN)\src\gtk1;$(WXWIN)\src\html;$(WXWIN)\src\jpeg;$(WXWIN)\src\motif;$(WXWIN)\src\msdos;$(WXWIN)\src\msw;$(WXWIN)\src\os2;$(WXWIN)\src\osx;$(WXWIN)\src\png;$(WXWIN)\src\propgrid;$(WXWIN)\src\regex;$(WXWIN)\src\ribbon;$(WXWIN)\src\richtext;$(WXWIN)\src\stc;$(WXWIN)\src\tiff;$(WXWIN)\src\univ;$(WXWIN)\src\unix;$(WXWIN)\src\x11;$(WXWIN)\src\xml;$(WXWIN)\src\xrc;$(WXWIN)\src\zlib;$(SourcePath)</SourcePath>
  </PropertyGroup>
--- a/include/zrcola.h
+++ b/include/zrcola.h
@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define ZRCOLA_VERSION          0x01ff0c00
+#define ZRCOLA_VERSION          0x01ff1100

 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define ZRCOLA_VERSION_MAJ      1
 #define ZRCOLA_VERSION_MIN      255
-#define ZRCOLA_VERSION_REV      12
+#define ZRCOLA_VERSION_REV      17
 #define ZRCOLA_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define ZRCOLA_VERSION_STR      "2.0-beta4"
+#define ZRCOLA_VERSION_STR      "2.0-beta8"
 #define ZRCOLA_BUILD_YEAR_STR   "2016"

 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define ZRCOLA_VERSION_INST     "1.255.12"
+#define ZRCOLA_VERSION_INST     "1.255.17"

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define ZRCOLA_VERSION_GUID     "{EAC8769F-1036-4565-828E-06B3220F1EF7}"
+#define ZRCOLA_VERSION_GUID     "{BCBBC30A-5769-4C7F-88CE-071C210C4233}"

 //
 // The product vendor and application name for configuration keeping.
--- a/lib/MSICALib
+++ b/lib/MSICALib
--- a/lib/WinStd
+++ b/lib/WinStd
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -72,6 +72,9 @@ complibZRColaUI.dll.Win32	{D9A5BF44-DDFE-4A22-89F4-14D291581829}	ZRCOLABINDIR	0
 !IF "$(PLAT)" == "x64"
 complibZRColaUI.dll.x64	{360E78E5-9560-4C52-B806-45EDC682BB17}	ZRCOLABINDIR	256		filelibZRColaUI.dll.x64
 !ENDIF
+!IF "$(LANG)" == "Ru"
+complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
+!ENDIF
 !IF "$(LANG)" == "Sl"
 complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
 !ENDIF
@@ -105,6 +108,9 @@ filelibZRColaUI.dll.x64	complibZRColaUI.dll.x64	LIBZRC~6.DLL|libZRColaUI10u_vc10
 filelibZRColaUI.dll.x64	complibZRColaUI.dll.x64	LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll	0		0	1536	1
 !ENDIF
 !ENDIF
+!IF "$(LANG)" == "Ru"
+filelibZRColaUI.mo.ru_RU	complibZRColaUI.mo.ru_RU	LIBZRC~1.MO|libZRColaUI.mo	0		1060	0	1
+!ENDIF
 !IF "$(LANG)" == "Sl"
 filelibZRColaUI.mo.sl_SI	complibZRColaUI.mo.sl_SI	LIBZRC~1.MO|libZRColaUI.mo	0		1060	0	1
 !ENDIF
--- a/lib/libZRColaUI/include/zrcolaui/chargroup.h
+++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h
@@ -23,6 +23,7 @@
 #include <zrcola/common.h>

 #include <stdex/idrec.h>
+#include <assert.h>
 #include <istream>
 #include <ostream>
 #include <vector>
@@ -50,6 +51,28 @@ namespace ZRCola {
            unsigned __int16 name_len;          ///< Character group name length in \c data
            unsigned __int16 char_len;          ///< Character list length in \c data
            wchar_t data[];                     ///< Character group name and character list
+
+            inline const wchar_t* get_chars() const
+            {
+                return data + name_len;
+            }
+
+            inline wchar_t get_char(size_t index) const
+            {
+                assert(index < char_len);
+                return data[name_len + index];
+            }
+
+            inline const unsigned __int16* get_char_shown() const
+            {
+                return (const unsigned __int16*)(data + name_len + char_len);
+            }
+
+            inline bool is_char_shown(size_t index) const
+            {
+                assert(index < char_len);
+                return (data[name_len + char_len + index / 16] & (1 << (index % 16))) ? true : false;
+            }
        };
 #pragma pack(pop)

--- a/lib/wxExtend
+++ b/lib/wxExtend
--- a/output/00_ZRCola_BI.ttf
+++ b/output/00_ZRCola_BI.ttf
--- a/output/00_ZRCola_Bd.ttf
+++ b/output/00_ZRCola_Bd.ttf
--- a/output/00_ZRCola_It.ttf
+++ b/output/00_ZRCola_It.ttf
--- a/output/00_ZRCola_Re.ttf
+++ b/output/00_ZRCola_Re.ttf
--- a/output/data/ZRCola.zrcdb
+++ b/output/data/ZRCola.zrcdb
--- a/output/data/ZRCola_keyboard.pdf
+++ b/output/data/ZRCola_keyboard.pdf
--- a/output/locale/ZRCola-zrcdb.pot
+++ b/output/locale/ZRCola-zrcdb.pot
@@ -5,11 +5,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: ZRColaCompile 2.0-beta1\n"
+"X-Generator: ZRColaCompile 2.0-beta6\n"

 msgid "Albanian"
 msgstr ""

+msgid "Arabic"
+msgstr ""
+
 msgid "Arrows"
 msgstr ""

@@ -34,18 +37,30 @@ msgstr ""
 msgid "Combine Over"
 msgstr ""

+msgid "Combining Marks"
+msgstr ""
+
 msgid "Croatian"
 msgstr ""

 msgid "Currencies"
 msgstr ""

+msgid "Cyrillic"
+msgstr ""
+
 msgid "Czech"
 msgstr ""

 msgid "Danish"
 msgstr ""

+msgid "Diacritics"
+msgstr ""
+
+msgid "Encircled Characters"
+msgstr ""
+
 msgid "English"
 msgstr ""

@@ -61,9 +76,21 @@ msgstr ""
 msgid "Friulian"
 msgstr ""

+msgid "Geometrical Shapes"
+msgstr ""
+
 msgid "German"
 msgstr ""

+msgid "Glagolitic"
+msgstr ""
+
+msgid "Greek"
+msgstr ""
+
+msgid "Hebrew"
+msgstr ""
+
 msgid "Hungarian"
 msgstr ""

@@ -73,6 +100,99 @@ msgstr ""
 msgid "Joined"
 msgstr ""

+msgid "Joined strings with A"
+msgstr ""
+
+msgid "Joined strings with B"
+msgstr ""
+
+msgid "Joined strings with C"
+msgstr ""
+
+msgid "Joined strings with D"
+msgstr ""
+
+msgid "Joined strings with E"
+msgstr ""
+
+msgid "Joined strings with F"
+msgstr ""
+
+msgid "Joined strings with G"
+msgstr ""
+
+msgid "Joined strings with H"
+msgstr ""
+
+msgid "Joined strings with I"
+msgstr ""
+
+msgid "Joined strings with J"
+msgstr ""
+
+msgid "Joined strings with K"
+msgstr ""
+
+msgid "Joined strings with L"
+msgstr ""
+
+msgid "Joined strings with M"
+msgstr ""
+
+msgid "Joined strings with N"
+msgstr ""
+
+msgid "Joined strings with O"
+msgstr ""
+
+msgid "Joined strings with P"
+msgstr ""
+
+msgid "Joined strings with Q"
+msgstr ""
+
+msgid "Joined strings with R"
+msgstr ""
+
+msgid "Joined strings with S"
+msgstr ""
+
+msgid "Joined strings with T"
+msgstr ""
+
+msgid "Joined strings with U"
+msgstr ""
+
+msgid "Joined strings with V"
+msgstr ""
+
+msgid "Joined strings with W"
+msgstr ""
+
+msgid "Joined strings with X"
+msgstr ""
+
+msgid "Joined strings with Y"
+msgstr ""
+
+msgid "Joined strings with Z"
+msgstr ""
+
+msgid "Joined strings with a"
+msgstr ""
+
+msgid "Joined strings with e"
+msgstr ""
+
+msgid "Joined strings with i"
+msgstr ""
+
+msgid "Joined strings with o"
+msgstr ""
+
+msgid "Joined strings with u"
+msgstr ""
+
 msgid "Kashubian"
 msgstr ""

@@ -208,6 +328,12 @@ msgstr ""
 msgid "Mark, Non-Spacing"
 msgstr ""

+msgid "Mark, Spacing Combining"
+msgstr ""
+
+msgid "Mathematical And Physical Symbols"
+msgstr ""
+
 msgid "Metric"
 msgstr ""

@@ -220,6 +346,9 @@ msgstr ""
 msgid "Moldavian – Latinic"
 msgstr ""

+msgid "Musical Characters"
+msgstr ""
+
 msgid "Norwegian"
 msgstr ""

@@ -262,15 +391,21 @@ msgstr ""
 msgid "Number, Other"
 msgstr ""

+msgid "Numbers"
+msgstr ""
+
 msgid "Numbers - Circled"
 msgstr ""

-msgid "Other modifiers"
+msgid "Other Modifiers"
 msgstr ""

 msgid "Other, Format"
 msgstr ""

+msgid "Other, Surrogate"
+msgstr ""
+
 msgid "Parentheses"
 msgstr ""

@@ -280,6 +415,9 @@ msgstr ""
 msgid "Portuguese"
 msgstr ""

+msgid "Punctuation"
+msgstr ""
+
 msgid "Punctuation, Close"
 msgstr ""

@@ -310,6 +448,12 @@ msgstr ""
 msgid "Russian"
 msgstr ""

+msgid "Separator, Line"
+msgstr ""
+
+msgid "Separator, Paragraph"
+msgstr ""
+
 msgid "Separator, Space"
 msgstr ""

@@ -322,12 +466,18 @@ msgstr ""
 msgid "Slovak"
 msgstr ""

+msgid "Slovene Historical Writings"
+msgstr ""
+
 msgid "Slovenian"
 msgstr ""

 msgid "Sorbian"
 msgstr ""

+msgid "Spaces"
+msgstr ""
+
 msgid "Spanish"
 msgstr ""

@@ -337,6 +487,12 @@ msgstr ""
 msgid "Strokes"
 msgstr ""

+msgid "Subscript Characters"
+msgstr ""
+
+msgid "Superscript Sharacters"
+msgstr ""
+
 msgid "Surrounded"
 msgstr ""

@@ -391,11 +547,20 @@ msgstr ""
 msgid "Symbol, Other"
 msgstr ""

+msgid "Technical Characters"
+msgstr ""
+
 msgid "Transliterated"
 msgstr ""

+msgid "Transliterating Marks"
+msgstr ""
+
 msgid "Turkish"
 msgstr ""

 msgid "Ukrainian"
 msgstr ""
+
+msgid "Units"
+msgstr ""
--- a/output/locale/de_DE/ZRCola-zrcdb.mo
+++ b/output/locale/de_DE/ZRCola-zrcdb.mo
--- a/output/locale/de_DE/ZRCola-zrcdb.po
+++ b/output/locale/de_DE/ZRCola-zrcdb.po
@@ -9,13 +9,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"

 msgid "Albanian"
 msgstr ""

+#, fuzzy
+msgid "Arabic"
+msgstr "Arabisch"
+
 msgid "Arrows"
 msgstr ""

@@ -40,18 +44,31 @@ msgstr ""
 msgid "Combine Over"
 msgstr ""

+msgid "Combining Marks"
+msgstr ""
+
 msgid "Croatian"
 msgstr ""

 msgid "Currencies"
 msgstr ""

+#, fuzzy
+msgid "Cyrillic"
+msgstr "Windows Kyrillisch (CP 1251)"
+
 msgid "Czech"
 msgstr ""

 msgid "Danish"
 msgstr ""

+msgid "Diacritics"
+msgstr ""
+
+msgid "Encircled Characters"
+msgstr ""
+
 msgid "English"
 msgstr ""

@@ -67,9 +84,23 @@ msgstr ""
 msgid "Friulian"
 msgstr ""

+msgid "Geometrical Shapes"
+msgstr ""
+
 msgid "German"
 msgstr ""

+msgid "Glagolitic"
+msgstr ""
+
+#, fuzzy
+msgid "Greek"
+msgstr "Windows Griechisch (CP 1253)"
+
+#, fuzzy
+msgid "Hebrew"
+msgstr "Windows Hebräisch (CP 1255)"
+
 msgid "Hungarian"
 msgstr ""

@@ -79,6 +110,99 @@ msgstr ""
 msgid "Joined"
 msgstr ""

+msgid "Joined strings with A"
+msgstr ""
+
+msgid "Joined strings with B"
+msgstr ""
+
+msgid "Joined strings with C"
+msgstr ""
+
+msgid "Joined strings with D"
+msgstr ""
+
+msgid "Joined strings with E"
+msgstr ""
+
+msgid "Joined strings with F"
+msgstr ""
+
+msgid "Joined strings with G"
+msgstr ""
+
+msgid "Joined strings with H"
+msgstr ""
+
+msgid "Joined strings with I"
+msgstr ""
+
+msgid "Joined strings with J"
+msgstr ""
+
+msgid "Joined strings with K"
+msgstr ""
+
+msgid "Joined strings with L"
+msgstr ""
+
+msgid "Joined strings with M"
+msgstr ""
+
+msgid "Joined strings with N"
+msgstr ""
+
+msgid "Joined strings with O"
+msgstr ""
+
+msgid "Joined strings with P"
+msgstr ""
+
+msgid "Joined strings with Q"
+msgstr ""
+
+msgid "Joined strings with R"
+msgstr ""
+
+msgid "Joined strings with S"
+msgstr ""
+
+msgid "Joined strings with T"
+msgstr ""
+
+msgid "Joined strings with U"
+msgstr ""
+
+msgid "Joined strings with V"
+msgstr ""
+
+msgid "Joined strings with W"
+msgstr ""
+
+msgid "Joined strings with X"
+msgstr ""
+
+msgid "Joined strings with Y"
+msgstr ""
+
+msgid "Joined strings with Z"
+msgstr ""
+
+msgid "Joined strings with a"
+msgstr ""
+
+msgid "Joined strings with e"
+msgstr ""
+
+msgid "Joined strings with i"
+msgstr ""
+
+msgid "Joined strings with o"
+msgstr ""
+
+msgid "Joined strings with u"
+msgstr ""
+
 msgid "Kashubian"
 msgstr ""

@@ -216,6 +340,12 @@ msgstr ""
 msgid "Mark, Non-Spacing"
 msgstr ""

+msgid "Mark, Spacing Combining"
+msgstr ""
+
+msgid "Mathematical And Physical Symbols"
+msgstr ""
+
 msgid "Metric"
 msgstr ""

@@ -229,6 +359,9 @@ msgstr ""
 msgid "Moldavian – Latinic"
 msgstr ""

+msgid "Musical Characters"
+msgstr ""
+
 msgid "Norwegian"
 msgstr ""

@@ -271,15 +404,22 @@ msgstr ""
 msgid "Number, Other"
 msgstr ""

+msgid "Numbers"
+msgstr ""
+
 msgid "Numbers - Circled"
 msgstr ""

-msgid "Other modifiers"
-msgstr ""
+#, fuzzy
+msgid "Other Modifiers"
+msgstr "Geändert"

 msgid "Other, Format"
 msgstr ""

+msgid "Other, Surrogate"
+msgstr ""
+
 msgid "Parentheses"
 msgstr ""

@@ -289,6 +429,9 @@ msgstr ""
 msgid "Portuguese"
 msgstr ""

+msgid "Punctuation"
+msgstr ""
+
 msgid "Punctuation, Close"
 msgstr ""

@@ -319,6 +462,12 @@ msgstr ""
 msgid "Russian"
 msgstr ""

+msgid "Separator, Line"
+msgstr ""
+
+msgid "Separator, Paragraph"
+msgstr ""
+
 msgid "Separator, Space"
 msgstr ""

@@ -331,12 +480,18 @@ msgstr ""
 msgid "Slovak"
 msgstr ""

+msgid "Slovene Historical Writings"
+msgstr ""
+
 msgid "Slovenian"
 msgstr ""

 msgid "Sorbian"
 msgstr ""

+msgid "Spaces"
+msgstr ""
+
 msgid "Spanish"
 msgstr ""

@@ -346,6 +501,12 @@ msgstr ""
 msgid "Strokes"
 msgstr ""

+msgid "Subscript Characters"
+msgstr ""
+
+msgid "Superscript Sharacters"
+msgstr ""
+
 msgid "Surrounded"
 msgstr ""

@@ -412,12 +573,21 @@ msgstr ""
 msgid "Symbol, Other"
 msgstr ""

+msgid "Technical Characters"
+msgstr ""
+
 msgid "Transliterated"
 msgstr ""

+msgid "Transliterating Marks"
+msgstr ""
+
 #, fuzzy
 msgid "Turkish"
 msgstr "Windows Türkisch (CP 1254)"

 msgid "Ukrainian"
 msgstr ""
+
+msgid "Units"
+msgstr ""
--- a/output/locale/ru_RU/ZRCola-zrcdb.mo
+++ b/output/locale/ru_RU/ZRCola-zrcdb.mo
--- a/output/locale/ru_RU/ZRCola-zrcdb.po
+++ b/output/locale/ru_RU/ZRCola-zrcdb.po
@@ -15,199 +15,319 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"

 msgid "Albanian"
-msgstr ""
+msgstr "албанский"
+
+msgid "Arabic"
+msgstr "Арабские знаки"

 msgid "Arrows"
-msgstr ""
+msgstr "Стрелки"

 msgid "Belarusian"
-msgstr ""
+msgstr "белорусский"

 msgid "Bosnian – Cyrillic"
-msgstr ""
+msgstr "боснийский – кириллица"

 msgid "Bosnian – Latinic"
-msgstr ""
+msgstr "боснийский – латиница"

 msgid "Combine"
-msgstr ""
+msgstr "Средние замещающие знаки"

 msgid "Combine Above"
-msgstr ""
+msgstr "Верхние замещающие знаки"

 msgid "Combine Below"
-msgstr ""
+msgstr "Низжние замещающие знаки"

 msgid "Combine Over"
-msgstr ""
+msgstr "Неотдельные замещающие знаки"
+
+msgid "Combining Marks"
+msgstr "Модифицирующие символы"

 msgid "Croatian"
-msgstr ""
+msgstr "хорватский"

 msgid "Currencies"
-msgstr ""
+msgstr "Валюты"
+
+msgid "Cyrillic"
+msgstr "Кириллические знаки"

 msgid "Czech"
-msgstr ""
+msgstr "чешский"

 msgid "Danish"
-msgstr ""
+msgstr "датский"
+
+msgid "Diacritics"
+msgstr "Диакритики"
+
+msgid "Encircled Characters"
+msgstr "Знаки в круге"

 msgid "English"
-msgstr ""
+msgstr "английский"

 msgid "Estonian"
-msgstr ""
+msgstr "эстонский"

 msgid "Eva"
-msgstr ""
+msgstr "Эва"

 msgid "French"
-msgstr ""
+msgstr "французский"

 msgid "Friulian"
-msgstr ""
+msgstr "фриульский"
+
+msgid "Geometrical Shapes"
+msgstr "Геометрические фигуры"

 msgid "German"
-msgstr ""
+msgstr "немецкий"
+
+msgid "Glagolitic"
+msgstr "Глаголические знаки"
+
+msgid "Greek"
+msgstr "Греческие знаки"
+
+msgid "Hebrew"
+msgstr "Еврейские знаки"

 msgid "Hungarian"
-msgstr ""
+msgstr "венгерский"

 msgid "Irish Gaelic"
-msgstr ""
+msgstr "ирландский гэльский"

 msgid "Joined"
-msgstr ""
+msgstr "Объединительные замещающие знаки"
+
+msgid "Joined strings with A"
+msgstr "Объединительные серии с А"
+
+msgid "Joined strings with B"
+msgstr "Объединительные серии с Б"
+
+msgid "Joined strings with C"
+msgstr "Объединительные серии с Ц"
+
+msgid "Joined strings with D"
+msgstr "Объединительные серии с Д"
+
+msgid "Joined strings with E"
+msgstr "Объединительные серии с Е"
+
+msgid "Joined strings with F"
+msgstr "Объединительные серии с Ф"
+
+msgid "Joined strings with G"
+msgstr "Объединительные серии с Г"
+
+msgid "Joined strings with H"
+msgstr "Объединительные серии с Х"
+
+msgid "Joined strings with I"
+msgstr "Объединительные серии с И"
+
+msgid "Joined strings with J"
+msgstr "Объединительные серии с Й"
+
+msgid "Joined strings with K"
+msgstr "Объединительные серии с К"
+
+msgid "Joined strings with L"
+msgstr "Объединительные серии с Л"
+
+msgid "Joined strings with M"
+msgstr "Объединительные серии с М"
+
+msgid "Joined strings with N"
+msgstr "Объединительные серии с Н"
+
+msgid "Joined strings with O"
+msgstr "Объединительные серии с О"
+
+msgid "Joined strings with P"
+msgstr "Объединительные серии с П"
+
+msgid "Joined strings with Q"
+msgstr "Объединительные серии с латинским Q"
+
+msgid "Joined strings with R"
+msgstr "Объединительные серии с Р"
+
+msgid "Joined strings with S"
+msgstr "Объединительные серии с С"
+
+msgid "Joined strings with T"
+msgstr "Объединительные серии с Т"
+
+msgid "Joined strings with U"
+msgstr "Объединительные серии с У"
+
+msgid "Joined strings with V"
+msgstr "Объединительные серии с В"
+
+msgid "Joined strings with W"
+msgstr "Объединительные серии с латинским W"
+
+msgid "Joined strings with X"
+msgstr "Объединительные серии с латинским X"
+
+msgid "Joined strings with Y"
+msgstr "Объединительные серии с латинским Y"
+
+msgid "Joined strings with Z"
+msgstr "Объединительные серии с З"
+
+msgid "Joined strings with a"
+msgstr "Объединительные серии с а"
+
+msgid "Joined strings with e"
+msgstr "Объединительные серии с е"
+
+msgid "Joined strings with i"
+msgstr "Объединительные серии с и"
+
+msgid "Joined strings with o"
+msgstr "Объединительные серии с о"
+
+msgid "Joined strings with u"
+msgstr "Объединительные серии с у"

 msgid "Kashubian"
-msgstr ""
+msgstr "кашубский"

 msgid "Latin"
-msgstr ""
+msgstr "латинский"

 msgid "Latvian"
-msgstr ""
+msgstr "латышский"

 msgid "Letter A"
-msgstr ""
+msgstr "Буква А"

 msgid "Letter B"
-msgstr ""
+msgstr "Буква Б"

 msgid "Letter C"
-msgstr ""
+msgstr "Буква Ц"

 msgid "Letter D"
-msgstr ""
+msgstr "Буква Д"

 msgid "Letter E"
-msgstr ""
+msgstr "Буква Е"

 msgid "Letter F"
-msgstr ""
+msgstr "Буква Ф"

 msgid "Letter G"
-msgstr ""
+msgstr "Буква Г"

 msgid "Letter H"
-msgstr ""
+msgstr "Буква Х"

 msgid "Letter I"
-msgstr ""
+msgstr "Буква И"

 msgid "Letter J"
-msgstr ""
+msgstr "Буква Й"

 msgid "Letter K"
-msgstr ""
+msgstr "Буква К"

 msgid "Letter L"
-msgstr ""
+msgstr "Буква Л"

 msgid "Letter M"
-msgstr ""
+msgstr "Буква М"

 msgid "Letter N"
-msgstr ""
+msgstr "Буква Н"

 msgid "Letter O"
-msgstr ""
+msgstr "Буква О"

 msgid "Letter P"
-msgstr ""
+msgstr "Буква П"

 msgid "Letter Q"
-msgstr ""
+msgstr "Буква латинское Q"

 msgid "Letter R"
-msgstr ""
+msgstr "Буква Р"

 msgid "Letter S"
-msgstr ""
+msgstr "Буква С"

 msgid "Letter T"
-msgstr ""
+msgstr "Буква Т"

 msgid "Letter U"
-msgstr ""
+msgstr "Буква У"

 msgid "Letter V"
-msgstr ""
+msgstr "Буква В"

 msgid "Letter W"
-msgstr ""
+msgstr "Буква латинское W"

 msgid "Letter X"
-msgstr ""
+msgstr "Буква латинское Х"

 msgid "Letter Y"
-msgstr ""
+msgstr "Буква латинское Y"

 msgid "Letter Z"
-msgstr ""
+msgstr "Буква З"

 msgid "Letter a"
-msgstr ""
+msgstr "Буква а"

 msgid "Letter e"
-msgstr ""
+msgstr "Буква е"

 msgid "Letter i"
-msgstr ""
+msgstr "Буква и"

 msgid "Letter o"
-msgstr ""
+msgstr "Буква о"

 msgid "Letter u"
-msgstr ""
+msgstr "Буква у"

 msgid "Letter, Lowercase"
-msgstr ""
+msgstr "Буква, строчная"

 msgid "Letter, Modifier"
-msgstr ""
+msgstr "Буква, модификатор"

 msgid "Letter, Other"
-msgstr ""
+msgstr "Буква, остальное"

 msgid "Letter, Titlecase"
-msgstr ""
+msgstr "Буква, начальная"

 msgid "Letter, Uppercase"
-msgstr ""
+msgstr "Буква, прописная"

 msgid "Ligatures"
-msgstr ""
+msgstr "Лигатуры"

 msgid "Lithuanian"
-msgstr ""
+msgstr "литовский"

 msgid "Macedonian"
-msgstr ""
+msgstr "македонский"

 msgid "Maltese"
-msgstr ""
+msgstr "мальтийский"

 msgid "Mark, Enclosing"
 msgstr ""
@@ -215,77 +335,95 @@ msgstr ""
 msgid "Mark, Non-Spacing"
 msgstr ""

-msgid "Metric"
+msgid "Mark, Spacing Combining"
 msgstr ""

+msgid "Mathematical And Physical Symbols"
+msgstr "Математические и физические знаки"
+
+msgid "Metric"
+msgstr "Метрические знаки"
+
 msgid "Modified"
-msgstr ""
+msgstr "Изменяющие знаки"

 msgid "Moldavian – Cyrillic"
-msgstr ""
+msgstr "молдавский – кириллица"

 msgid "Moldavian – Latinic"
-msgstr ""
+msgstr "молдавский – латиница"
+
+msgid "Musical Characters"
+msgstr "Музыкальные символы"

 msgid "Norwegian"
-msgstr ""
+msgstr "норвежский"

 msgid "Number 0"
-msgstr ""
+msgstr "Число 0"

 msgid "Number 1"
-msgstr ""
+msgstr "Число 1"

 msgid "Number 2"
-msgstr ""
+msgstr "Число 2"

 msgid "Number 3"
-msgstr ""
+msgstr "Число 3"

 msgid "Number 4"
-msgstr ""
+msgstr "Число 4"

 msgid "Number 5"
-msgstr ""
+msgstr "Число 5"

 msgid "Number 6"
-msgstr ""
+msgstr "Число 6"

 msgid "Number 7"
-msgstr ""
+msgstr "Число 7"

 msgid "Number 8"
-msgstr ""
+msgstr "Число 8"

 msgid "Number 9"
-msgstr ""
+msgstr "Число 9"

 msgid "Number, Decimal Digit"
-msgstr ""
+msgstr "Число, децималная цифра"

 msgid "Number, Letter"
-msgstr ""
+msgstr "Число, буква"

 msgid "Number, Other"
-msgstr ""
+msgstr "Число, другое"
+
+msgid "Numbers"
+msgstr "Числа"

 msgid "Numbers - Circled"
-msgstr ""
+msgstr "Числа в круге"

-msgid "Other modifiers"
-msgstr ""
+msgid "Other Modifiers"
+msgstr "Остальные замещающие знаки"

 msgid "Other, Format"
 msgstr ""

-msgid "Parentheses"
+msgid "Other, Surrogate"
 msgstr ""

+msgid "Parentheses"
+msgstr "Скобкы"
+
 msgid "Polish"
-msgstr ""
+msgstr "польский"

 msgid "Portuguese"
-msgstr ""
+msgstr "португальский"
+
+msgid "Punctuation"
+msgstr "Знаки препинания"

 msgid "Punctuation, Close"
 msgstr ""
@@ -309,100 +447,128 @@ msgid "Punctuation, Other"
 msgstr ""

 msgid "Quotes"
-msgstr ""
+msgstr "Кавычки"

 msgid "Romanian"
-msgstr ""
+msgstr "румынский"

 msgid "Russian"
-msgstr ""
+msgstr "русский"
+
+msgid "Separator, Line"
+msgstr "Сепаратор, строчка"
+
+msgid "Separator, Paragraph"
+msgstr "Сепаратор, абзац"

 msgid "Separator, Space"
-msgstr ""
+msgstr "Сепаратор, пробел"

 msgid "Serbian – Cyrillic"
-msgstr ""
+msgstr "сербский – кириллица"

 msgid "Serbian – Latinic"
-msgstr ""
+msgstr "сербский – латиница"

 msgid "Slovak"
-msgstr ""
+msgstr "словацкий"
+
+# Preveri исторический!
+msgid "Slovene Historical Writings"
+msgstr "Словенские исторические письма"

 msgid "Slovenian"
-msgstr ""
+msgstr "словенский"

 msgid "Sorbian"
-msgstr ""
+msgstr "лужицкий"
+
+msgid "Spaces"
+msgstr "Пробелы"

 msgid "Spanish"
-msgstr ""
+msgstr "испанский"

 msgid "Special Characters"
-msgstr ""
+msgstr "Специальные знаки"

 msgid "Strokes"
-msgstr ""
+msgstr "Перечертка"
+
+msgid "Subscript Characters"
+msgstr "Форматирование нижнего индекса"
+
+msgid "Superscript Sharacters"
+msgstr "Форматирование надстрочного индекса"

 msgid "Surrounded"
-msgstr ""
+msgstr "В круге"

 msgid "Swedish"
-msgstr ""
+msgstr "шведский"

 msgid "Symbol !"
-msgstr ""
+msgstr "Симбол !"

 msgid "Symbol ("
-msgstr ""
+msgstr "Симбол ("

 msgid "Symbol )"
-msgstr ""
+msgstr "Симбол )"

 msgid "Symbol +"
-msgstr ""
+msgstr "Симбол +"

 msgid "Symbol ,"
-msgstr ""
+msgstr "Симбол ,"

 msgid "Symbol -"
-msgstr ""
+msgstr "Симбол -"

 msgid "Symbol :"
-msgstr ""
+msgstr "Симбол :"

 msgid "Symbol ;"
-msgstr ""
+msgstr "Симбол ;"

 msgid "Symbol <"
-msgstr ""
+msgstr "Симбол <"

 msgid "Symbol ="
-msgstr ""
+msgstr "Симбол ="

 msgid "Symbol >"
-msgstr ""
+msgstr "Симбол >"

 msgid "Symbol ?"
-msgstr ""
+msgstr "Симбол ?"

 msgid "Symbol, Currency"
-msgstr ""
+msgstr "Симбол, валюта"

 msgid "Symbol, Math"
-msgstr ""
+msgstr "Симбол, математический"

 msgid "Symbol, Modifier"
-msgstr ""
+msgstr "Симбол, модификатор"

 msgid "Symbol, Other"
-msgstr ""
+msgstr "Симбол, остальное"
+
+msgid "Technical Characters"
+msgstr "Технические символы"

 msgid "Transliterated"
-msgstr ""
+msgstr "Транслитерированные знаки"
+
+msgid "Transliterating Marks"
+msgstr "Транслитерирующие знаки"

 msgid "Turkish"
-msgstr ""
+msgstr "турецкий"

 msgid "Ukrainian"
-msgstr ""
+msgstr "украинский"
+
+msgid "Units"
+msgstr "Единицы"
--- a/output/locale/sl_SI/ZRCola-zrcdb.mo
+++ b/output/locale/sl_SI/ZRCola-zrcdb.mo
--- a/output/locale/sl_SI/ZRCola-zrcdb.po
+++ b/output/locale/sl_SI/ZRCola-zrcdb.po
@@ -17,6 +17,9 @@ msgstr ""
 msgid "Albanian"
 msgstr "albanščina"

+msgid "Arabic"
+msgstr "Arabski znaki"
+
 msgid "Arrows"
 msgstr "Puščice"

@@ -30,16 +33,19 @@ msgid "Bosnian – Latinic"
 msgstr "bosanščina – latinica"

 msgid "Combine"
-msgstr "Kombinirano"
+msgstr "Srednji nadomestni znaki"

 msgid "Combine Above"
-msgstr "Kombinirano zgoraj"
+msgstr "Zgornji nadomestni znaki"

 msgid "Combine Below"
-msgstr "Kombinirano spodaj"
+msgstr "Spodnji nadomestni znaki"

 msgid "Combine Over"
-msgstr "Kombinirano prečrtano"
+msgstr "Neločljivi nadomestni znaki"
+
+msgid "Combining Marks"
+msgstr "Sestavljiva ločevalna znamenja"

 msgid "Croatian"
 msgstr "hrvaščina"
@@ -47,12 +53,21 @@ msgstr "hrvaščina"
 msgid "Currencies"
 msgstr "Valute"

+msgid "Cyrillic"
+msgstr "Cirilski znaki"
+
 msgid "Czech"
 msgstr "češčina"

 msgid "Danish"
 msgstr "danščina"

+msgid "Diacritics"
+msgstr "Ločevalna znamenja"
+
+msgid "Encircled Characters"
+msgstr "Obkroženi znaki"
+
 msgid "English"
 msgstr "angleščina"

@@ -68,9 +83,21 @@ msgstr "francoščina"
 msgid "Friulian"
 msgstr "furlanščina"

+msgid "Geometrical Shapes"
+msgstr "Geometrijski liki"
+
 msgid "German"
 msgstr "nemščina"

+msgid "Glagolitic"
+msgstr "Glagolski znaki"
+
+msgid "Greek"
+msgstr "Grški znaki"
+
+msgid "Hebrew"
+msgstr "Hebrejski znaki"
+
 msgid "Hungarian"
 msgstr "madžarščina"

@@ -78,7 +105,100 @@ msgid "Irish Gaelic"
 msgstr "irščina"

 msgid "Joined"
-msgstr "Povezano"
+msgstr "Povezajni nadomestni znaki"
+
+msgid "Joined strings with A"
+msgstr "Povezajni nizi z A"
+
+msgid "Joined strings with B"
+msgstr "Povezajni nizi z B"
+
+msgid "Joined strings with C"
+msgstr "Povezajni nizi s C"
+
+msgid "Joined strings with D"
+msgstr "Povezajni nizi z D"
+
+msgid "Joined strings with E"
+msgstr "Povezajni nizi z E"
+
+msgid "Joined strings with F"
+msgstr "Povezajni nizi s F"
+
+msgid "Joined strings with G"
+msgstr "Povezajni nizi z G"
+
+msgid "Joined strings with H"
+msgstr "Povezajni nizi s H"
+
+msgid "Joined strings with I"
+msgstr "Povezajni nizi z I"
+
+msgid "Joined strings with J"
+msgstr "Povezajni nizi z J"
+
+msgid "Joined strings with K"
+msgstr "Povezajni nizi s K"
+
+msgid "Joined strings with L"
+msgstr "Povezajni nizi z L"
+
+msgid "Joined strings with M"
+msgstr "Povezajni nizi z M"
+
+msgid "Joined strings with N"
+msgstr "Povezajni nizi z N"
+
+msgid "Joined strings with O"
+msgstr "Povezajni nizi z O"
+
+msgid "Joined strings with P"
+msgstr "Povezajni nizi s P"
+
+msgid "Joined strings with Q"
+msgstr "Povezajni nizi z Q"
+
+msgid "Joined strings with R"
+msgstr "Povezajni nizi z R"
+
+msgid "Joined strings with S"
+msgstr "Povezajni nizi s S"
+
+msgid "Joined strings with T"
+msgstr "Povezajni nizi s T"
+
+msgid "Joined strings with U"
+msgstr "Povezajni nizi z U"
+
+msgid "Joined strings with V"
+msgstr "Povezajni nizi z V"
+
+msgid "Joined strings with W"
+msgstr "Povezajni nizi z W"
+
+msgid "Joined strings with X"
+msgstr "Povezajni nizi z X"
+
+msgid "Joined strings with Y"
+msgstr "Povezajni nizi z Y"
+
+msgid "Joined strings with Z"
+msgstr "Povezajni nizi z Z"
+
+msgid "Joined strings with a"
+msgstr "Povezajni nizi z a"
+
+msgid "Joined strings with e"
+msgstr "Povezajni nizi z e"
+
+msgid "Joined strings with i"
+msgstr "Povezajni nizi z i"
+
+msgid "Joined strings with o"
+msgstr "Povezajni nizi z o"
+
+msgid "Joined strings with u"
+msgstr "Povezajni nizi z u"

 msgid "Kashubian"
 msgstr "kašubščina"
@@ -210,16 +330,22 @@ msgid "Maltese"
 msgstr "malteščina"

 msgid "Mark, Enclosing"
-msgstr "Ločevalo, obdajajoča"
+msgstr "Ločevalo, obdajajoče"

 msgid "Mark, Non-Spacing"
 msgstr "Ločevalo, neločljivo"

+msgid "Mark, Spacing Combining"
+msgstr "Ločevalo, ločljivo"
+
+msgid "Mathematical And Physical Symbols"
+msgstr "Matematični in fizikalni simboli"
+
 msgid "Metric"
 msgstr "Metrično"

 msgid "Modified"
-msgstr "Spremenjeno"
+msgstr "Spreminjevalni nadomestni znaki"

 msgid "Moldavian – Cyrillic"
 msgstr "moldavščina – cirilica"
@@ -227,6 +353,9 @@ msgstr "moldavščina – cirilica"
 msgid "Moldavian – Latinic"
 msgstr "moldavščina – latinica"

+msgid "Musical Characters"
+msgstr "Glasbeni znaki"
+
 msgid "Norwegian"
 msgstr "norveščina"

@@ -269,14 +398,20 @@ msgstr "Številka, črka"
 msgid "Number, Other"
 msgstr "Številka, drugo"

-msgid "Numbers - Circled"
-msgstr "Številke - obkroženo"
+msgid "Numbers"
+msgstr "Številke"

-msgid "Other modifiers"
+msgid "Numbers - Circled"
+msgstr "Številka, obkrožena"
+
+msgid "Other Modifiers"
 msgstr "Druga spreminjevala"

 msgid "Other, Format"
-msgstr "Drugo, oblikovni"
+msgstr "Drugo, oblikovni znaki"
+
+msgid "Other, Surrogate"
+msgstr "Drugo, nadomestni znaki"

 msgid "Parentheses"
 msgstr "Oklepaji"
@@ -287,6 +422,9 @@ msgstr "poljščina"
 msgid "Portuguese"
 msgstr "portugalščina"

+msgid "Punctuation"
+msgstr "Ločila"
+
 msgid "Punctuation, Close"
 msgstr "Ločilo, zapiralno"

@@ -317,6 +455,12 @@ msgstr "romunščina"
 msgid "Russian"
 msgstr "ruščina"

+msgid "Separator, Line"
+msgstr "Ločilo, vrstica"
+
+msgid "Separator, Paragraph"
+msgstr "Ločilo, odstavek"
+
 msgid "Separator, Space"
 msgstr "Ločilo, presledek"

@@ -329,12 +473,18 @@ msgstr "srbščina – latinica"
 msgid "Slovak"
 msgstr "slovaščina"

+msgid "Slovene Historical Writings"
+msgstr "Slovenske zgodovinske pisave"
+
 msgid "Slovenian"
 msgstr "slovenščina"

 msgid "Sorbian"
 msgstr "lužiščini"

+msgid "Spaces"
+msgstr "Presledki"
+
 msgid "Spanish"
 msgstr "španščina"

@@ -342,10 +492,16 @@ msgid "Special Characters"
 msgstr "Posebni znaki"

 msgid "Strokes"
-msgstr "Poševnica"
+msgstr "Poševnice"
+
+msgid "Subscript Characters"
+msgstr "Podpisani znaki"
+
+msgid "Superscript Sharacters"
+msgstr "Nadpisani znaki"

 msgid "Surrounded"
-msgstr "Obkroženi"
+msgstr "Obkrožajni nadomestni znaki"

 msgid "Swedish"
 msgstr "švedščina"
@@ -398,26 +554,23 @@ msgstr "Simbol, ločevalo"
 msgid "Symbol, Other"
 msgstr "Simbol, drugo"

+msgid "Technical Characters"
+msgstr "Tehnični znaki"
+
 msgid "Transliterated"
 msgstr "Prečrkovano"

+msgid "Transliterating Marks"
+msgstr "Prečrkovalni nadomestni znaki"
+
 msgid "Turkish"
 msgstr "turščina"

 msgid "Ukrainian"
 msgstr "ukrajinščina"

-#~ msgid "Mark, Spacing Combining"
-#~ msgstr "Ločevalo, ločljivo"
-
-#~ msgid "Other, Surrogate"
-#~ msgstr "Drugo, nadomestni"
-
-#~ msgid "Separator, Line"
-#~ msgstr "Ločilo, vrstic"
-
-#~ msgid "Separator, Paragraph"
-#~ msgstr "Ločilo, odstavkov"
+msgid "Units"
+msgstr "Enote"

 #~ msgid "Letter b"
 #~ msgstr "Črka b"
@@ -482,8 +635,5 @@ msgstr "ukrajinščina"
 #~ msgid "Letter z"
 #~ msgstr "Črka z"

-#~ msgid "Numbers"
-#~ msgstr "Številke"
-
 #~ msgid "Other, Control"
 #~ msgstr "Drugo, kontrolni"
Author	SHA1	Message	Date
Simon Rozman	26e81ac0a0	Sub-module update	2016-07-18 08:51:20 +02:00
Simon Rozman	2b610e2804	Version set to 2.0-beta8	2016-07-18 08:29:30 +02:00
Simon Rozman	ea4f85223c	"ZRCola" font name mainstream now	2016-07-15 21:44:28 +02:00
Simon Rozman	aff96d1efe	Russian MSI generation commented & some additional support for German added	2016-07-15 21:27:51 +02:00
Simon Rozman	f5eaf3c74b	Internal and output folders now using $(MSBuildProjectName) instead of $(ProjectName), to distinguish project variations of essentially the same module	2016-07-15 12:48:07 +02:00
Simon Rozman	6e167b7344	Contact information updated	2016-07-15 10:32:26 +02:00
Simon Rozman	acaae141de	ZRCola keyboard PDF updated	2016-07-15 10:28:29 +02:00
Simon Rozman	4a32a4b40c	General package information moved from NMAKE macros to Property table, to allow translation to other scripts (than Windows-1252 and Windows-1250)	2016-07-15 09:52:22 +02:00
Simon Rozman	902fcf92a4	Support for Russian localization introduced	2016-07-14 18:08:15 +02:00
Simon Rozman	424a6762f7	Support for numeric keyboard with Ins+nnnn added	2016-07-14 13:59:50 +02:00
Simon Rozman	41aa04abad	A system reboot is scheduled when "00 ZRCola" font substitute is registered	2016-07-14 13:44:32 +02:00
Simon Rozman	8ae98bfb12	The font components marked to use reference counter	2016-07-14 12:34:27 +02:00
Simon Rozman	41dfe0c892	Font update	2016-07-14 11:25:01 +02:00
Simon Rozman	5cd454a757	Version set to 2.0-beta7f	2016-07-14 10:56:38 +02:00
Simon Rozman	a75b649f8b	Database and font update	2016-07-14 10:50:53 +02:00
Simon Rozman	174f117770	"00 ZRCola" font renamed to "ZRCola"	2016-07-14 10:25:54 +02:00
Simon Rozman	19d1daf099	Slovenian translations updated	2016-07-14 09:27:36 +02:00
Simon Rozman	c4fe7c4370	Some Russian translations added	2016-07-14 09:18:37 +02:00
Simon Rozman	7a7135ea81	Version set to 2.0-beta7	2016-06-17 13:04:29 +02:00
Simon Rozman	2d97afded3	Database update	2016-06-17 13:01:16 +02:00
Simon Rozman	01e8ca5338	Documentation update	2016-06-14 12:45:31 +02:00
Simon Rozman	02f69e332c	Documentation update	2016-06-14 12:38:46 +02:00
Simon Rozman	5ce2d209d2	Update README.md	2016-06-14 12:29:38 +02:00
Simon Rozman	088abe062b	Documentation update	2016-06-14 12:28:19 +02:00
Simon Rozman	f264fdb211	Version set to 2.0-beta6	2016-06-14 12:13:21 +02:00
Simon Rozman	0e9c6ab66e	Support for more or less frequent characters in catalog added	2016-06-14 12:12:17 +02:00
Simon Rozman	040109c36f	Version set to 2.0-beta5	2016-06-14 10:15:43 +02:00
Simon Rozman	d130888753	End-of-setup tutorial added	2016-06-14 10:14:45 +02:00
Simon Rozman	e81b0f772d	Translation update	2016-06-14 10:02:21 +02:00
Simon Rozman	750cab5370	Add/Remove Programs icon reverted back to ZRCola's	2016-06-14 09:19:03 +02:00
Simon Rozman	213425fd11	Global hot-key registration moved as late as possible to avoid non-effective registration at auto start-up	2016-06-13 15:38:19 +02:00
Simon Rozman	689c72e7e7	Composing ə (and some other characters) combinations fixed	2016-06-13 15:35:52 +02:00
Simon Rozman	fbd60a53dc	Categories are collapsible in Character Search dialog now	2016-06-13 13:25:05 +02:00
Simon Rozman	e3475ef48d	Font and database update - fonts now OpenType	2016-06-13 11:02:55 +02:00
Simon Rozman	86d512e752	Empty character groups and categories are included in translation catalog too now	2016-06-13 10:57:00 +02:00