Version set to 2.0-beta9

Database update
Version tagging removed from POT file generation to make POT files version independent
2016-08-03 08:28:29 +02:00 · 2016-08-03 08:27:24 +02:00 · 2016-08-03 08:27:09 +02:00 · 2016-08-02 17:47:52 +02:00 · 2016-07-22 01:20:24 +02:00 · 2016-07-22 00:19:00 +02:00
42 changed files with 847 additions and 433 deletions
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSI/MSICA
+++ b/MSI/MSICA
--- a/MSI/ZRCola/Main/Binary/fontsubst.bmp
+++ b/MSI/ZRCola/Main/Binary/fontsubst.bmp
--- a/MSI/ZRCola/Main/Binary/fontsubst.png
+++ b/MSI/ZRCola/Main/Binary/fontsubst.png
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -27,7 +27,8 @@ MSIBUILD_IS_LOCALIZEABLE=1

 All :: \
 	"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
-	"$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp"
+	"$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\fontsubst.bmp"

 "$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
 	-if exist $@ del /f /q $@
@@ -36,11 +37,15 @@ Name	Data
 s$(MSIBUILD_LENGTH_ID)	v0
 Binary	Name
 binUIHeader.bmp	UIHeader.bmp
+binfontsubst.bmp	fontsubst.bmp
 <<NOKEEP

 "$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp" : "Binary\UIHeader.bmp"
 	copy /y $** $@ > NUL

+"$(LANG).$(PLAT).$(CFG).Binary-1\fontsubst.bmp" : "Binary\fontsubst.bmp"
+	copy /y $** $@ > NUL
+

 ######################################################################
 # Component
@@ -53,19 +58,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.otf	{A98CF048-44D1-405D-9217-C34900A1ADD5}	FontsFolder	0		file00_ZRCola_Re.otf
-comp00_ZRCola_It.otf	{B3CAE4B5-95D3-4522-9C23-66D015A69C48}	FontsFolder	0		file00_ZRCola_It.otf
-comp00_ZRCola_Bd.otf	{FC3D8EE1-7472-487F-97D5-7F65977CBEF7}	FontsFolder	0		file00_ZRCola_Bd.otf
-comp00_ZRCola_BI.otf	{F72CB82B-70BF-406E-A310-0294425C12A4}	FontsFolder	0		file00_ZRCola_BI.otf
+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
@@ -90,6 +98,11 @@ dlgDeclaration	ctlDeclarationText	ScrollableText	15	89	370	149	7		{\rtf1\ansi\an
 dlgDeclaration	ctlNote	Text	15	243	370	12	196611		Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website.	ctlIAgree	
 dlgDeclaration	ctlIAgree	CheckBox	15	265	300	15	19	IAgreeDecl	I &agree.	ctlContinue	
 dlgDeclaration	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgFontSubstitutes	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgFontSubstitutes	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont]"00 ZRCola" to "ZRCola" Font	ctlScreenshot	
+dlgFontSubstitutes	ctlScreenshot	Bitmap	79	60	242	156	5		binfontsubst.bmp	ctlText1	
+dlgFontSubstitutes	ctlText1	Text	15	221	370	36	196611		The "00 ZRCola" font was succeeded by "ZRCola" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after the next restart.	ctlContinue	
+dlgFontSubstitutes	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"
@@ -101,6 +114,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 $@ $**

@@ -135,6 +151,7 @@ ControlEvent	Dialog_	Control_	Event	Argument	Condition
 dlgPrepare	ctlBannerBitmap	SpawnDialog	dlgCancel	1	1000
 dlgDeclaration	ctlBannerBitmap	SpawnDialog	dlgCancel	1	1000
 dlgDeclaration	ctlContinue	EndDialog	Return	IAgreeDecl	1000
+dlgFontSubstitutes	ctlContinue	EndDialog	Return	1	1000
 <<NOKEEP


@@ -166,6 +183,7 @@ Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control
 s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
 Dialog	Dialog
 dlgDeclaration	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlBannerBitmap
+dlgFontSubstitutes	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
 <<NOKEEP


@@ -204,7 +222,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 +249,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 +268,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 +282,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 +301,11 @@ Feature_	Component_
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
 FeatureComponents	Feature_	Component_
 featZRCola_keyboard	compZRCola_keyboard.pdf
-featZRColaFonts00	comp00_ZRCola_Re.otf
-featZRColaFonts00	comp00_ZRCola_It.otf
-featZRColaFonts00	comp00_ZRCola_Bd.otf
-featZRColaFonts00	comp00_ZRCola_BI.otf
+featZRColaFontsZRCola	compZRCola_Re.otf
+featZRColaFontsZRCola	compZRCola_It.otf
+featZRColaFontsZRCola	compZRCola_Bd.otf
+featZRColaFontsZRCola	compZRCola_BI.otf
+featZRColaFontsZRCola	comp00_ZRCola
 <<NOKEEP


@@ -290,16 +320,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.otf	comp00_ZRCola_Re.otf	00_ZRC~1.OTF|00_ZRCola_Re.otf	0			0	1
-file00_ZRCola_It.otf	comp00_ZRCola_It.otf	00_ZRC~2.OTF|00_ZRCola_It.otf	0			0	1
-file00_ZRCola_Bd.otf	comp00_ZRCola_Bd.otf	00_ZRC~3.OTF|00_ZRCola_Bd.otf	0			0	1
-file00_ZRCola_BI.otf	comp00_ZRCola_BI.otf	00_ZRC~4.OTF|00_ZRCola_BI.otf	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 +348,10 @@ All :: "$(LANG).$(PLAT).$(CFG).Font-1.idt"
 File_	FontTitle
 s$(MSIBUILD_LENGTH_ID)	S255
 Font	File_
-file00_ZRCola_Re.otf	
-file00_ZRCola_It.otf	
-file00_ZRCola_Bd.otf	
-file00_ZRCola_BI.otf	
+fileZRCola_Re.otf	
+fileZRCola_It.otf	
+fileZRCola_Bd.otf	
+fileZRCola_BI.otf	
 <<NOKEEP


@@ -356,6 +388,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


@@ -373,6 +406,7 @@ InstallUISequence	Action
 caSetZRCOLADIR1	OLDZRCOLADIR	1001
 caSetZRCOLADIR2	INSTALLDIR	1002
 dlgDeclaration	NOT Installed	1215
+dlgFontSubstitutes	?comp00_ZRCola<>3 AND $$comp00_ZRCola=3	1580
 <<NOKEEP


@@ -394,7 +428,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 $@
@@ -410,6 +446,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.zrc-sazu.si/en/contact/
+ARPHELPLINK	http://zrcola.zrc-sazu.si/en/info/instructions/
+ARPURLUPDATEINFO	http://zrcola.zrc-sazu.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 +491,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 +512,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 +557,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-14 09:22+0200\n"
+"POT-Creation-Date: 2016-08-02 17:45+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"
@@ -17,22 +17,27 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 "X-Poedit-SearchPath-0: .\n"

-#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
+#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
 #, fuzzy
 msgid "#60"
 msgstr "#176"

-#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
+#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
 #, fuzzy
 msgid "&Continue"
 msgstr "&Nadaljuj"

-#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
+#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
+#, fuzzy
+msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
+msgstr "[DlgTitleFont]\"00 ZRCola\" v pisavo \"ZRCola\""
+
+#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
 #, fuzzy
 msgid "[DlgTitleFont][SimpleProductName] Declaration"
 msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]"

-#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
+#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
 msgid ""
 "{\\rtf1\\adeflang1025\\ansi"
 "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi "
@@ -770,7 +775,7 @@ msgid ""
 "0105000002000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000c0ef044c8850cf01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}}"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
+#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
 #, fuzzy
 msgid ""
 "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New "
@@ -782,85 +787,126 @@ 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.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.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.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Registry-2.idtx:3 En.Win32.Debug.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.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Debug.Control-2.idtx:3 En.x64.Debug.Directory-2.idtx:3 En.x64.Debug.Feature-2.idtx:3 En.x64.Debug.Registry-2.idtx:3 En.x64.Debug.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.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
+#: 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:14 En.x64.Release.Control-2.idtx:14
+#, fuzzy
+msgid "binfontsubst.bmp"
+msgstr "binfontsubst.bmp"
+
+#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
 #, fuzzy
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 #, fuzzy
 msgid "Documentation"
 msgstr "Dokumentacija"

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 #, fuzzy
 msgid "Fonts"
 msgstr "Pisave"

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 #, fuzzy
 msgid "Fonts used by ZRCola"
 msgstr "Pisave, ki jih uporablja ZRCola"

-#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
+#: 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
+msgid "http://zrcola.zrc-sazu.si/en/contact/"
+msgstr ""
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+#, fuzzy
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola.zrc-sazu.si/en/install/"
+msgstr ""
+
+#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 #, fuzzy
 msgid "I &agree."
 msgstr "&Strinjam se."

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 #, fuzzy
 msgid "Keyboard Shortcuts"
 msgstr "Bližnjice na tipkovnici"

-#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
+#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
 #, fuzzy
 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website."
 msgstr "Opomba: Ta deklaracija je na voljo tudi v dialogu vizitke [SimpleProductName] ali na spletni strani."

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 #, fuzzy
 msgid "PDF document with a list of ZRCola keyboard shortcuts"
 msgstr "Dokument PDF s seznamom ZRColinih bližnjic na tipkovnici"

-#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
+#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
 #, fuzzy
 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 "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"

-#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
+#, fuzzy
+msgid ""
+"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
+"the next restart."
+msgstr ""
+"Pisavo \"00 ZRCola\" je nadomestila pisava \"ZRCola\". Da bodo vaši prejšnji dokumenti prikazani pravilno, smo na vašem računalniku uredili nadomeščanje pisave, ki bo stopilo v veljavo "
+"po naslednjem zagonu."
+
+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
 #, fuzzy
 msgid "Times New Roman based font"
 msgstr "Pisava na osnovi Times New Roman"

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: 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"
 msgstr "Dokumentacija ZRCola"

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
 msgid "ZRCola Keyboard Shortcuts"
 msgstr "ZRColine bližnjice na tipkovnici"

-#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
+#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
 #, fuzzy
 msgid "ZRCola:."
 msgstr "ZRCola:."

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
 msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
 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-14 09:23+0200\n"
+"POT-Creation-Date: 2016-08-02 17:45+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"
@@ -17,15 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 # wxLanguage enum value for this language (decimal, # prefixed)
-#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
+#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
 msgid "#60"
 msgstr "#89"

-#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
+#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
 msgid "&Continue"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
+#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
+msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
+msgstr ""
+
+#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
 msgid "[DlgTitleFont][SimpleProductName] Declaration"
 msgstr ""

@@ -33,7 +37,7 @@ msgstr ""
 # 1. Translate as a separate RTF document.
 # 2. Remove ALL line breaks from RTF file.
 # 3. Paste translation.
-#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
+#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
 msgid ""
 "{\\rtf1\\adeflang1025\\ansi"
 "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi "
@@ -1509,79 +1513,118 @@ msgstr ""
 # 1. Translate as a separate RTF document.
 # 2. Remove ALL line breaks from RTF file.
 # 3. Paste translation.
-#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
+#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
 msgid ""
 "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New "
 "Roman;}Times New Roman CE;}}{\\colortbl ;\\red0\\green0\\blue255;}{\\*\\generator Msftedit 5.41.21.2510;}\\viewkind4\\uc1\\pard\\sa200\\sl276\\slmult1\\i\\f0\\fs22 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.\\f1\\par}"
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.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.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Registry-2.idtx:3 En.Win32.Debug.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.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Debug.Control-2.idtx:3 En.x64.Debug.Directory-2.idtx:3 En.x64.Debug.Feature-2.idtx:3 En.x64.Debug.Registry-2.idtx:3 En.x64.Debug.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.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
+#: 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:14 En.x64.Release.Control-2.idtx:14
+msgid "binfontsubst.bmp"
+msgstr ""
+
+#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 #, fuzzy
 msgid "Documentation"
 msgstr "Dokumentation von "

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 #, fuzzy
 msgid "Fonts"
 msgstr "Listet die verfügbaren Schriftarten auf."

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 msgid "Fonts used by ZRCola"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
+#: 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.zrc-sazu.si/en/contact/"
+msgstr "http://zrcola.zrc-sazu.si/de/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola.zrc-sazu.si/en/install/"
+msgstr "http://zrcola.zrc-sazu.si/de/install/"
+
+#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 msgid "I &agree."
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 msgid "Keyboard Shortcuts"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
+#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website."
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 msgid "PDF document with a list of ZRCola keyboard shortcuts"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
+#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
 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 ""

-#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
+msgid ""
+"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
+"the next restart."
+msgstr ""
+
+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
 msgid "Times New Roman based font"
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: 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 ""

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola Keyboard Shortcuts"
 msgstr ""

-#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
+#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
 msgid "ZRCola:."
 msgstr "ZRCola:."

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: 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.zrc-sazu.si/en/"
+#~ msgstr "http://zrcola.zrc-sazu.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-14 09:23+0200\n"
+"POT-Creation-Date: 2016-08-02 17:45+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"
@@ -17,15 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 # wxLanguage enum value for this language (decimal, # prefixed)
-#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
+#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
 msgid "#60"
 msgstr "#158"

-#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
+#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
 msgid "&Continue"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
+#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
+msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
+msgstr ""
+
+#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
 msgid "[DlgTitleFont][SimpleProductName] Declaration"
 msgstr ""

@@ -33,7 +37,7 @@ msgstr ""
 # 1. Translate as a separate RTF document.
 # 2. Remove ALL line breaks from RTF file.
 # 3. Paste translation.
-#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
+#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
 msgid ""
 "{\\rtf1\\adeflang1025\\ansi"
 "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi "
@@ -1509,77 +1513,119 @@ msgstr ""
 # 1. Translate as a separate RTF document.
 # 2. Remove ALL line breaks from RTF file.
 # 3. Paste translation.
-#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
+#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
 msgid ""
 "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New "
 "Roman;}Times New Roman CE;}}{\\colortbl ;\\red0\\green0\\blue255;}{\\*\\generator Msftedit 5.41.21.2510;}\\viewkind4\\uc1\\pard\\sa200\\sl276\\slmult1\\i\\f0\\fs22 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.\\f1\\par}"
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.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.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Registry-2.idtx:3 En.Win32.Debug.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.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Debug.Control-2.idtx:3 En.x64.Debug.Directory-2.idtx:3 En.x64.Debug.Feature-2.idtx:3 En.x64.Debug.Registry-2.idtx:3 En.x64.Debug.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.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
+#: 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:14 En.x64.Release.Control-2.idtx:14
+msgid "binfontsubst.bmp"
+msgstr ""
+
+#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 msgid "Documentation"
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 msgid "Fonts"
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 msgid "Fonts used by ZRCola"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
+#: 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.zrc-sazu.si/en/contact/"
+msgstr "http://zrcola.zrc-sazu.si/ru/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola.zrc-sazu.si/en/install/"
+msgstr "http://zrcola.zrc-sazu.si/ru/install/"
+
+#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 msgid "I &agree."
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 msgid "Keyboard Shortcuts"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
+#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website."
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 msgid "PDF document with a list of ZRCola keyboard shortcuts"
 msgstr ""

-#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
+#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
 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 ""

-#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
+msgid ""
+"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
+"the next restart."
+msgstr ""
+
+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
 msgid "Times New Roman based font"
 msgstr ""

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: 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 ""

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola Keyboard Shortcuts"
 msgstr ""

-#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
+#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
 msgid "ZRCola:."
 msgstr "ZRCola:."

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: 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.zrc-sazu.si/en/"
+#~ msgstr "http://zrcola.zrc-sazu.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-14 09:23+0200\n"
+"POT-Creation-Date: 2016-08-02 17:45+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"
@@ -17,15 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"

 # wxLanguage enum value for this language (decimal, # prefixed)
-#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
+#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4
 msgid "#60"
 msgstr "#176"

-#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
+#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
 msgid "&Continue"
 msgstr "&Nadaljuj"

-#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
+#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
+msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
+msgstr "[DlgTitleFont]\"00 ZRCola\" v pisavo \"ZRCola\""
+
+#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
 msgid "[DlgTitleFont][SimpleProductName] Declaration"
 msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]"

@@ -33,7 +37,7 @@ msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]"
 # 1. Translate as a separate RTF document.
 # 2. Remove ALL line breaks from RTF file.
 # 3. Paste translation.
-#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
+#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4
 msgid ""
 "{\\rtf1\\adeflang1025\\ansi"
 "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi "
@@ -1509,7 +1513,7 @@ msgstr ""
 # 1. Translate as a separate RTF document.
 # 2. Remove ALL line breaks from RTF file.
 # 3. Paste translation.
-#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
+#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8
 msgid ""
 "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New "
 "Roman;}Times New Roman CE;}}{\\colortbl ;\\red0\\green0\\blue255;}{\\*\\generator Msftedit 5.41.21.2510;}\\viewkind4\\uc1\\pard\\sa200\\sl276\\slmult1\\i\\f0\\fs22 This text was written "
@@ -1520,74 +1524,118 @@ 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.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.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.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Registry-2.idtx:3 En.Win32.Debug.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.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3
-#: En.x64.Debug.Control-2.idtx:3 En.x64.Debug.Directory-2.idtx:3 En.x64.Debug.Feature-2.idtx:3 En.x64.Debug.Registry-2.idtx:3 En.x64.Debug.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.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
+#: 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:14 En.x64.Release.Control-2.idtx:14
+msgid "binfontsubst.bmp"
+msgstr "binfontsubst.bmp"
+
+#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
 msgid "Documentation"
 msgstr "Dokumentacija"

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 msgid "Fonts"
 msgstr "Pisave"

-#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
+#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4
 msgid "Fonts used by ZRCola"
 msgstr "Pisave, ki jih uporablja ZRCola"

-#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
+#: 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.zrc-sazu.si/en/contact/"
+msgstr "http://zrcola.zrc-sazu.si/contact/"
+
+#: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
+
+#: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9
+msgid "http://zrcola.zrc-sazu.si/en/install/"
+msgstr "http://zrcola.zrc-sazu.si/install/"
+
+#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10
 msgid "I &agree."
 msgstr "&Strinjam se."

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 msgid "Keyboard Shortcuts"
 msgstr "Bližnjice na tipkovnici"

-#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
+#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9
 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website."
 msgstr "Opomba: Ta deklaracija je na voljo tudi v dialogu vizitke [SimpleProductName] ali na spletni strani."

-#: En.Win32.Debug.Feature-2.idtx:7 En.Win32.Release.Feature-2.idtx:7 En.x64.Debug.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
+#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7
 msgid "PDF document with a list of ZRCola keyboard shortcuts"
 msgstr "Dokument PDF s seznamom ZRColinih bližnjic na tipkovnici"

-#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
+#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7
 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 "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"

-#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
+#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
+msgid ""
+"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
+"the next restart."
+msgstr ""
+"Pisavo \"00 ZRCola\" je nadomestila pisava \"ZRCola\". Da bodo vaši prejšnji dokumenti prikazani pravilno, smo na vašem računalniku uredili nadomeščanje pisave, ki bo stopilo v veljavo "
+"po naslednjem zagonu."
+
+#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
 msgid "Times New Roman based font"
 msgstr "Pisava na osnovi Times New Roman"

-#: En.Win32.Debug.Feature-2.idtx:6 En.Win32.Release.Feature-2.idtx:6 En.x64.Debug.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6
+#: 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"

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola Keyboard Shortcuts"
 msgstr "ZRColine bližnjice na tipkovnici"

-#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
+#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4
 msgid "ZRCola:."
 msgstr "ZRCola:."

-#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
+#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
 msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici"

+#~ msgid "00 ZRCola"
+#~ msgstr "00 ZRCola"
+
+#~ msgid "http://zrcola.zrc-sazu.si/en/"
+#~ msgstr "http://zrcola.zrc-sazu.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.otf" \
-	"$(WINDIR)\Fonts\00_ZRCola_It.otf" \
-	"$(WINDIR)\Fonts\00_ZRCola_Bd.otf" \
-	"$(WINDIR)\Fonts\00_ZRCola_BI.otf"
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             /t REG_SZ /d "00_ZRCola_Re.otf" $(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.otf" $(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.otf" $(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.otf" $(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.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.otf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_It.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.otf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.otf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_BI.otf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.otf"
+	-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.otf" : "$(OUTPUT_DIR)\00_ZRCola_Re.otf"
+"$(WINDIR)\Fonts\ZRCola_Re.otf" : "$(OUTPUT_DIR)\ZRCola_Re.otf"
 	copy /y $** $@ > NUL

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

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

-"$(WINDIR)\Fonts\00_ZRCola_BI.otf" : "$(OUTPUT_DIR)\00_ZRCola_BI.otf"
+"$(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/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/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -104,6 +104,9 @@ 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
@@ -148,6 +151,9 @@ dlgTutorial3	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 $@ $**

@@ -226,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 $@ $**

@@ -250,7 +259,15 @@ featZRCola	compLocalizationRepositoryPath
 featZRCola	compLanguage
 featZRCola	compDatabasePath
 featZRCola	compZRCola.zrcdb
-featZRCola	comp00_ZRCola_Re.otf
+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
@@ -274,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
@@ -338,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>
@@ -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>
@@ -3072,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>
@@ -3229,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>
@@ -3673,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>
@@ -4197,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>
@@ -5437,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>
@@ -6615,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>
@@ -6886,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-14 11:32+0200\n"
+"POT-Creation-Date: 2016-08-02 17: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"
@@ -81,18 +81,14 @@ msgstr ""
 "funkcionalnosti ne bo na voljo."

 #: zrcolafrm.cpp:351
-#, fuzzy
-msgid "http://zrcola-2.amebis.si/en/info/instructions/"
-msgstr "http://zrcola-2.amebis.si/info/instructions/"
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr ""

 #: zrcolafrm.cpp:375
-#, fuzzy
 msgid ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"

 #: zrcolagui.cpp:36
 #, fuzzy
@@ -340,17 +336,19 @@ msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"

 #: zrcolagui.cpp:355
+#, fuzzy
 msgid "Select category to display"
-msgstr ""
+msgstr "Izberi kategorijo za prikaz"

 #: zrcolagui.cpp:389
 #, fuzzy
 msgid "Show &All"
-msgstr "Prikaži vse"
+msgstr "Prik&aži vse"

 #: zrcolagui.cpp:390
+#, fuzzy
 msgid "Toggle display of less frequent characters"
-msgstr ""
+msgstr "Prikaži/skrij manj pogoste znake"

 #: zrcolagui.cpp:430
 #, fuzzy
--- 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-14 11:33+0200\n"
-"PO-Revision-Date: 2016-06-14 11:34+0200\n"
+"POT-Creation-Date: 2016-08-02 17:32+0200\n"
+"PO-Revision-Date: 2016-08-02 17:32+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"
@@ -27,7 +27,7 @@ msgstr ""
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
 msgid "ZRCola"
-msgstr "ZRCola:."
+msgstr "ZRCola"

 #: zrcolachrreq.cpp:49 zrcolagui.cpp:998
 #, fuzzy
@@ -69,15 +69,16 @@ msgid ""
 msgstr ""

 #: zrcolafrm.cpp:351
-msgid "http://zrcola-2.amebis.si/en/info/instructions/"
-msgstr "http://zrcola-2.amebis.si/de/info/instructions/"
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"

 #: zrcolafrm.cpp:375
+#, fuzzy
 msgid ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/04/5_ZRCola-"
 "Tipkovnica_2009-06-21.pdf"

 #: zrcolagui.cpp:36
--- 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-14 11:33+0200\n"
-"PO-Revision-Date: 2016-06-14 11:33+0200\n"
+"POT-Creation-Date: 2016-08-02 17:32+0200\n"
+"PO-Revision-Date: 2016-08-02 17:32+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"
@@ -28,7 +28,7 @@ msgstr ""
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
 msgid "ZRCola"
-msgstr "ZRCola:."
+msgstr "ZRCola"

 #: zrcolachrreq.cpp:49 zrcolagui.cpp:998
 #, fuzzy
@@ -68,15 +68,16 @@ msgid ""
 msgstr ""

 #: zrcolafrm.cpp:351
-msgid "http://zrcola-2.amebis.si/en/info/instructions/"
-msgstr "http://zrcola-2.amebis.si/ru/info/instructions/"
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"

 #: zrcolafrm.cpp:375
+#, fuzzy
 msgid ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/04/5_ZRCola-"
 "Tipkovnica_2009-06-21.pdf"

 #: zrcolagui.cpp:36
@@ -361,7 +362,7 @@ msgstr ""

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

 #: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
@@ -451,7 +452,7 @@ msgstr ""

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

 #: zrcolagui.cpp:893
 msgid ""
@@ -584,24 +585,23 @@ msgstr ""
 #: 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 ""
+msgstr "bintutorial1.bmp"

 #: MSIBuild/En.Win32.Release.Control-2.idtx:12
 #: MSIBuild/En.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
-msgstr ""
+msgstr "bintutorial2.bmp"

 #: MSIBuild/En.Win32.Release.Control-2.idtx:17
 #: MSIBuild/En.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
-msgstr ""
+msgstr "bintutorial3.bmp"

 #: MSIBuild/En.Win32.Release.Control-2.idtx:10
 #: MSIBuild/En.Win32.Release.Control-2.idtx:15
@@ -609,7 +609,6 @@ msgstr ""
 #: 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"

--- 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-14 11:33+0200\n"
-"PO-Revision-Date: 2016-06-14 11:33+0200\n"
+"POT-Creation-Date: 2016-08-02 17:32+0200\n"
+"PO-Revision-Date: 2016-08-02 17:32+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"
@@ -70,16 +70,16 @@ msgstr ""
 "funkcionalnosti ne bo na voljo."

 #: zrcolafrm.cpp:351
-msgid "http://zrcola-2.amebis.si/en/info/instructions/"
-msgstr "http://zrcola-2.amebis.si/info/instructions/"
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/info/instructions/"

 #: zrcolafrm.cpp:375
 msgid ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"

 #: zrcolagui.cpp:36
 msgid "E&xit"
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -348,7 +348,7 @@ void wxZRColaFrame::OnPanelCharacterCatalogFocus(wxCommandEvent& event)

 void wxZRColaFrame::OnHelpInstructions(wxCommandEvent& event)
 {
-    wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/en/info/instructions/"));
+    wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/en/info/instructions/"));
 }


@@ -372,7 +372,7 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event)
        (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;

    // When everything else fail, try the online version.
-    wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-Tipkovnica_2009-06-21.pdf"));
+    wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"));
 }


--- 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 );
@@ -380,7 +380,7 @@ 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 ) );
 	
@@ -505,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") );
@@ -543,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") );
@@ -607,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") );
@@ -671,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") );
 	
@@ -868,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 );
 	
@@ -1003,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 );
@@ -1023,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/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/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -543,7 +543,7 @@ int _tmain(int argc, _TCHAR *argv[])
                << "\"MIME-Version: 1.0\\n\"" << endl
                << "\"Content-Type: text/plain; charset=UTF-8\\n\"" << endl
                << "\"Content-Transfer-Encoding: 8bit\\n\"" << endl
-                << "\"X-Generator: ZRColaCompile " << ZRCOLA_VERSION_STR << "\\n\"" << endl;
+                << "\"X-Generator: ZRColaCompile\\n\"" << endl;

            wstring_convert<codecvt_utf8<wchar_t>> conv;
            for (set<wstring>::const_iterator i = pot.cbegin(); i != pot.cend(); ++i) {
--- 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          0x01ff0f00
+#define ZRCOLA_VERSION          0x01ff1200

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

 //
 // Human readable product version and build year for UI
 //
-#define ZRCOLA_VERSION_STR      "2.0-beta7"
+#define ZRCOLA_VERSION_STR      "2.0-beta9"
 #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.15"
+#define ZRCOLA_VERSION_INST     "1.255.18"

 //
 // 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     "{6FD2DCFC-2044-44E6-B9A1-CBCAA9A187F2}"
+#define ZRCOLA_VERSION_GUID     "{0CA30692-C6AA-4BE3-B523-8D247465960C}"

 //
 // 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/wxExtend
+++ b/lib/wxExtend
--- a/output/00_ZRCola_BI.otf
+++ b/output/00_ZRCola_BI.otf
--- a/output/00_ZRCola_Bd.otf
+++ b/output/00_ZRCola_Bd.otf
--- a/output/00_ZRCola_It.otf
+++ b/output/00_ZRCola_It.otf
--- a/output/00_ZRCola_Re.otf
+++ b/output/00_ZRCola_Re.otf
--- 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,7 +5,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: ZRColaCompile 2.0-beta6\n"
+"X-Generator: ZRColaCompile\n"

 msgid "Albanian"
 msgstr ""
--- a/output/locale/ru_RU/ZRCola-zrcdb.po
+++ b/output/locale/ru_RU/ZRCola-zrcdb.po
@@ -9,325 +9,325 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 1.8.7\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"

 msgid "Albanian"
-msgstr ""
+msgstr "албанский"

 msgid "Arabic"
-msgstr ""
+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 ""
+msgstr "Модифицирующие символы"

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

 msgid "Currencies"
-msgstr ""
+msgstr "Валюты"

 msgid "Cyrillic"
-msgstr ""
+msgstr "Кириллические знаки"

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

 msgid "Danish"
-msgstr ""
+msgstr "датский"

 msgid "Diacritics"
-msgstr ""
+msgstr "Диакритики"

 msgid "Encircled Characters"
-msgstr ""
+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 ""
+msgstr "Геометрические фигуры"

 msgid "German"
-msgstr ""
+msgstr "немецкий"

 msgid "Glagolitic"
-msgstr ""
+msgstr "Глаголические знаки"

 msgid "Greek"
-msgstr ""
+msgstr "Греческие знаки"

 msgid "Hebrew"
-msgstr ""
+msgstr "Еврейские знаки"

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

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

 msgid "Joined"
-msgstr ""
+msgstr "Объединительные замещающие знаки"

 msgid "Joined strings with A"
-msgstr ""
+msgstr "Объединительные серии с А"

 msgid "Joined strings with B"
-msgstr ""
+msgstr "Объединительные серии с Б"

 msgid "Joined strings with C"
-msgstr ""
+msgstr "Объединительные серии с Ц"

 msgid "Joined strings with D"
-msgstr ""
+msgstr "Объединительные серии с Д"

 msgid "Joined strings with E"
-msgstr ""
+msgstr "Объединительные серии с Е"

 msgid "Joined strings with F"
-msgstr ""
+msgstr "Объединительные серии с Ф"

 msgid "Joined strings with G"
-msgstr ""
+msgstr "Объединительные серии с Г"

 msgid "Joined strings with H"
-msgstr ""
+msgstr "Объединительные серии с Х"

 msgid "Joined strings with I"
-msgstr ""
+msgstr "Объединительные серии с И"

 msgid "Joined strings with J"
-msgstr ""
+msgstr "Объединительные серии с Й"

 msgid "Joined strings with K"
-msgstr ""
+msgstr "Объединительные серии с К"

 msgid "Joined strings with L"
-msgstr ""
+msgstr "Объединительные серии с Л"

 msgid "Joined strings with M"
-msgstr ""
+msgstr "Объединительные серии с М"

 msgid "Joined strings with N"
-msgstr ""
+msgstr "Объединительные серии с Н"

 msgid "Joined strings with O"
-msgstr ""
+msgstr "Объединительные серии с О"

 msgid "Joined strings with P"
-msgstr ""
+msgstr "Объединительные серии с П"

 msgid "Joined strings with Q"
-msgstr ""
+msgstr "Объединительные серии с латинским Q"

 msgid "Joined strings with R"
-msgstr ""
+msgstr "Объединительные серии с Р"

 msgid "Joined strings with S"
-msgstr ""
+msgstr "Объединительные серии с С"

 msgid "Joined strings with T"
-msgstr ""
+msgstr "Объединительные серии с Т"

 msgid "Joined strings with U"
-msgstr ""
+msgstr "Объединительные серии с У"

 msgid "Joined strings with V"
-msgstr ""
+msgstr "Объединительные серии с В"

 msgid "Joined strings with W"
-msgstr ""
+msgstr "Объединительные серии с латинским W"

 msgid "Joined strings with X"
-msgstr ""
+msgstr "Объединительные серии с латинским X"

 msgid "Joined strings with Y"
-msgstr ""
+msgstr "Объединительные серии с латинским Y"

 msgid "Joined strings with Z"
-msgstr ""
+msgstr "Объединительные серии с З"

 msgid "Joined strings with a"
-msgstr ""
+msgstr "Объединительные серии с а"

 msgid "Joined strings with e"
-msgstr ""
+msgstr "Объединительные серии с е"

 msgid "Joined strings with i"
-msgstr ""
+msgstr "Объединительные серии с и"

 msgid "Joined strings with o"
-msgstr ""
+msgstr "Объединительные серии с о"

 msgid "Joined strings with u"
-msgstr ""
+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 ""
@@ -339,73 +339,73 @@ msgid "Mark, Spacing Combining"
 msgstr ""

 msgid "Mathematical And Physical Symbols"
-msgstr ""
+msgstr "Математические и физические знаки"

 msgid "Metric"
-msgstr ""
+msgstr "Метрические знаки"

 msgid "Modified"
-msgstr ""
+msgstr "Изменяющие знаки"

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

 msgid "Moldavian – Latinic"
-msgstr ""
+msgstr "молдавский – латиница"

 msgid "Musical Characters"
-msgstr ""
+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 ""
+msgstr "Числа"

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

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

 msgid "Other, Format"
 msgstr ""
@@ -414,16 +414,16 @@ msgid "Other, Surrogate"
 msgstr ""

 msgid "Parentheses"
-msgstr ""
+msgstr "Скобкы"

 msgid "Polish"
-msgstr ""
+msgstr "польский"

 msgid "Portuguese"
-msgstr ""
+msgstr "португальский"

 msgid "Punctuation"
-msgstr ""
+msgstr "Знаки препинания"

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

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

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

 msgid "Russian"
-msgstr ""
+msgstr "русский"

 msgid "Separator, Line"
-msgstr ""
+msgstr "Сепаратор, строчка"

 msgid "Separator, Paragraph"
-msgstr ""
+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 ""
+msgstr "Словенские исторические письма"

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

 msgid "Sorbian"
-msgstr ""
+msgstr "лужицкий"

 msgid "Spaces"
-msgstr ""
+msgstr "Пробелы"

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

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

 msgid "Strokes"
-msgstr ""
+msgstr "Перечертка"

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

 msgid "Superscript Sharacters"
-msgstr ""
+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 ""
+msgstr "Технические символы"

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

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

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

 msgid "Ukrainian"
-msgstr ""
+msgstr "украинский"

 msgid "Units"
-msgstr ""
+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
@@ -33,19 +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 znamenja"
+msgstr "Sestavljiva ločevalna znamenja"

 msgid "Croatian"
 msgstr "hrvaščina"
@@ -105,7 +105,7 @@ msgid "Irish Gaelic"
 msgstr "irščina"

 msgid "Joined"
-msgstr "Povezano"
+msgstr "Povezajni nadomestni znaki"

 msgid "Joined strings with A"
 msgstr "Povezajni nizi z A"
@@ -225,7 +225,7 @@ msgid "Letter E"
 msgstr "Črka E"

 msgid "Letter F"
-msgstr "Črka f"
+msgstr "Črka F"

 msgid "Letter G"
 msgstr "Črka G"
@@ -330,7 +330,7 @@ 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"
@@ -345,7 +345,7 @@ msgid "Metric"
 msgstr "Metrično"

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

 msgid "Moldavian – Cyrillic"
 msgstr "moldavščina – cirilica"
@@ -402,16 +402,16 @@ msgid "Numbers"
 msgstr "Številke"

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

 msgid "Other Modifiers"
-msgstr "Druga spreminjevala"
+msgstr "Ostali nadomestni znaki"

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

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

 msgid "Parentheses"
 msgstr "Oklepaji"
@@ -456,10 +456,10 @@ msgid "Russian"
 msgstr "ruščina"

 msgid "Separator, Line"
-msgstr "Ločilo, vrstic"
+msgstr "Ločilo, vrstica"

 msgid "Separator, Paragraph"
-msgstr "Ločilo, odstavkov"
+msgstr "Ločilo, odstavek"

 msgid "Separator, Space"
 msgstr "Ločilo, presledek"
@@ -492,7 +492,7 @@ msgid "Special Characters"
 msgstr "Posebni znaki"

 msgid "Strokes"
-msgstr "Poševnica"
+msgstr "Poševnice"

 msgid "Subscript Characters"
 msgstr "Podpisani znaki"
@@ -501,7 +501,7 @@ msgid "Superscript Sharacters"
 msgstr "Nadpisani znaki"

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

 msgid "Swedish"
 msgstr "švedščina"
@@ -561,7 +561,7 @@ msgid "Transliterated"
 msgstr "Prečrkovano"

 msgid "Transliterating Marks"
-msgstr "Prečrkovano"
+msgstr "Prečrkovalni nadomestni znaki"

 msgid "Turkish"
 msgstr "turščina"
Author	SHA1	Message	Date
Simon Rozman	a7c6f2967f	Version set to 2.0-beta9	2016-08-03 08:28:29 +02:00
Simon Rozman	2316e5906c	Database update	2016-08-03 08:27:24 +02:00
Simon Rozman	1866ace76f	Version tagging removed from POT file generation to make POT files version independent	2016-08-03 08:27:09 +02:00
Simon Rozman	48d97742b1	URL update	2016-08-02 17:47:52 +02:00
Simon Rozman	96bde4740f	A reboot after "00 ZRCola" font substitute installation is explained now + Updater updated to version that should not reboot after an unattended update	2016-07-22 01:20:24 +02:00
Simon Rozman	333a415a66	Database and Slovenian translation update	2016-07-22 00:19:00 +02:00
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