diff --git a/ZRCola/MSIBuild/Binary/tutorial1.bmp b/ZRCola/MSIBuild/Binary/tutorial1.bmp
new file mode 100644
index 0000000..bd23793
Binary files /dev/null and b/ZRCola/MSIBuild/Binary/tutorial1.bmp differ
diff --git a/ZRCola/MSIBuild/Binary/tutorial1.psd b/ZRCola/MSIBuild/Binary/tutorial1.psd
new file mode 100644
index 0000000..0792627
Binary files /dev/null and b/ZRCola/MSIBuild/Binary/tutorial1.psd differ
diff --git a/ZRCola/MSIBuild/Binary/tutorial2.bmp b/ZRCola/MSIBuild/Binary/tutorial2.bmp
new file mode 100644
index 0000000..18de675
Binary files /dev/null and b/ZRCola/MSIBuild/Binary/tutorial2.bmp differ
diff --git a/ZRCola/MSIBuild/Binary/tutorial2.png b/ZRCola/MSIBuild/Binary/tutorial2.png
new file mode 100644
index 0000000..bd6bc8a
Binary files /dev/null and b/ZRCola/MSIBuild/Binary/tutorial2.png differ
diff --git a/ZRCola/MSIBuild/Binary/tutorial3.bmp b/ZRCola/MSIBuild/Binary/tutorial3.bmp
new file mode 100644
index 0000000..17b58c6
Binary files /dev/null and b/ZRCola/MSIBuild/Binary/tutorial3.bmp differ
diff --git a/ZRCola/MSIBuild/Binary/tutorial3.png b/ZRCola/MSIBuild/Binary/tutorial3.png
new file mode 100644
index 0000000..0e2d0b1
Binary files /dev/null and b/ZRCola/MSIBuild/Binary/tutorial3.png differ
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 9ec5965..a345d69 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -37,6 +37,36 @@ OLDZRCOLADIR	clZRCola.exe.$(PLAT)
 <<NOKEEP
 
 
+######################################################################
+# Binary
+
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial1.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial2.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp"
+
+"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Name	Data
+s$(MSIBUILD_LENGTH_ID)	v0
+Binary	Name
+bintutorial1.bmp	tutorial1.bmp
+bintutorial2.bmp	tutorial2.bmp
+bintutorial3.bmp	tutorial3.bmp
+<<NOKEEP
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial1.bmp" : "Binary\tutorial1.bmp"
+	copy /y $** $@ > NUL
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial2.bmp" : "Binary\tutorial2.bmp"
+	copy /y $** $@ > NUL
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp" : "Binary\tutorial3.bmp"
+	copy /y $** $@ > NUL
+
+
 ######################################################################
 # CompLocator
 
@@ -80,6 +110,99 @@ compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MS
 <<NOKEEP
 
 
+######################################################################
+# Control
+
+All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt"
+
+"En.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
+s$(MSIBUILD_LENGTH_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSIBUILD_LENGTH_HELP)
+1252	Control	Dialog_	Control
+dlgTutorial1	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial1	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Starting	ctlScreenshot	
+dlgTutorial1	ctlScreenshot	Bitmap	154	60	92	54	5		bintutorial1.bmp	ctlText1	
+dlgTutorial1	ctlText1	Text	15	119	370	24	196611		When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5.	ctlText2	
+dlgTutorial1	ctlText2	Text	15	148	370	36	196611		IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!	ctlContinue	
+dlgTutorial1	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgTutorial2	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial2	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Composition	ctlScreenshot	
+dlgTutorial2	ctlScreenshot	Bitmap	81	60	238	137	5		bintutorial2.bmp	ctlText1	
+dlgTutorial2	ctlText1	Text	15	202	370	36	196611		The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used.	ctlContinue	
+dlgTutorial2	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgTutorial3	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial3	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters	ctlScreenshot	
+dlgTutorial3	ctlScreenshot	Bitmap	147	60	106	112	5		bintutorial3.bmp	ctlText1	
+dlgTutorial3	ctlText1	Text	15	177	370	24	196611		Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8).	ctlContinue	
+dlgTutorial3	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
+######################################################################
+# ControlEvent
+
+All :: "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog_	Control_	Event	Argument	Condition	Ordering
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
+ControlEvent	Dialog_	Control_	Event	Argument	Condition
+dlgTutorial1	ctlContinue	EndDialog	Return	1	1000
+dlgTutorial2	ctlContinue	EndDialog	Return	1	1000
+dlgTutorial3	ctlContinue	EndDialog	Return	1	1000
+<<NOKEEP
+
+
+######################################################################
+# Dialog
+
+All :: "$(LANG).$(PLAT).$(CFG).Dialog-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Dialog-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
+s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
+Dialog	Dialog
+dlgTutorial1	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+dlgTutorial2	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+dlgTutorial3	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+<<NOKEEP
+
+
+######################################################################
+# InstallUISequence
+
+All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Action	Condition	Sequence
+s$(MSIBUILD_LENGTH_ID)	S255	I2
+InstallUISequence	Action
+dlgTutorial1	NOT Installed	1400
+dlgTutorial2	NOT Installed	1401
+dlgTutorial3	NOT Installed	1402
+<<NOKEEP
+
+
 ######################################################################
 # Feature
 
diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot
index f8ad81f..1aa6aff 100644
--- 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-13 13:20+0200\n"
+"POT-Creation-Date: 2016-06-14 09:58+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"
@@ -24,8 +24,12 @@ msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
 #: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
@@ -50,14 +54,14 @@ msgstr "Zahtevaj nov znak"
 #: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
 #, fuzzy
 msgid "▸ Search Options"
-msgstr "▶ Možnosti iskanja"
+msgstr "▸ Možnosti iskanja"
 
 #: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
 #, fuzzy
 msgid "▾ Search Options"
-msgstr "▶ Možnosti iskanja"
+msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:111
+#: zrcolafrm.cpp:141
 #, fuzzy
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
@@ -66,12 +70,12 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 #, fuzzy
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 #, fuzzy
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
@@ -677,22 +681,167 @@ msgstr "Nastavitve"
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Debug.Control-2.idtx:14
+#: MSIBuild/En.x64.Debug.Control-2.idtx:19
+#: MSIBuild/En.x64.Debug.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+#, fuzzy
+msgid "&Continue"
+msgstr "&Nadaljuj"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Debug.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+#, fuzzy
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Debug.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+#, fuzzy
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Debug.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+#, fuzzy
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Debug.Control-2.idtx:3
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 #, fuzzy
 msgid "1252"
 msgstr "1250"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Debug.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+#, fuzzy
+msgid "bintutorial1.bmp"
+msgstr "bintutorial1.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Debug.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+#, fuzzy
+msgid "bintutorial2.bmp"
+msgstr "bintutorial2.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Debug.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+#, fuzzy
+msgid "bintutorial3.bmp"
+msgstr "bintutorial3.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Debug.Control-2.idtx:10
+#: MSIBuild/En.x64.Debug.Control-2.idtx:15
+#: MSIBuild/En.x64.Debug.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+#, fuzzy
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Debug.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+#, fuzzy
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
+"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Debug.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+#, fuzzy
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+"POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v "
+"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
+"vedel, kam vstaviti želene znake!"
+
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Debug.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+#, fuzzy
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+"Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v "
+"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
+"vnesemo s pritiskom na tipko F5."
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Debug.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+#, fuzzy
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
+"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
+
 #~ msgid "Auto Start"
 #~ msgstr "Samodejni zagon"
 
diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po
index 41f62d5..72a64ab 100644
--- 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-13 13:21+0200\n"
-"PO-Revision-Date: 2016-06-13 13:21+0200\n"
+"POT-Creation-Date: 2016-06-14 09:58+0200\n"
+"PO-Revision-Date: 2016-06-14 09:58+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"
@@ -21,8 +21,12 @@ msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
 #: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
@@ -51,18 +55,18 @@ msgstr ""
 msgid "▾ Search Options"
 msgstr ""
 
-#: zrcolafrm.cpp:111
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 #, fuzzy
 msgid "Warning"
 msgstr "Warnung: "
 
-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -565,22 +569,147 @@ msgstr ""
 msgid "About ZRCola"
 msgstr ""
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Debug.Control-2.idtx:14
+#: MSIBuild/En.x64.Debug.Control-2.idtx:19
+#: MSIBuild/En.x64.Debug.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+#, fuzzy
+msgid "&Continue"
+msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Debug.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Debug.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Debug.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr ""
+
 # Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Debug.Control-2.idtx:3
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 #, fuzzy
 msgid "1252"
 msgstr "1252"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Debug.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+msgid "bintutorial1.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Debug.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+msgid "bintutorial2.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Debug.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+msgid "bintutorial3.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Debug.Control-2.idtx:10
+#: MSIBuild/En.x64.Debug.Control-2.idtx:15
+#: MSIBuild/En.x64.Debug.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+#, fuzzy
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Debug.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Debug.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
 msgstr ""
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Debug.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Debug.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+
 #~ msgid "Auto Start"
 #~ msgstr "Samodejni zagon"
 
diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po
index 2ccf6d9..02f97ad 100644
--- 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-13 13:21+0200\n"
-"PO-Revision-Date: 2016-06-13 13:21+0200\n"
+"POT-Creation-Date: 2016-06-14 09:58+0200\n"
+"PO-Revision-Date: 2016-06-14 09:58+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"
@@ -22,8 +22,12 @@ msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
 #: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 #, fuzzy
@@ -51,17 +55,17 @@ msgstr ""
 msgid "▾ Search Options"
 msgstr ""
 
-#: zrcolafrm.cpp:111
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 msgid "Warning"
 msgstr ""
 
-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -541,18 +545,396 @@ msgstr ""
 msgid "About ZRCola"
 msgstr ""
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Debug.Control-2.idtx:14
+#: MSIBuild/En.x64.Debug.Control-2.idtx:19
+#: MSIBuild/En.x64.Debug.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+msgid "&Continue"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Debug.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Debug.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Debug.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr ""
+
 # Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Debug.Control-2.idtx:3
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 #, fuzzy
 msgid "1252"
 msgstr "1251"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Debug.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+msgid "bintutorial1.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Debug.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+msgid "bintutorial2.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Debug.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+msgid "bintutorial3.bmp"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Debug.Control-2.idtx:10
+#: MSIBuild/En.x64.Debug.Control-2.idtx:15
+#: MSIBuild/En.x64.Debug.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+#, fuzzy
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Debug.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Debug.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
 msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Debug.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Debug.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+
+#~ msgid "Auto Start"
+#~ msgstr "Samodejni zagon"
+
+#~ msgid "Select %s language for decomposition"
+#~ msgstr "Izberi jezik %s za razstavljanje"
+
+#~ msgid "&Start on Logon"
+#~ msgstr "Z&aženi ob prijavi"
+
+#~ msgid "Start this program automatically on logon"
+#~ msgstr "Samodejno zaženi ta program ob prijavi"
+
+#~ msgid "Set language according to keyboard layout automatically"
+#~ msgstr "Samodejno nastavi jezik glede na izbrano tipkovnico"
+
+#~ msgid "&Unicode"
+#~ msgstr "&Unicode"
+
+#~ msgid "Esc"
+#~ msgstr "Esc"
+
+#~ msgid "F1"
+#~ msgstr "F1"
+
+#~ msgid "F2"
+#~ msgstr "F2"
+
+#~ msgid "F3"
+#~ msgstr "F3"
+
+#~ msgid "F4"
+#~ msgstr "F4"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#~ msgid "F6"
+#~ msgstr "F6"
+
+#~ msgid "F7"
+#~ msgstr "F7"
+
+#~ msgid "F8"
+#~ msgstr "F8"
+
+#~ msgid "F9"
+#~ msgstr "F9"
+
+#~ msgid "F10"
+#~ msgstr "F10"
+
+#~ msgid "F11"
+#~ msgstr "F11"
+
+#~ msgid "F12"
+#~ msgstr "F12"
+
+#~ msgid "Print Screen"
+#~ msgstr "Print Screen"
+
+#~ msgid "Scroll Lock"
+#~ msgstr "Scroll Lock"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Backspace"
+#~ msgstr "Backspace"
+
+#~ msgid "Tab"
+#~ msgstr "Tab"
+
+#~ msgid "Caps Lock"
+#~ msgstr "Caps Lock"
+
+#~ msgid "Return"
+#~ msgstr "Return"
+
+#~ msgid "Space"
+#~ msgstr "preslednica"
+
+#~ msgid "Shift"
+#~ msgstr "Shift"
+
+#, fuzzy
+#~ msgid "Alt"
+#~ msgstr "Alt"
+
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Insert"
+#~ msgstr "Insert"
+
+#~ msgid "Delete"
+#~ msgstr "Delete"
+
+#~ msgid "Page Up"
+#~ msgstr "Page Up"
+
+#~ msgid "Page Down"
+#~ msgstr "Page Down"
+
+#~ msgid "Home"
+#~ msgstr "Home"
+
+#~ msgid "End"
+#~ msgstr "End"
+
+#~ msgid "Left"
+#~ msgstr "Left"
+
+#~ msgid "Up"
+#~ msgstr "Up"
+
+#~ msgid "Right"
+#~ msgstr "Right"
+
+#~ msgid "Down"
+#~ msgstr "Down"
+
+#~ msgid "Num Lock"
+#~ msgstr "Num Lock"
+
+#~ msgid "`"
+#~ msgstr "`"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "["
+#~ msgstr "["
+
+#~ msgid "]"
+#~ msgstr "]"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "'"
+#~ msgstr "'"
+
+#~ msgid "\\"
+#~ msgstr "\\"
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid "/"
+#~ msgstr "/"
+
+#~ msgid "INS"
+#~ msgstr "INS"
+
+#, fuzzy
+#~ msgid "Character &Groups"
+#~ msgstr "Skupine &znakov"
+
+#~ msgid "Language:"
+#~ msgstr "Jezik:"
+
+#~ msgid "&About"
+#~ msgstr "O progr&amu"
+
+#~ msgid "Cuts selected text and puts it on the clipboard"
+#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#~ msgid "Copies selected text to the clipboard"
+#~ msgstr "Kopira izbrano besedilo na odložišče"
+
+#~ msgid "Inserts text from the clipboard"
+#~ msgstr "Vstavi besedilo z odložišča"
+
+#, fuzzy
+#~ msgid "&Copy"
+#~ msgstr "&Kopiraj"
+
+#, fuzzy
+#~ msgid "&Paste"
+#~ msgstr "&Prilepi"
+
+#~ msgid "&File"
+#~ msgstr "&Datoteka"
+
+#, fuzzy
+#~ msgid "Send Decomposed (F6)"
+#~ msgstr "Pošlji razstavljeno (F6)"
+
+#, fuzzy
+#~ msgid "Send Composed (F5)"
+#~ msgstr "Pošlji sestavljeno (F5)"
+
+#~ msgid ""
+#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
+#~ "functionality will not be available."
+#~ msgstr ""
+#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
+#~ "Nekaj funkcionalnosti ne bo na voljo."
+
+#, fuzzy
+#~ msgid "Authentication progress real time monitor"
+#~ msgstr "Nadzira postopek overovljanja v realnem času"
+
+#~ msgid "Grave\t&7"
+#~ msgstr "Krativec\t&7"
+
+#~ msgid "Acute\t&9"
+#~ msgstr "Ostrivec\t&9"
+
+#~ msgid "Circumflex\t&3"
+#~ msgstr "Cirkumfleks\t&3"
+
+#~ msgid "Inverted &breve"
+#~ msgstr "O&brnjen polkrog"
+
+#~ msgid "&Accents"
+#~ msgstr "N&aglasi"
+
+#~ msgid ""
+#~ "There is already an auto hidden bar on this edge.\n"
+#~ "Only one auto hidden bar is allowed on each edge.\n"
+#~ "Auto-hide feature is now off."
+#~ msgstr ""
+#~ "Ob tem robu je že samodejno skrita pasica.\n"
+#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n"
+#~ "Samodejno skrivanje je zdaj izklopljeno."
+
+#~ msgid "Hello World"
+#~ msgstr "Zdravo svet"
+
+#~ msgid "&Hello...\tCtrl+H"
+#~ msgstr "&Pozdrav ...\tCtrl+H"
+
+#~ msgid "Help string shown in status bar for this menu item"
+#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija"
+
+#~ msgid "This is a wxWidgets' Hello world sample"
+#~ msgstr "To je primer Zdravo svet v wxWidgets"
+
+#~ msgid "About Hello World"
+#~ msgstr "O Zdravo svet"
+
+#~ msgid "Hello world from wxWidgets!"
+#~ msgstr "Zdravo svet iz wxWidgets!"
+
+#~ msgid "Welcome to wxWidgets!"
+#~ msgstr "Dobrodošli v wxWidgets!"
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index e079cf0..3b21b27 100644
--- 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-13 13:20+0200\n"
-"PO-Revision-Date: 2016-06-13 13:20+0200\n"
+"POT-Creation-Date: 2016-06-14 09:58+0200\n"
+"PO-Revision-Date: 2016-06-14 09:58+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"
@@ -22,8 +22,12 @@ msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
 #: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola"
@@ -49,7 +53,7 @@ msgstr "▸ Možnosti iskanja"
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:111
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
@@ -57,11 +61,11 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -560,21 +564,154 @@ msgstr "Nastavitve"
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
+#: MSIBuild/En.Win32.Release.Control-2.idtx:14
+#: MSIBuild/En.Win32.Release.Control-2.idtx:19
+#: MSIBuild/En.Win32.Release.Control-2.idtx:9
+#: MSIBuild/En.x64.Debug.Control-2.idtx:14
+#: MSIBuild/En.x64.Debug.Control-2.idtx:19
+#: MSIBuild/En.x64.Debug.Control-2.idtx:9
+#: MSIBuild/En.x64.Release.Control-2.idtx:14
+#: MSIBuild/En.x64.Release.Control-2.idtx:19
+#: MSIBuild/En.x64.Release.Control-2.idtx:9
+msgid "&Continue"
+msgstr "&Nadaljuj"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
+#: MSIBuild/En.Win32.Release.Control-2.idtx:11
+#: MSIBuild/En.x64.Debug.Control-2.idtx:11
+#: MSIBuild/En.x64.Release.Control-2.idtx:11
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
+#: MSIBuild/En.Win32.Release.Control-2.idtx:16
+#: MSIBuild/En.x64.Debug.Control-2.idtx:16
+#: MSIBuild/En.x64.Release.Control-2.idtx:16
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
+#: MSIBuild/En.Win32.Release.Control-2.idtx:5
+#: MSIBuild/En.x64.Debug.Control-2.idtx:5
+#: MSIBuild/En.x64.Release.Control-2.idtx:5
+msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
+msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
+
 # Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.Win32.Release.Control-2.idtx:3
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Debug.Control-2.idtx:3
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Control-2.idtx:3
 #: MSIBuild/En.x64.Release.Feature-2.idtx:3
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
 msgid "1252"
 msgstr "1250"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
+#: MSIBuild/En.Win32.Release.Control-2.idtx:6
+#: MSIBuild/En.x64.Debug.Control-2.idtx:6
+#: MSIBuild/En.x64.Release.Control-2.idtx:6
+msgid "bintutorial1.bmp"
+msgstr "bintutorial1.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
+#: MSIBuild/En.Win32.Release.Control-2.idtx:12
+#: MSIBuild/En.x64.Debug.Control-2.idtx:12
+#: MSIBuild/En.x64.Release.Control-2.idtx:12
+msgid "bintutorial2.bmp"
+msgstr "bintutorial2.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
+#: MSIBuild/En.Win32.Release.Control-2.idtx:17
+#: MSIBuild/En.x64.Debug.Control-2.idtx:17
+#: MSIBuild/En.x64.Release.Control-2.idtx:17
+msgid "bintutorial3.bmp"
+msgstr "bintutorial3.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
+#: MSIBuild/En.Win32.Release.Control-2.idtx:10
+#: MSIBuild/En.Win32.Release.Control-2.idtx:15
+#: MSIBuild/En.Win32.Release.Control-2.idtx:4
+#: MSIBuild/En.x64.Debug.Control-2.idtx:10
+#: MSIBuild/En.x64.Debug.Control-2.idtx:15
+#: MSIBuild/En.x64.Debug.Control-2.idtx:4
+#: MSIBuild/En.x64.Release.Control-2.idtx:10
+#: MSIBuild/En.x64.Release.Control-2.idtx:15
+#: MSIBuild/En.x64.Release.Control-2.idtx:4
+msgid "binUIHeader.bmp"
+msgstr "binUIHeader.bmp"
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
+#: MSIBuild/En.Win32.Release.Control-2.idtx:18
+#: MSIBuild/En.x64.Debug.Control-2.idtx:18
+#: MSIBuild/En.x64.Release.Control-2.idtx:18
+msgid ""
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
+msgstr ""
+"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
+"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
+#: MSIBuild/En.Win32.Release.Control-2.idtx:8
+#: MSIBuild/En.x64.Debug.Control-2.idtx:8
+#: MSIBuild/En.x64.Release.Control-2.idtx:8
+msgid ""
+"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
+"location of the cursor in the text. If ZRCola is brought to the foreground "
+"without using the aforementioned combination of keys, the program won't know "
+"where to insert the special characters!"
+msgstr ""
+"POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v "
+"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
+"vedel, kam vstaviti želene znake!"
+
+#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
 
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
+#: MSIBuild/En.Win32.Release.Control-2.idtx:13
+#: MSIBuild/En.x64.Debug.Control-2.idtx:13
+#: MSIBuild/En.x64.Release.Control-2.idtx:13
+msgid ""
+"The string of basic and substitute characters is entered into the upper "
+"input window of the program. In the window below the resulted special "
+"characters are displayed. To insert them in the text, the F5 key is used."
+msgstr ""
+"Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v "
+"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
+"vnesemo s pritiskom na tipko F5."
+
+#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
+#: MSIBuild/En.Win32.Release.Control-2.idtx:7
+#: MSIBuild/En.x64.Debug.Control-2.idtx:7
+#: MSIBuild/En.x64.Release.Control-2.idtx:7
+msgid ""
+"When configured, ZRCola starts at system startup and runs in the background. "
+"If needed, it can be brought up by pressing the combination Win+F5."
+msgstr ""
+"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
+"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
+
 #~ msgid "Auto Start"
 #~ msgstr "Samodejni zagon"