Compare commits

...

21 Commits

Author SHA1 Message Date
Simon Rozman
040109c36f Version set to 2.0-beta5 2016-06-14 10:15:43 +02:00
Simon Rozman
d130888753 End-of-setup tutorial added 2016-06-14 10:14:45 +02:00
Simon Rozman
e81b0f772d Translation update 2016-06-14 10:02:21 +02:00
Simon Rozman
750cab5370 Add/Remove Programs icon reverted back to ZRCola's 2016-06-14 09:19:03 +02:00
Simon Rozman
213425fd11 Global hot-key registration moved as late as possible to avoid non-effective registration at auto start-up 2016-06-13 15:38:19 +02:00
Simon Rozman
689c72e7e7 Composing ə (and some other characters) combinations fixed 2016-06-13 15:35:52 +02:00
Simon Rozman
fbd60a53dc Categories are collapsible in Character Search dialog now 2016-06-13 13:25:05 +02:00
Simon Rozman
e3475ef48d Font and database update - fonts now OpenType 2016-06-13 11:02:55 +02:00
Simon Rozman
86d512e752 Empty character groups and categories are included in translation catalog too now 2016-06-13 10:57:00 +02:00
Simon Rozman
665b6c3564 Version set to 2.0-beta4 2016-06-02 21:24:13 +02:00
Simon Rozman
173d9c77af ZRCola keyboard PDF update 2016-06-02 21:23:21 +02:00
Simon Rozman
a6088c3028 Additional check for inactive/disabled characters in Character Catalog added 2016-06-02 21:06:36 +02:00
Simon Rozman
ff0354474e Character Selector >> Find Character 2016-06-02 20:54:52 +02:00
Simon Rozman
33f0cbea0d About dialog text change 2016-06-02 20:41:18 +02:00
Simon Rozman
c39aa9f97e Manual check for updates modified to use foreground thread: works always, but blocks UI while downloading 2016-06-02 20:33:49 +02:00
Simon Rozman
45530b23f3 WX_INSTALL_PATH >> WXWIN 2016-06-02 15:10:22 +02:00
Simon Rozman
cb17f06927 ZRCola keyboard shortcuts PDF and link to Instructions website added 2016-06-01 19:16:25 +02:00
Simon Rozman
ac3b44de2b Sub-module update 2016-06-01 17:52:57 +02:00
Simon Rozman
c839d5f50d Version set to 2.0-beta3 2016-05-31 14:55:43 +02:00
Simon Rozman
22be76bec5 New character request is now dialog based
(closes #13)
2016-05-31 14:54:15 +02:00
Simon Rozman
e5b246a4f0 Character search ranking and display is more sophisticated now 2016-05-31 11:50:12 +02:00
65 changed files with 4233 additions and 903 deletions

3
.gitmodules vendored
View File

@@ -16,6 +16,9 @@
[submodule "lib/MSICALib"]
path = lib/MSICALib
url = https://github.com/Amebis/MSICALib.git
[submodule "lib/WinStd"]
path = lib/WinStd
url = https://github.com/Amebis/WinStd.git
[submodule "Updater"]
path = Updater
url = https://github.com/Amebis/Updater.git

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@@ -60,10 +60,11 @@ compLocalizationRepositoryPath {0E96110A-C38D-4600-9AE2-B8B59AF53A00} ZRCOLALOCD
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
comp00_ZRCola_Re.ttf {B6CE8B39-11DC-4B59-B10C-3F0FFE8F81AF} FontsFolder 0 file00_ZRCola_Re.ttf
comp00_ZRCola_It.ttf {10613965-2874-470D-9D5A-B7D535AA3317} FontsFolder 0 file00_ZRCola_It.ttf
comp00_ZRCola_Bd.ttf {C036BE8D-6D2F-4DBF-99D6-F53702EAEBB6} FontsFolder 0 file00_ZRCola_Bd.ttf
comp00_ZRCola_BI.ttf {883DDA9A-DA85-4FC4-95B7-EF0E08766DEF} FontsFolder 0 file00_ZRCola_BI.ttf
compZRCola_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
!IF "$(LANG)" == "Sl"
compZRCola.zrcdb.mo.sl_SI {6572EAD1-EE48-46A1-A28E-77985B667F67} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb.mo.sl_SI
!ENDIF
@@ -242,6 +243,8 @@ s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_
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
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
"De.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\de_DE.po"
@@ -268,10 +271,11 @@ All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt"
Feature_ Component_
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID)
FeatureComponents Feature_ Component_
featZRColaFonts00 comp00_ZRCola_Re.ttf
featZRColaFonts00 comp00_ZRCola_It.ttf
featZRColaFonts00 comp00_ZRCola_Bd.ttf
featZRColaFonts00 comp00_ZRCola_BI.ttf
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
<<NOKEEP
@@ -290,10 +294,11 @@ File File
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
file00_ZRCola_Re.ttf comp00_ZRCola_Re.ttf 00_ZRC~1.TTF|00_ZRCola_Re.ttf 0 0 1
file00_ZRCola_It.ttf comp00_ZRCola_It.ttf 00_ZRC~2.TTF|00_ZRCola_It.ttf 0 0 1
file00_ZRCola_Bd.ttf comp00_ZRCola_Bd.ttf 00_ZRC~3.TTF|00_ZRCola_Bd.ttf 0 0 1
file00_ZRCola_BI.ttf comp00_ZRCola_BI.ttf 00_ZRC~4.TTF|00_ZRCola_BI.ttf 0 0 1
fileZRCola_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
!IF "$(LANG)" == "Sl"
fileZRCola.zrcdb.mo.sl_SI compZRCola.zrcdb.mo.sl_SI ZRCOLA~1.MO|ZRCola-zrcdb.mo 0 1060 0 1
!ENDIF
@@ -311,13 +316,33 @@ All :: "$(LANG).$(PLAT).$(CFG).Font-1.idt"
File_ FontTitle
s$(MSIBUILD_LENGTH_ID) S255
Font File_
file00_ZRCola_Re.ttf
file00_ZRCola_It.ttf
file00_ZRCola_Bd.ttf
file00_ZRCola_BI.ttf
file00_ZRCola_Re.otf
file00_ZRCola_It.otf
file00_ZRCola_Bd.otf
file00_ZRCola_BI.otf
<<NOKEEP
######################################################################
# Icon
All :: \
"$(LANG).$(PLAT).$(CFG).Icon-1.idt" \
"$(LANG).$(PLAT).$(CFG).Icon-1\PDF.ico"
"$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1"
-if exist $@ del /f /q $@
move /y << $@ > NUL
Name Data
s$(MSIBUILD_LENGTH_ID) v0
Icon Name
iconPDF.ico PDF.ico
<<NOKEEP
"$(LANG).$(PLAT).$(CFG).Icon-1\PDF.ico" : "Icon\PDF.ico"
copy /y $** $@ > NUL
######################################################################
# InstallExecuteSequence
@@ -425,6 +450,48 @@ regLanguage 2 SOFTWARE\Amebis\ZRCola Language #60 compLanguage
rcxgettext.exe idtp $@ $**
######################################################################
# RemoveFile
All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt"
"$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@
move /y << $@ > NUL
FileKey Component_ FileName DirProperty InstallMode
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) L255 s$(MSIBUILD_LENGTH_ID) i2
RemoveFile FileKey
rmfiZRCola_keyboard compZRCola_keyboard.pdf ZRColaShortcutDir 2
<<NOKEEP
######################################################################
# Shortcut
All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt"
"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@
move /y << $@ > NUL
Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l128 s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) S255 L255 I2 S$(MSIBUILD_LENGTH_ID) I2 I2 S$(MSIBUILD_LENGTH_ID)
1252 Shortcut Shortcut
shctZRCola_keyboard ZRColaShortcutDir ZRCOLA~1|ZRCola Keyboard Shortcuts compZRCola_keyboard.pdf featZRCola_keyboard ZRCola Keyboard Shortcuts iconPDF.ico ZRCOLADATADIR
<<NOKEEP
"De.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\de_DE.po"
rcxgettext.exe idtp $@ $**
"En.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx"
copy /y $** $@ > NUL
"It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
rcxgettext.exe idtp $@ $**
"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
rcxgettext.exe idtp $@ $**
######################################################################
# Build MSM module!
######################################################################

View File

@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-31 10:09+0200\n"
"POT-Creation-Date: 2016-06-14 09:22+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"
@@ -14,7 +14,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __\n"
"X-Poedit-Basepath: ../Main\n"
"X-Generator: Poedit 1.8.7\n"
"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
@@ -787,10 +787,10 @@ msgstr ""
msgid "00 ZRCola"
msgstr "00 ZRCola"
#: 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.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.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.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.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
#, fuzzy
msgid "1252"
msgstr "1250"
@@ -800,6 +800,11 @@ msgstr "1250"
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
#, 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
#, fuzzy
msgid "Fonts"
@@ -815,9 +820,20 @@ msgstr "Pisave, ki jih uporablja ZRCola"
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
#, 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
#, fuzzy
msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website."
msgstr ""
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
#, 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
#, fuzzy
@@ -829,7 +845,22 @@ msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v
msgid "Times New Roman based font"
msgstr "Pisava na osnovi Times New Roman"
#: En.Win32.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
#, 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
#, 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
#, 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
#, fuzzy
msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici"

View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-31 10:10+0200\n"
"POT-Creation-Date: 2016-06-14 09:23+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"
@@ -13,7 +13,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __\n"
"X-Poedit-Basepath: .\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
# wxLanguage enum value for this language (decimal, # prefixed)
@@ -1521,10 +1521,10 @@ msgid "00 ZRCola"
msgstr "00 ZRCola"
# 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.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.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.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.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
msgid "1252"
msgstr "1252"
@@ -1532,6 +1532,11 @@ msgstr "1252"
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
#, 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
#, fuzzy
msgid "Fonts"
@@ -1545,10 +1550,18 @@ msgstr ""
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
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
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
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
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 ""
@@ -1557,6 +1570,18 @@ msgstr ""
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
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
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
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
msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
msgstr ""

View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-31 10:09+0200\n"
"POT-Creation-Date: 2016-06-14 09:23+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"
@@ -13,7 +13,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __\n"
"X-Poedit-Basepath: .\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\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"
# wxLanguage enum value for this language (decimal, # prefixed)
@@ -1521,10 +1521,10 @@ msgid "00 ZRCola"
msgstr "00 ZRCola"
# 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.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.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.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.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
msgid "1252"
msgstr "1251"
@@ -1532,6 +1532,10 @@ msgstr "1251"
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
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
msgid "Fonts"
msgstr ""
@@ -1544,10 +1548,18 @@ msgstr ""
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
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
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
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
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 ""
@@ -1556,6 +1568,18 @@ msgstr ""
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
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
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
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
msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
msgstr ""

View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-31 10:09+0200\n"
"POT-Creation-Date: 2016-06-14 09:23+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"
@@ -13,7 +13,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __\n"
"X-Poedit-Basepath: .\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"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)
@@ -1525,10 +1525,10 @@ msgid "00 ZRCola"
msgstr "00 ZRCola"
# 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.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.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.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.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
msgid "1252"
msgstr "1250"
@@ -1536,6 +1536,10 @@ msgstr "1250"
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
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
msgid "Fonts"
msgstr "Pisave"
@@ -1548,10 +1552,18 @@ msgstr "Pisave, ki jih uporablja ZRCola"
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
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
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
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
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:"
@@ -1560,10 +1572,22 @@ msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v
msgid "Times New Roman based font"
msgstr "Pisava na osnovi Times New Roman"
#: En.Win32.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
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
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
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
msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts"
msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici"
#, fuzzy
#~ msgid "Determining required space for installation..."
#~ msgstr "Ugotavljanje potrebnega prostora za namestitev ..."

View File

@@ -158,24 +158,24 @@ UnregisterSettings ::
!ENDIF
InstallFonts :: \
"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" \
"$(WINDIR)\Fonts\00_ZRCola_It.ttf" \
"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" \
"$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)" /t REG_SZ /d "00_ZRCola_Re.ttf" $(REG_FLAGS) > NUL
reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)" /t REG_SZ /d "00_ZRCola_It.ttf" $(REG_FLAGS) > NUL
reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)" /t REG_SZ /d "00_ZRCola_Bd.ttf" $(REG_FLAGS) > NUL
reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" /t REG_SZ /d "00_ZRCola_BI.ttf" $(REG_FLAGS) > NUL
"$(WINDIR)\Fonts\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
UninstallFonts::
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)" $(REG_FLAGS) > NUL
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)" $(REG_FLAGS) > NUL
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)" $(REG_FLAGS) > NUL
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
-if exist "$(WINDIR)\Fonts\00_ZRCola_Re.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.ttf"
-if exist "$(WINDIR)\Fonts\00_ZRCola_It.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.ttf"
-if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf"
-if exist "$(WINDIR)\Fonts\00_ZRCola_BI.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
-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"
RegisterShortcuts :: \
"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
@@ -251,16 +251,16 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
copy /y $** $@ > NUL
"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Re.ttf"
"$(WINDIR)\Fonts\00_ZRCola_Re.otf" : "$(OUTPUT_DIR)\00_ZRCola_Re.otf"
copy /y $** $@ > NUL
"$(WINDIR)\Fonts\00_ZRCola_It.ttf" : "$(OUTPUT_DIR)\00_ZRCola_It.ttf"
"$(WINDIR)\Fonts\00_ZRCola_It.otf" : "$(OUTPUT_DIR)\00_ZRCola_It.otf"
copy /y $** $@ > NUL
"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.ttf"
"$(WINDIR)\Fonts\00_ZRCola_Bd.otf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.otf"
copy /y $** $@ > NUL
"$(WINDIR)\Fonts\00_ZRCola_BI.ttf" : "$(OUTPUT_DIR)\00_ZRCola_BI.ttf"
"$(WINDIR)\Fonts\00_ZRCola_BI.otf" : "$(OUTPUT_DIR)\00_ZRCola_BI.otf"
copy /y $** $@ > NUL
"$(PUBLISH_DIR)\ZRColaInstallDe.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallDe.exe"

Submodule Updater updated: 54846632f3...55548e1059

View File

@@ -20,6 +20,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\st
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -76,6 +78,14 @@ Global
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.Build.0 = Release|Win32
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.ActiveCfg = Release|x64
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.Build.0 = Release|x64
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -86,5 +96,6 @@ Global
{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
{518777CC-0A59-4415-A12A-82751ED75343} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
{990D8CF9-4457-4DC0-AA18-4968EF434741} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
EndGlobalSection
EndGlobal

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -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
@@ -127,7 +250,7 @@ featZRCola compLocalizationRepositoryPath
featZRCola compLanguage
featZRCola compDatabasePath
featZRCola compZRCola.zrcdb
featZRCola comp00_ZRCola_Re.ttf
featZRCola comp00_ZRCola_Re.otf
!IF "$(LANG)" == "Sl"
featZRCola compZRCola.mo.sl_SI
featZRCola compZRCola.zrcdb.mo.sl_SI

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />

View File

@@ -84,6 +84,7 @@
<ClCompile Include="zrcolaapp.cpp" />
<ClCompile Include="zrcolachrcatpnl.cpp" />
<ClCompile Include="zrcolachrgrid.cpp" />
<ClCompile Include="zrcolachrreq.cpp" />
<ClCompile Include="zrcolachrslct.cpp" />
<ClCompile Include="zrcolacomppnl.cpp" />
<ClCompile Include="zrcolafrm.cpp" />
@@ -98,6 +99,7 @@
<ClInclude Include="zrcolaapp.h" />
<ClInclude Include="zrcolachrcatpnl.h" />
<ClInclude Include="zrcolachrgrid.h" />
<ClInclude Include="zrcolachrreq.h" />
<ClInclude Include="zrcolachrslct.h" />
<ClInclude Include="zrcolacomppnl.h" />
<ClInclude Include="zrcolafrm.h" />

View File

@@ -55,6 +55,9 @@
<ClCompile Include="zrcolaupdater.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="zrcolachrreq.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
@@ -93,6 +96,9 @@
<ClInclude Include="zrcolaupdater.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="zrcolachrreq.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\zrcola.ico">

View File

@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-31 08:45+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"
@@ -10,7 +10,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"X-Poedit-Basepath: ..\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
@@ -23,16 +23,45 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU"
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
#: 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
msgid "ZRCola"
msgstr "ZRCola"
#: zrcolafrm.cpp:104
#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
#, fuzzy
msgid "Character"
msgstr "Znak"
#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
#, fuzzy
msgid "Context"
msgstr "Kontekst"
#: zrcolachrreq.cpp:64 zrcolagui.h:360
#, fuzzy
msgid "Request a New Character"
msgstr "Zahtevaj nov znak"
#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
#, fuzzy
msgid "▸ Search Options"
msgstr "▸ Možnosti iskanja"
#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
#, fuzzy
msgid "▾ Search Options"
msgstr "▾ Možnosti iskanja"
#: zrcolafrm.cpp:141
#, fuzzy
msgid ""
"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
@@ -41,12 +70,12 @@ msgstr ""
"ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
"funkcionalnosti ne bo na voljo."
#: zrcolafrm.cpp:104 zrcolafrm.cpp:106
#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
#, fuzzy
msgid "Warning"
msgstr "Opozorilo"
#: zrcolafrm.cpp:106
#: zrcolafrm.cpp:143
#, fuzzy
msgid ""
"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
@@ -55,10 +84,19 @@ msgstr ""
"ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj "
"funkcionalnosti ne bo na voljo."
#: zrcolafrm.cpp:341
#: zrcolafrm.cpp:351
#, fuzzy
msgid "http://zrcola-2.amebis.si/en/contact/"
msgstr "http://zrcola-2.amebis.si/contact/"
msgid "http://zrcola-2.amebis.si/en/info/instructions/"
msgstr "http://zrcola-2.amebis.si/info/instructions/"
#: zrcolafrm.cpp:375
#, fuzzy
msgid ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
msgstr ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
#: zrcolagui.cpp:36
#, fuzzy
@@ -87,20 +125,20 @@ msgstr "Izberi celotno besedilo"
#: zrcolagui.cpp:78
#, fuzzy
msgid "C&haracter Selector..."
msgstr "Izbirnik &znaka ..."
msgid "Find C&haracter..."
msgstr "Poišči &znak ..."
#: zrcolagui.cpp:78 zrcolagui.cpp:170
#: zrcolagui.cpp:78 zrcolagui.cpp:180
#, fuzzy
msgid "Display character selector to select character to insert into text"
msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
msgid "Display character search to select character to insert into text"
msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"
#: zrcolagui.cpp:89
#, fuzzy
msgid "&Send Composed"
msgstr "Pošlji &sestavljeno"
#: zrcolagui.cpp:89 zrcolagui.cpp:172
#: zrcolagui.cpp:89 zrcolagui.cpp:182
#, fuzzy
msgid "Send composed text to source window"
msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@@ -110,7 +148,7 @@ msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
msgid "Send &Decomposed"
msgstr "Pošlji &razstavljeno"
#: zrcolagui.cpp:98 zrcolagui.cpp:174
#: zrcolagui.cpp:98 zrcolagui.cpp:184
#, fuzzy
msgid "Send decomposed text to source window"
msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@@ -177,120 +215,140 @@ msgstr "Po&gled"
#: zrcolagui.cpp:142
#, fuzzy
msgid "&Instructions..."
msgstr "Navod&ila ..."
#: zrcolagui.cpp:142
#, fuzzy
msgid "Open a web site with product instructions"
msgstr "Odpri spletno stran z navodili izdelka"
#: zrcolagui.cpp:146
#, fuzzy
msgid "Keyboard &Shortcuts..."
msgstr "&Bližnjice na tipkovnici ..."
#: zrcolagui.cpp:146
#, fuzzy
msgid "Open a list of keyboard shortcuts"
msgstr "Odpri seznam bližnjic na tipkovnici"
#: zrcolagui.cpp:152
#, fuzzy
msgid "&Request a new character..."
msgstr "&Zahtevaj nov znak ..."
#: zrcolagui.cpp:142
#: zrcolagui.cpp:152
#, fuzzy
msgid "Submit a request to ZRC to add a new character"
msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka"
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
#, fuzzy
msgid "Check for &Updates..."
msgstr "Preveri za &posodobitev ..."
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
#, fuzzy
msgid "Check online for product update"
msgstr "Preveri na spletu za posodobitev izdelka"
#: zrcolagui.cpp:155
#: zrcolagui.cpp:165
#, fuzzy
msgid "&Help"
msgstr "Po&moč"
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
#, fuzzy
msgid "Cut"
msgstr "Izreži"
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
#, fuzzy
msgid "Cut selection"
msgstr "Izreži izbor"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
#, fuzzy
msgid "Copy"
msgstr "&Kopiraj"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
#, fuzzy
msgid "Copy selection"
msgstr "Kopiraj izbor"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
#, fuzzy
msgid "Paste"
msgstr "Prilepi"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
#, fuzzy
msgid "Paste selection"
msgstr "Prilepi izbor"
#: zrcolagui.cpp:167
#: zrcolagui.cpp:177
#, fuzzy
msgid "Edit"
msgstr "Urejanje"
#: zrcolagui.cpp:170 zrcolagui.h:238
#: zrcolagui.cpp:180
#, fuzzy
msgid "Character Selector"
msgstr "Izbirnik znaka"
msgid "Find Character"
msgstr "Poišči znak"
#: zrcolagui.cpp:172
#: zrcolagui.cpp:182
#, fuzzy
msgid "Send Composed"
msgstr "Pošlji sestavljeno"
#: zrcolagui.cpp:174
#: zrcolagui.cpp:184
#, fuzzy
msgid "Send Decomposed"
msgstr "Pošlji razstavljeno"
#: zrcolagui.cpp:177
#: zrcolagui.cpp:187
#, fuzzy
msgid "Compose"
msgstr "Sestavljanje"
#: zrcolagui.cpp:181
#: zrcolagui.cpp:191
#, fuzzy
msgid "Character Catalog"
msgstr "Katalog znakov"
#: zrcolagui.cpp:185
#: zrcolagui.cpp:195
#, fuzzy
msgid "(De)Composer"
msgstr "Raz/Sestavljalnik"
#: zrcolagui.cpp:224
#: zrcolagui.cpp:234
#, fuzzy
msgid "Decomposed Text"
msgstr "Razstavljeno besedilo"
#: zrcolagui.cpp:244
#: zrcolagui.cpp:254
#, fuzzy
msgid "Decomposed Unicode Dump"
msgstr "Unicode razstavljenega"
#: zrcolagui.cpp:271
#: zrcolagui.cpp:281
#, fuzzy
msgid "Composed Text"
msgstr "Sestavljeno besedilo"
#: zrcolagui.cpp:291
#: zrcolagui.cpp:301
#, fuzzy
msgid "Composed Unicode Dump"
msgstr "Unicode sestavljenega"
#: zrcolagui.cpp:411
#: zrcolagui.cpp:421
#, fuzzy
msgid "&Browse"
msgstr "Pre&brskaj"
#: zrcolagui.cpp:418
#: zrcolagui.cpp:428
#, fuzzy
msgid ""
"Full or partial terms from Unicode character description (in English) to "
@@ -298,122 +356,132 @@ msgid ""
msgstr ""
"Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
#: zrcolagui.cpp:424
#: zrcolagui.cpp:432
#, fuzzy
msgid "Search Options"
msgstr "Možnosti iskanja"
#: zrcolagui.cpp:433
#, fuzzy
msgid "Shows/hides additional search options"
msgstr "Prikaže/skrije dodatne možnosti iskanja"
#: zrcolagui.cpp:445
#, fuzzy
msgid "List of Unicode character categories to search in"
msgstr "Seznam kategorij znaka Unicode za iskanje"
#: zrcolagui.cpp:431
#: zrcolagui.cpp:452
#, fuzzy
msgid "All"
msgstr "Vse"
#: zrcolagui.cpp:432
#: zrcolagui.cpp:453
#, fuzzy
msgid "Select all categories"
msgstr "Izberi vse kategorije"
#: zrcolagui.cpp:436
#: zrcolagui.cpp:457
#, fuzzy
msgid "None"
msgstr "Nič"
#: zrcolagui.cpp:437
#: zrcolagui.cpp:458
#, fuzzy
msgid "Clear category selection"
msgstr "Počisti izbor kategorij"
#: zrcolagui.cpp:441
#: zrcolagui.cpp:462
#, fuzzy
msgid "Invert"
msgstr "Obrni"
#: zrcolagui.cpp:442
#: zrcolagui.cpp:463
#, fuzzy
msgid "Invert category selection"
msgstr "Obrni izbor kategorij"
#: zrcolagui.cpp:475
#: zrcolagui.cpp:502
#, fuzzy
msgid "Character search results"
msgstr "Rezultati iskanja znakov"
#: zrcolagui.cpp:485
#: zrcolagui.cpp:512
#, fuzzy
msgid "Re&cently Used"
msgstr "Nedavno &uporabljeni"
#: zrcolagui.cpp:513
#: zrcolagui.cpp:540
#, fuzzy
msgid "List of recently inserted characters"
msgstr "Seznam nedavno vstavljenih znakov"
#: zrcolagui.cpp:527
#: zrcolagui.cpp:554
#, fuzzy
msgid "Preview"
msgstr "Predogled:"
#: zrcolagui.cpp:532
#: zrcolagui.cpp:559
#, fuzzy
msgid "U+"
msgstr "U+"
#: zrcolagui.cpp:537
#: zrcolagui.cpp:564
#, fuzzy
msgid "Unicode hexadecimal code"
msgstr "Šestnajstiška koda Unicode"
#: zrcolagui.cpp:542
#: zrcolagui.cpp:569
#, fuzzy
msgid "Keyboard shortcut in Composer window"
msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
#: zrcolagui.cpp:577
#: zrcolagui.cpp:604
#, fuzzy
msgid "Character preview"
msgstr "Predogled znaka"
#: zrcolagui.cpp:582
#: zrcolagui.cpp:609
#, fuzzy
msgid "Unicode character description"
msgstr "Opis znaka Unicode"
#: zrcolagui.cpp:587
#: zrcolagui.cpp:614
#, fuzzy
msgid "Unicode character category"
msgstr "Kategorija znaka Unicode"
#: zrcolagui.cpp:594
#: zrcolagui.cpp:621
#, fuzzy
msgid "« Back"
msgstr "< &Nazaj"
#: zrcolagui.cpp:596
#: zrcolagui.cpp:623
#, fuzzy
msgid "To previously viewed character"
msgstr "Na prejšnji prikazan znak"
#: zrcolagui.cpp:600
#: zrcolagui.cpp:627
#, fuzzy
msgid "Forward »"
msgstr "Naprej »"
#: zrcolagui.cpp:602
#: zrcolagui.cpp:629
#, fuzzy
msgid "To following viewed character"
msgstr "Na naslednji prikazan znak"
#: zrcolagui.cpp:613
#: zrcolagui.cpp:640
#, fuzzy
msgid "Re&lated"
msgstr "&Sorodni"
#: zrcolagui.cpp:640
#: zrcolagui.cpp:667
#, fuzzy
msgid "List of related characters"
msgstr "Seznam sorodnih znakov"
#: zrcolagui.cpp:727
#: zrcolagui.cpp:756
#, fuzzy
msgid ""
"Some character native to specific language you are working with should not "
@@ -424,22 +492,22 @@ msgstr ""
"razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik."
#: zrcolagui.cpp:731
#: zrcolagui.cpp:760
#, fuzzy
msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
#: zrcolagui.cpp:734
#: zrcolagui.cpp:763
#, fuzzy
msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:"
#: zrcolagui.cpp:746
#: zrcolagui.cpp:775
#, fuzzy
msgid "Text Language"
msgstr "Jezik besedila"
#: zrcolagui.cpp:751
#: zrcolagui.cpp:780
#, fuzzy
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
@@ -450,60 +518,126 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6."
#: zrcolagui.cpp:755
#: zrcolagui.cpp:784
#, fuzzy
msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi"
#: zrcolagui.cpp:762
#: zrcolagui.cpp:791
#, fuzzy
msgid "Startup"
msgstr "Zagon"
#: zrcolagui.cpp:841
#: zrcolagui.cpp:870
#, fuzzy
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
"Program and Website Editor: Janoš Ježovnik\n"
"Development: Amebis, d. o. o., Kamnik\n"
"Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr ""
"Urednik: Janoš Ježovnik\n"
"Razvoj: Amebis d. o. o.\n"
"Urednik programa in spletne strani: Janoš Ježovnik\n"
"Razvoj: Amebis, d. o. o., Kamnik\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
#: zrcolagui.cpp:849
#: zrcolagui.cpp:878
#, fuzzy
msgid "www.zrc-sazu.si"
msgstr "www.zrc-sazu.si"
msgid "zrcola.zrc-sazu.si"
msgstr "zrcola.zrc-sazu.si"
#: zrcolagui.cpp:855
#: zrcolagui.cpp:884
#, 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:"
#: zrcolagui.cpp:859
#: zrcolagui.cpp:888
#, fuzzy
msgid ""
"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
"si), developed at the Science and Research Centre of SAZU in Ljubljana "
"(http://www.zrc-sazu.si) by Dr. Peter Weiss."
msgstr ""
"Besedilo je bilo pripravljeno z vnašalnim 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."
#: zrcolagui.cpp:900
#: zrcolagui.cpp:929
#, fuzzy
msgid "Log"
msgstr "Dnevnik"
#: zrcolagui.cpp:916
#: zrcolagui.cpp:945
#, fuzzy
msgid "&Update"
msgstr "&Posodobi"
msgid "Quit and &Update..."
msgstr "Za&ustavi in posodobi ..."
#: zrcolagui.cpp:921
#: zrcolagui.cpp:947
#, fuzzy
msgid "Exit this program and launch product update"
msgstr "Zaustavi ta program in zaženi posodobitev izdelka"
#: zrcolagui.cpp:951
#, fuzzy
msgid "&Close"
msgstr "&Zapri"
#: zrcolagui.cpp:952
#, fuzzy
msgid "Close this window"
msgstr "Zapri to okno"
#: zrcolagui.cpp:991
#, fuzzy
msgid "Enter the &character you would like to request:"
msgstr "Vpišite &znak, ki ga želite zahtevati:"
#: zrcolagui.cpp:998
#, fuzzy
msgid "Decomposed character to request"
msgstr "Razstavljen znak, ki ga zahtevate"
#: zrcolagui.cpp:1002
#, fuzzy
msgid ""
"Please, use the decomposed form.\n"
"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
"it from the Decomposed window."
msgstr ""
"Uporabite razstavljeno obliko.\n"
"Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate "
"in prilepite iz okna z razstavljenim besedilom."
#: zrcolagui.cpp:1012
#, fuzzy
msgid ""
"The &context, examples or short description why and where the character is "
"required:"
msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:"
#: zrcolagui.cpp:1018
#, fuzzy
msgid "Additional notes for character request"
msgstr "Dodatne opombe za zahtevo znaka"
#: zrcolagui.cpp:1025
#, fuzzy
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
"Your e-mail application might not display all the characters correctly, but "
"we'll encode the necessarry information so the Editor will be able to read "
"it correctly."
msgstr ""
"Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim "
"boste lahko oddali zahtevo za novi znak uredniku ZRCole.\n"
"Vaš e-poštni program mogoče ne bo prikazal vseh znakov pravilno, toda mi "
"bomo vse potrebne podatke ustrezno kodirali, da jih bo urednik lahko "
"pravilno prebral."
#: zrcolakeyhndlr.cpp:44
#, fuzzy
msgid ""
@@ -518,37 +652,196 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr "Samodejno zaženi ZRColo ob prijavi"
#: zrcolagui.h:275
#: zrcolaupdater.cpp:94
#, fuzzy
msgid "Settings"
msgstr "Nastavitve"
msgid ""
"This program will now close and the upgrade will be launched.\n"
"Are you sure?"
msgstr ""
"Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
"Ali ste prepričani?"
#: zrcolagui.h:301
#, fuzzy
msgid "About ZRCola"
msgstr "O ZRColi"
#: zrcolagui.h:324
#: zrcolaupdater.cpp:94 zrcolagui.h:331
#, fuzzy
msgid "Product Update"
msgstr "Posodabljanje izdelka"
#: zrcolagui.h:243
#, fuzzy
msgid "Character Search"
msgstr "Poišči znak"
#: zrcolagui.h:280
#, fuzzy
msgid "Settings"
msgstr "Nastavitve"
#: zrcolagui.h:306
#, fuzzy
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"

View File

@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-31 08:47+0200\n"
"PO-Revision-Date: 2016-05-31 08:47+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
@@ -20,35 +20,69 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr ""
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
#: 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
msgid "ZRCola"
msgstr "ZRCola:."
#: zrcolafrm.cpp:104
#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
#, fuzzy
msgid "Character"
msgstr "Eingabe eines Zeichenstils"
#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
#, fuzzy
msgid "Context"
msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
#: zrcolachrreq.cpp:64 zrcolagui.h:360
msgid "Request a New Character"
msgstr ""
#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
msgid "▸ Search Options"
msgstr ""
#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
msgid "▾ Search Options"
msgstr ""
#: zrcolafrm.cpp:141
msgid ""
"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
"will not be available."
msgstr ""
#: zrcolafrm.cpp:104 zrcolafrm.cpp:106
#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
#, fuzzy
msgid "Warning"
msgstr "Warnung: "
#: zrcolafrm.cpp:106
#: zrcolafrm.cpp:143
msgid ""
"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
"will not be available."
msgstr ""
#: zrcolafrm.cpp:341
msgid "http://zrcola-2.amebis.si/en/contact/"
#: zrcolafrm.cpp:351
msgid "http://zrcola-2.amebis.si/en/info/instructions/"
msgstr "http://zrcola-2.amebis.si/de/info/instructions/"
#: zrcolafrm.cpp:375
msgid ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
msgstr ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
#: zrcolagui.cpp:36
msgid "E&xit"
@@ -62,7 +96,7 @@ msgstr "Dieses Programm beenden"
#: zrcolagui.cpp:39
#, fuzzy
msgid "&Program"
msgstr "Konnte das Hildon Programm nicht initialisieren"
msgstr "Samodejno zaženi ta program ob prijavi"
#: zrcolagui.cpp:72
#, fuzzy
@@ -74,26 +108,29 @@ msgid "Select all text"
msgstr ""
#: zrcolagui.cpp:78
msgid "C&haracter Selector..."
msgstr ""
#, fuzzy
msgid "Find C&haracter..."
msgstr "Eingabe eines Zeichenstils"
#: zrcolagui.cpp:78 zrcolagui.cpp:170
msgid "Display character selector to select character to insert into text"
#: zrcolagui.cpp:78 zrcolagui.cpp:180
msgid "Display character search to select character to insert into text"
msgstr ""
#: zrcolagui.cpp:89
#, fuzzy
msgid "&Send Composed"
msgstr ""
msgstr "Pošlji sestavljeno (F5)"
#: zrcolagui.cpp:89 zrcolagui.cpp:172
#: zrcolagui.cpp:89 zrcolagui.cpp:182
msgid "Send composed text to source window"
msgstr ""
#: zrcolagui.cpp:98
#, fuzzy
msgid "Send &Decomposed"
msgstr ""
msgstr "Pošlji razstavljeno (F6)"
#: zrcolagui.cpp:98 zrcolagui.cpp:174
#: zrcolagui.cpp:98 zrcolagui.cpp:184
msgid "Send decomposed text to source window"
msgstr ""
@@ -148,287 +185,357 @@ msgid "&View"
msgstr "&Ansicht..."
#: zrcolagui.cpp:142
msgid "&Request a new character..."
msgid "&Instructions..."
msgstr ""
#: zrcolagui.cpp:142
msgid "Open a web site with product instructions"
msgstr ""
#: zrcolagui.cpp:146
msgid "Keyboard &Shortcuts..."
msgstr ""
#: zrcolagui.cpp:146
msgid "Open a list of keyboard shortcuts"
msgstr ""
#: zrcolagui.cpp:152
msgid "&Request a new character..."
msgstr ""
#: zrcolagui.cpp:152
msgid "Submit a request to ZRC to add a new character"
msgstr ""
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
msgid "Check for &Updates..."
msgstr ""
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
msgid "Check online for product update"
msgstr ""
#: zrcolagui.cpp:155
#: zrcolagui.cpp:165
#, fuzzy
msgid "&Help"
msgstr "&Hilfe"
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
#, fuzzy
msgid "Cut"
msgstr "Ausschneiden"
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
#, fuzzy
msgid "Cut selection"
msgstr "Auswahl ausschneiden"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
#, fuzzy
msgid "Copy"
msgstr "Kopieren"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
#, fuzzy
msgid "Copy selection"
msgstr "Auswahl kopieren"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
#, fuzzy
msgid "Paste"
msgstr "Einfügen"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
#, fuzzy
msgid "Paste selection"
msgstr "Auswahl einfügen"
#: zrcolagui.cpp:167
#: zrcolagui.cpp:177
#, fuzzy
msgid "Edit"
msgstr "Bearbeiten"
#: zrcolagui.cpp:170 zrcolagui.h:238
msgid "Character Selector"
msgstr ""
#: zrcolagui.cpp:180
#, fuzzy
msgid "Find Character"
msgstr "Eingabe eines Zeichenstils"
#: zrcolagui.cpp:172
#: zrcolagui.cpp:182
#, fuzzy
msgid "Send Composed"
msgstr ""
msgstr "Pošlji sestavljeno (F5)"
#: zrcolagui.cpp:174
#: zrcolagui.cpp:184
#, fuzzy
msgid "Send Decomposed"
msgstr ""
msgstr "Pošlji razstavljeno (F6)"
#: zrcolagui.cpp:177
#: zrcolagui.cpp:187
msgid "Compose"
msgstr ""
#: zrcolagui.cpp:181
#: zrcolagui.cpp:191
msgid "Character Catalog"
msgstr ""
#: zrcolagui.cpp:185
#: zrcolagui.cpp:195
msgid "(De)Composer"
msgstr ""
#: zrcolagui.cpp:224
#: zrcolagui.cpp:234
msgid "Decomposed Text"
msgstr ""
#: zrcolagui.cpp:244
#: zrcolagui.cpp:254
msgid "Decomposed Unicode Dump"
msgstr ""
#: zrcolagui.cpp:271
#: zrcolagui.cpp:281
msgid "Composed Text"
msgstr ""
#: zrcolagui.cpp:291
#: zrcolagui.cpp:301
msgid "Composed Unicode Dump"
msgstr ""
#: zrcolagui.cpp:411
#: zrcolagui.cpp:421
#, fuzzy
msgid "&Browse"
msgstr "Durchsuchen"
#: zrcolagui.cpp:418
#: zrcolagui.cpp:428
msgid ""
"Full or partial terms from Unicode character description (in English) to "
"search for"
msgstr ""
#: zrcolagui.cpp:424
#: zrcolagui.cpp:432
msgid "Search Options"
msgstr ""
#: zrcolagui.cpp:433
msgid "Shows/hides additional search options"
msgstr ""
#: zrcolagui.cpp:445
msgid "List of Unicode character categories to search in"
msgstr ""
#: zrcolagui.cpp:431
#: zrcolagui.cpp:452
#, fuzzy
msgid "All"
msgstr "Alle"
#: zrcolagui.cpp:432
#: zrcolagui.cpp:453
msgid "Select all categories"
msgstr ""
#: zrcolagui.cpp:436
#: zrcolagui.cpp:457
#, fuzzy
msgid "None"
msgstr "Kein"
#: zrcolagui.cpp:437
#: zrcolagui.cpp:458
#, fuzzy
msgid "Clear category selection"
msgstr "Auswahl kopieren"
#: zrcolagui.cpp:441
#: zrcolagui.cpp:462
msgid "Invert"
msgstr ""
#: zrcolagui.cpp:442
#: zrcolagui.cpp:463
#, fuzzy
msgid "Invert category selection"
msgstr "Auswahl einfügen"
#: zrcolagui.cpp:475
#: zrcolagui.cpp:502
#, fuzzy
msgid "Character search results"
msgstr "Skupine &znakov"
#: zrcolagui.cpp:485
#: zrcolagui.cpp:512
msgid "Re&cently Used"
msgstr ""
#: zrcolagui.cpp:513
#: zrcolagui.cpp:540
msgid "List of recently inserted characters"
msgstr ""
#: zrcolagui.cpp:527
#: zrcolagui.cpp:554
#, fuzzy
msgid "Preview"
msgstr " Vorschau"
#: zrcolagui.cpp:532
#: zrcolagui.cpp:559
#, fuzzy
msgid "U+"
msgstr "Hilfeverzeichnis %u nicht gefunden."
#: zrcolagui.cpp:537
#: zrcolagui.cpp:564
msgid "Unicode hexadecimal code"
msgstr ""
#: zrcolagui.cpp:542
#: zrcolagui.cpp:569
msgid "Keyboard shortcut in Composer window"
msgstr ""
#: zrcolagui.cpp:577
#: zrcolagui.cpp:604
#, fuzzy
msgid "Character preview"
msgstr "Skupine &znakov"
#: zrcolagui.cpp:582
#: zrcolagui.cpp:609
msgid "Unicode character description"
msgstr ""
#: zrcolagui.cpp:587
#: zrcolagui.cpp:614
msgid "Unicode character category"
msgstr ""
#: zrcolagui.cpp:594
#: zrcolagui.cpp:621
#, fuzzy
msgid "« Back"
msgstr "< &Zurück"
#: zrcolagui.cpp:596
#: zrcolagui.cpp:623
msgid "To previously viewed character"
msgstr ""
#: zrcolagui.cpp:600
#: zrcolagui.cpp:627
#, fuzzy
msgid "Forward »"
msgstr "&Vorwärts"
#: zrcolagui.cpp:602
#: zrcolagui.cpp:629
msgid "To following viewed character"
msgstr ""
#: zrcolagui.cpp:613
#: zrcolagui.cpp:640
msgid "Re&lated"
msgstr ""
#: zrcolagui.cpp:640
#: zrcolagui.cpp:667
msgid "List of related characters"
msgstr ""
#: zrcolagui.cpp:727
#: zrcolagui.cpp:756
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
"For optimal decomposition you should set the language correctly."
msgstr ""
#: zrcolagui.cpp:731
#: zrcolagui.cpp:760
msgid "Select language &automatically according to selected keyboard"
msgstr ""
#: zrcolagui.cpp:734
#: zrcolagui.cpp:763
msgid "&Manually select the language from the list below:"
msgstr ""
#: zrcolagui.cpp:746
#: zrcolagui.cpp:775
msgid "Text Language"
msgstr ""
#: zrcolagui.cpp:751
#: zrcolagui.cpp:780
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
"It will be available on the system tray and via registered shortcuts Win+F5 "
"and Win+F6."
msgstr ""
#: zrcolagui.cpp:755
#: zrcolagui.cpp:784
msgid "Start ZRCola &automatically on logon"
msgstr ""
#: zrcolagui.cpp:762
#: zrcolagui.cpp:791
msgid "Startup"
msgstr ""
#: zrcolagui.cpp:841
#: zrcolagui.cpp:870
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
"Program and Website Editor: Janoš Ježovnik\n"
"Development: Amebis, d. o. o., Kamnik\n"
"Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr ""
#: zrcolagui.cpp:849
msgid "www.zrc-sazu.si"
#: zrcolagui.cpp:878
msgid "zrcola.zrc-sazu.si"
msgstr ""
#: zrcolagui.cpp:855
#: zrcolagui.cpp:884
msgid ""
"Texts made using ZRCola have to include in the colophon, foreword, footnote "
"or some other appropriate part of the publication the note below:"
msgstr ""
#: zrcolagui.cpp:859
#: zrcolagui.cpp:888
msgid ""
"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
"si), developed at the Science and Research Centre of SAZU in Ljubljana "
"(http://www.zrc-sazu.si) by Dr. Peter Weiss."
msgstr ""
#: zrcolagui.cpp:900
#: zrcolagui.cpp:929
#, fuzzy
msgid "Log"
msgstr "&Log"
#: zrcolagui.cpp:916
#: zrcolagui.cpp:945
#, fuzzy
msgid "&Update"
msgid "Quit and &Update..."
msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
#: zrcolagui.cpp:921
#: zrcolagui.cpp:947
msgid "Exit this program and launch product update"
msgstr ""
#: zrcolagui.cpp:951
#, fuzzy
msgid "&Close"
msgstr "&Schließen"
#: zrcolagui.cpp:952
#, fuzzy
msgid "Close this window"
msgstr "Fenster schließen"
#: zrcolagui.cpp:991
msgid "Enter the &character you would like to request:"
msgstr ""
#: zrcolagui.cpp:998
msgid "Decomposed character to request"
msgstr ""
#: zrcolagui.cpp:1002
msgid ""
"Please, use the decomposed form.\n"
"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
"it from the Decomposed window."
msgstr ""
#: zrcolagui.cpp:1012
msgid ""
"The &context, examples or short description why and where the character is "
"required:"
msgstr ""
#: zrcolagui.cpp:1018
msgid "Additional notes for character request"
msgstr ""
#: zrcolagui.cpp:1025
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
"Your e-mail application might not display all the characters correctly, but "
"we'll encode the necessarry information so the Editor will be able to read "
"it correctly."
msgstr ""
#: zrcolakeyhndlr.cpp:44
msgid ""
"INS key is pressed. Type the Unicode code of desired character now (up to "
@@ -439,34 +546,170 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr ""
#: zrcolagui.h:275
msgid "Settings"
#: zrcolaupdater.cpp:94
msgid ""
"This program will now close and the upgrade will be launched.\n"
"Are you sure?"
msgstr ""
#: zrcolagui.h:301
msgid "About ZRCola"
msgstr ""
#: zrcolagui.h:324
#: zrcolaupdater.cpp:94 zrcolagui.h:331
msgid "Product Update"
msgstr ""
#: zrcolagui.h:243
#, fuzzy
msgid "Character Search"
msgstr "Skupine &znakov"
#: zrcolagui.h:280
msgid "Settings"
msgstr ""
#: zrcolagui.h:306
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"
@@ -551,8 +794,9 @@ msgstr ""
#~ msgid "Shift"
#~ msgstr "Shift"
#, fuzzy
#~ msgid "Alt"
#~ msgstr "Alt"
#~ msgstr "Alle"
#~ msgid "Ctrl"
#~ msgstr "Ctrl"
@@ -626,8 +870,9 @@ msgstr ""
#~ msgid "INS"
#~ msgstr "INS"
#, fuzzy
#~ msgid "Character &Groups"
#~ msgstr "Skupine &znakov"
#~ msgstr "Eingabe eines Zeichenstils"
#~ msgid "Language:"
#~ msgstr "Jezik:"
@@ -644,18 +889,22 @@ msgstr ""
#~ msgid "Inserts text from the clipboard"
#~ msgstr "Vstavi besedilo z odložišča"
#, fuzzy
#~ msgid "&Copy"
#~ msgstr "&Kopiraj"
#~ msgstr "Kopieren"
#, fuzzy
#~ msgid "&Paste"
#~ msgstr "&Prilepi"
#~ msgstr "Einfügen"
#~ msgid "&File"
#~ msgstr "&Datoteka"
#, fuzzy
#~ msgid "Send Decomposed (F6)"
#~ msgstr "Pošlji razstavljeno (F6)"
#, fuzzy
#~ msgid "Send Composed (F5)"
#~ msgstr "Pošlji sestavljeno (F5)"

View File

@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-31 08:46+0200\n"
"PO-Revision-Date: 2016-05-31 08:46+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"X-Poedit-Basepath: .\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"
@@ -21,34 +21,67 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr ""
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
#: 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
msgid "ZRCola"
msgstr "ZRCola:."
#: zrcolafrm.cpp:104
#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
#, fuzzy
msgid "Character"
msgstr "Skupine &znakov"
#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
msgid "Context"
msgstr ""
#: zrcolachrreq.cpp:64 zrcolagui.h:360
msgid "Request a New Character"
msgstr ""
#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
msgid "▸ Search Options"
msgstr ""
#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
msgid "▾ Search Options"
msgstr ""
#: zrcolafrm.cpp:141
msgid ""
"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
"will not be available."
msgstr ""
#: zrcolafrm.cpp:104 zrcolafrm.cpp:106
#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
msgid "Warning"
msgstr ""
#: zrcolafrm.cpp:106
#: zrcolafrm.cpp:143
msgid ""
"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
"will not be available."
msgstr ""
#: zrcolafrm.cpp:341
msgid "http://zrcola-2.amebis.si/en/contact/"
#: zrcolafrm.cpp:351
msgid "http://zrcola-2.amebis.si/en/info/instructions/"
msgstr "http://zrcola-2.amebis.si/ru/info/instructions/"
#: zrcolafrm.cpp:375
msgid ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
msgstr ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
#: zrcolagui.cpp:36
msgid "E&xit"
@@ -71,26 +104,29 @@ msgid "Select all text"
msgstr ""
#: zrcolagui.cpp:78
msgid "C&haracter Selector..."
msgstr ""
#, fuzzy
msgid "Find C&haracter..."
msgstr "Skupine &znakov"
#: zrcolagui.cpp:78 zrcolagui.cpp:170
msgid "Display character selector to select character to insert into text"
#: zrcolagui.cpp:78 zrcolagui.cpp:180
msgid "Display character search to select character to insert into text"
msgstr ""
#: zrcolagui.cpp:89
#, fuzzy
msgid "&Send Composed"
msgstr ""
msgstr "Pošlji sestavljeno (F5)"
#: zrcolagui.cpp:89 zrcolagui.cpp:172
#: zrcolagui.cpp:89 zrcolagui.cpp:182
msgid "Send composed text to source window"
msgstr ""
#: zrcolagui.cpp:98
#, fuzzy
msgid "Send &Decomposed"
msgstr ""
msgstr "Pošlji razstavljeno (F6)"
#: zrcolagui.cpp:98 zrcolagui.cpp:174
#: zrcolagui.cpp:98 zrcolagui.cpp:184
msgid "Send decomposed text to source window"
msgstr ""
@@ -143,268 +179,339 @@ msgid "&View"
msgstr ""
#: zrcolagui.cpp:142
msgid "&Request a new character..."
msgid "&Instructions..."
msgstr ""
#: zrcolagui.cpp:142
msgid "Open a web site with product instructions"
msgstr ""
#: zrcolagui.cpp:146
msgid "Keyboard &Shortcuts..."
msgstr ""
#: zrcolagui.cpp:146
msgid "Open a list of keyboard shortcuts"
msgstr ""
#: zrcolagui.cpp:152
msgid "&Request a new character..."
msgstr ""
#: zrcolagui.cpp:152
msgid "Submit a request to ZRC to add a new character"
msgstr ""
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
msgid "Check for &Updates..."
msgstr ""
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
msgid "Check online for product update"
msgstr ""
#: zrcolagui.cpp:155
#: zrcolagui.cpp:165
msgid "&Help"
msgstr ""
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
msgid "Cut"
msgstr ""
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
msgid "Cut selection"
msgstr ""
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
#, fuzzy
msgid "Copy"
msgstr ""
msgstr "&Kopiraj"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
msgid "Copy selection"
msgstr ""
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
#, fuzzy
msgid "Paste"
msgstr ""
msgstr "&Prilepi"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
msgid "Paste selection"
msgstr ""
#: zrcolagui.cpp:167
#: zrcolagui.cpp:177
msgid "Edit"
msgstr ""
#: zrcolagui.cpp:170 zrcolagui.h:238
msgid "Character Selector"
msgstr ""
#: zrcolagui.cpp:180
#, fuzzy
msgid "Find Character"
msgstr "Skupine &znakov"
#: zrcolagui.cpp:172
#: zrcolagui.cpp:182
#, fuzzy
msgid "Send Composed"
msgstr ""
msgstr "Pošlji sestavljeno (F5)"
#: zrcolagui.cpp:174
#: zrcolagui.cpp:184
#, fuzzy
msgid "Send Decomposed"
msgstr ""
msgstr "Pošlji razstavljeno (F6)"
#: zrcolagui.cpp:177
#: zrcolagui.cpp:187
msgid "Compose"
msgstr ""
#: zrcolagui.cpp:181
#: zrcolagui.cpp:191
msgid "Character Catalog"
msgstr ""
#: zrcolagui.cpp:185
#: zrcolagui.cpp:195
msgid "(De)Composer"
msgstr ""
#: zrcolagui.cpp:224
#: zrcolagui.cpp:234
msgid "Decomposed Text"
msgstr ""
#: zrcolagui.cpp:244
#: zrcolagui.cpp:254
msgid "Decomposed Unicode Dump"
msgstr ""
#: zrcolagui.cpp:271
#: zrcolagui.cpp:281
msgid "Composed Text"
msgstr ""
#: zrcolagui.cpp:291
#: zrcolagui.cpp:301
msgid "Composed Unicode Dump"
msgstr ""
#: zrcolagui.cpp:411
#: zrcolagui.cpp:421
msgid "&Browse"
msgstr ""
#: zrcolagui.cpp:418
#: zrcolagui.cpp:428
msgid ""
"Full or partial terms from Unicode character description (in English) to "
"search for"
msgstr ""
#: zrcolagui.cpp:424
#: zrcolagui.cpp:432
msgid "Search Options"
msgstr ""
#: zrcolagui.cpp:433
msgid "Shows/hides additional search options"
msgstr ""
#: zrcolagui.cpp:445
msgid "List of Unicode character categories to search in"
msgstr ""
#: zrcolagui.cpp:431
#: zrcolagui.cpp:452
#, fuzzy
msgid "All"
msgstr "Alt"
#: zrcolagui.cpp:432
#: zrcolagui.cpp:453
msgid "Select all categories"
msgstr ""
#: zrcolagui.cpp:436
#: zrcolagui.cpp:457
msgid "None"
msgstr ""
#: zrcolagui.cpp:437
#: zrcolagui.cpp:458
msgid "Clear category selection"
msgstr ""
#: zrcolagui.cpp:441
#: zrcolagui.cpp:462
msgid "Invert"
msgstr ""
#: zrcolagui.cpp:442
#: zrcolagui.cpp:463
msgid "Invert category selection"
msgstr ""
#: zrcolagui.cpp:475
#: zrcolagui.cpp:502
#, fuzzy
msgid "Character search results"
msgstr "Skupine &znakov"
#: zrcolagui.cpp:485
#: zrcolagui.cpp:512
msgid "Re&cently Used"
msgstr ""
#: zrcolagui.cpp:513
#: zrcolagui.cpp:540
msgid "List of recently inserted characters"
msgstr ""
#: zrcolagui.cpp:527
#: zrcolagui.cpp:554
msgid "Preview"
msgstr ""
#: zrcolagui.cpp:532
#: zrcolagui.cpp:559
msgid "U+"
msgstr ""
#: zrcolagui.cpp:537
#: zrcolagui.cpp:564
msgid "Unicode hexadecimal code"
msgstr ""
#: zrcolagui.cpp:542
#: zrcolagui.cpp:569
msgid "Keyboard shortcut in Composer window"
msgstr ""
#: zrcolagui.cpp:577
#: zrcolagui.cpp:604
#, fuzzy
msgid "Character preview"
msgstr "Skupine &znakov"
#: zrcolagui.cpp:582
#: zrcolagui.cpp:609
msgid "Unicode character description"
msgstr ""
#: zrcolagui.cpp:587
#: zrcolagui.cpp:614
msgid "Unicode character category"
msgstr ""
#: zrcolagui.cpp:594
#: zrcolagui.cpp:621
msgid "« Back"
msgstr ""
#: zrcolagui.cpp:596
#: zrcolagui.cpp:623
msgid "To previously viewed character"
msgstr ""
#: zrcolagui.cpp:600
#: zrcolagui.cpp:627
msgid "Forward »"
msgstr ""
#: zrcolagui.cpp:602
#: zrcolagui.cpp:629
msgid "To following viewed character"
msgstr ""
#: zrcolagui.cpp:613
#: zrcolagui.cpp:640
msgid "Re&lated"
msgstr ""
#: zrcolagui.cpp:640
#: zrcolagui.cpp:667
msgid "List of related characters"
msgstr ""
#: zrcolagui.cpp:727
#: zrcolagui.cpp:756
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
"For optimal decomposition you should set the language correctly."
msgstr ""
#: zrcolagui.cpp:731
#: zrcolagui.cpp:760
msgid "Select language &automatically according to selected keyboard"
msgstr ""
#: zrcolagui.cpp:734
#: zrcolagui.cpp:763
msgid "&Manually select the language from the list below:"
msgstr ""
#: zrcolagui.cpp:746
#: zrcolagui.cpp:775
msgid "Text Language"
msgstr ""
#: zrcolagui.cpp:751
#: zrcolagui.cpp:780
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
"It will be available on the system tray and via registered shortcuts Win+F5 "
"and Win+F6."
msgstr ""
#: zrcolagui.cpp:755
#: zrcolagui.cpp:784
msgid "Start ZRCola &automatically on logon"
msgstr ""
#: zrcolagui.cpp:762
#: zrcolagui.cpp:791
msgid "Startup"
msgstr ""
#: zrcolagui.cpp:841
#: zrcolagui.cpp:870
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
"Program and Website Editor: Janoš Ježovnik\n"
"Development: Amebis, d. o. o., Kamnik\n"
"Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr ""
#: zrcolagui.cpp:849
msgid "www.zrc-sazu.si"
#: zrcolagui.cpp:878
msgid "zrcola.zrc-sazu.si"
msgstr ""
#: zrcolagui.cpp:855
#: zrcolagui.cpp:884
msgid ""
"Texts made using ZRCola have to include in the colophon, foreword, footnote "
"or some other appropriate part of the publication the note below:"
msgstr ""
#: zrcolagui.cpp:859
#: zrcolagui.cpp:888
msgid ""
"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
"si), developed at the Science and Research Centre of SAZU in Ljubljana "
"(http://www.zrc-sazu.si) by Dr. Peter Weiss."
msgstr ""
#: zrcolagui.cpp:900
#: zrcolagui.cpp:929
msgid "Log"
msgstr ""
#: zrcolagui.cpp:916
msgid "&Update"
#: zrcolagui.cpp:945
msgid "Quit and &Update..."
msgstr ""
#: zrcolagui.cpp:921
#: zrcolagui.cpp:947
msgid "Exit this program and launch product update"
msgstr ""
#: zrcolagui.cpp:951
msgid "&Close"
msgstr ""
#: zrcolagui.cpp:952
msgid "Close this window"
msgstr ""
#: zrcolagui.cpp:991
msgid "Enter the &character you would like to request:"
msgstr ""
#: zrcolagui.cpp:998
msgid "Decomposed character to request"
msgstr ""
#: zrcolagui.cpp:1002
msgid ""
"Please, use the decomposed form.\n"
"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
"it from the Decomposed window."
msgstr ""
#: zrcolagui.cpp:1012
msgid ""
"The &context, examples or short description why and where the character is "
"required:"
msgstr ""
#: zrcolagui.cpp:1018
msgid "Additional notes for character request"
msgstr ""
#: zrcolagui.cpp:1025
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
"Your e-mail application might not display all the characters correctly, but "
"we'll encode the necessarry information so the Editor will be able to read "
"it correctly."
msgstr ""
#: zrcolakeyhndlr.cpp:44
msgid ""
"INS key is pressed. Type the Unicode code of desired character now (up to "
@@ -415,34 +522,169 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr ""
#: zrcolagui.h:275
msgid "Settings"
#: zrcolaupdater.cpp:94
msgid ""
"This program will now close and the upgrade will be launched.\n"
"Are you sure?"
msgstr ""
#: zrcolagui.h:301
msgid "About ZRCola"
msgstr ""
#: zrcolagui.h:324
#: zrcolaupdater.cpp:94 zrcolagui.h:331
msgid "Product Update"
msgstr ""
#: zrcolagui.h:243
#, fuzzy
msgid "Character Search"
msgstr "Skupine &znakov"
#: zrcolagui.h:280
msgid "Settings"
msgstr ""
#: zrcolagui.h:306
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"
@@ -527,6 +769,7 @@ msgstr ""
#~ msgid "Shift"
#~ msgstr "Shift"
#, fuzzy
#~ msgid "Alt"
#~ msgstr "Alt"
@@ -602,6 +845,7 @@ msgstr ""
#~ msgid "INS"
#~ msgstr "INS"
#, fuzzy
#~ msgid "Character &Groups"
#~ msgstr "Skupine &znakov"
@@ -620,18 +864,22 @@ msgstr ""
#~ 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)"

View File

@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-31 08:46+0200\n"
"PO-Revision-Date: 2016-05-31 08:46+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
@@ -21,15 +21,39 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU"
#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
#: 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"
msgstr "ZRCola"
#: zrcolafrm.cpp:104
#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
msgid "Character"
msgstr "Znak"
#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
msgid "Context"
msgstr "Kontekst"
#: zrcolachrreq.cpp:64 zrcolagui.h:360
msgid "Request a New Character"
msgstr "Zahtevaj nov znak"
#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
msgid "▸ Search Options"
msgstr "▸ Možnosti iskanja"
#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
msgid "▾ Search Options"
msgstr "▾ Možnosti iskanja"
#: zrcolafrm.cpp:141
msgid ""
"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
"will not be available."
@@ -37,11 +61,11 @@ msgstr ""
"ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
"funkcionalnosti ne bo na voljo."
#: zrcolafrm.cpp:104 zrcolafrm.cpp:106
#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
msgid "Warning"
msgstr "Opozorilo"
#: zrcolafrm.cpp:106
#: zrcolafrm.cpp:143
msgid ""
"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
"will not be available."
@@ -49,9 +73,17 @@ msgstr ""
"ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj "
"funkcionalnosti ne bo na voljo."
#: zrcolafrm.cpp:341
msgid "http://zrcola-2.amebis.si/en/contact/"
msgstr "http://zrcola-2.amebis.si/contact/"
#: zrcolafrm.cpp:351
msgid "http://zrcola-2.amebis.si/en/info/instructions/"
msgstr "http://zrcola-2.amebis.si/info/instructions/"
#: zrcolafrm.cpp:375
msgid ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
msgstr ""
"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
"Tipkovnica_2009-06-21.pdf"
#: zrcolagui.cpp:36
msgid "E&xit"
@@ -74,18 +106,18 @@ msgid "Select all text"
msgstr "Izberi celotno besedilo"
#: zrcolagui.cpp:78
msgid "C&haracter Selector..."
msgstr "Izbirnik &znaka ..."
msgid "Find C&haracter..."
msgstr "Poišči &znak ..."
#: zrcolagui.cpp:78 zrcolagui.cpp:170
msgid "Display character selector to select character to insert into text"
msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
#: zrcolagui.cpp:78 zrcolagui.cpp:180
msgid "Display character search to select character to insert into text"
msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"
#: zrcolagui.cpp:89
msgid "&Send Composed"
msgstr "Pošlji &sestavljeno"
#: zrcolagui.cpp:89 zrcolagui.cpp:172
#: zrcolagui.cpp:89 zrcolagui.cpp:182
msgid "Send composed text to source window"
msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@@ -93,7 +125,7 @@ msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
msgid "Send &Decomposed"
msgstr "Pošlji &razstavljeno"
#: zrcolagui.cpp:98 zrcolagui.cpp:174
#: zrcolagui.cpp:98 zrcolagui.cpp:184
msgid "Send decomposed text to source window"
msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@@ -146,197 +178,221 @@ msgid "&View"
msgstr "Po&gled"
#: zrcolagui.cpp:142
msgid "&Instructions..."
msgstr "Navod&ila ..."
#: zrcolagui.cpp:142
msgid "Open a web site with product instructions"
msgstr "Odpri spletno stran z navodili izdelka"
#: zrcolagui.cpp:146
msgid "Keyboard &Shortcuts..."
msgstr "&Bližnjice na tipkovnici ..."
#: zrcolagui.cpp:146
msgid "Open a list of keyboard shortcuts"
msgstr "Odpri seznam bližnjic na tipkovnici"
#: zrcolagui.cpp:152
msgid "&Request a new character..."
msgstr "&Zahtevaj nov znak ..."
#: zrcolagui.cpp:142
#: zrcolagui.cpp:152
msgid "Submit a request to ZRC to add a new character"
msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka"
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
msgid "Check for &Updates..."
msgstr "Preveri za &posodobitev ..."
#: zrcolagui.cpp:146
#: zrcolagui.cpp:156
msgid "Check online for product update"
msgstr "Preveri na spletu za posodobitev izdelka"
#: zrcolagui.cpp:155
#: zrcolagui.cpp:165
msgid "&Help"
msgstr "Po&moč"
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
msgid "Cut"
msgstr "Izreži"
#: zrcolagui.cpp:160
#: zrcolagui.cpp:170
msgid "Cut selection"
msgstr "Izreži izbor"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
msgid "Copy"
msgstr "Kopiraj"
#: zrcolagui.cpp:162
#: zrcolagui.cpp:172
msgid "Copy selection"
msgstr "Kopiraj izbor"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
msgid "Paste"
msgstr "Prilepi"
#: zrcolagui.cpp:164
#: zrcolagui.cpp:174
msgid "Paste selection"
msgstr "Prilepi izbor"
#: zrcolagui.cpp:167
#: zrcolagui.cpp:177
msgid "Edit"
msgstr "Urejanje"
#: zrcolagui.cpp:170 zrcolagui.h:238
msgid "Character Selector"
msgstr "Izbirnik znaka"
#: zrcolagui.cpp:180
msgid "Find Character"
msgstr "Poišči znak"
#: zrcolagui.cpp:172
#: zrcolagui.cpp:182
msgid "Send Composed"
msgstr "Pošlji sestavljeno"
#: zrcolagui.cpp:174
#: zrcolagui.cpp:184
msgid "Send Decomposed"
msgstr "Pošlji razstavljeno"
#: zrcolagui.cpp:177
#: zrcolagui.cpp:187
msgid "Compose"
msgstr "Sestavljanje"
#: zrcolagui.cpp:181
#: zrcolagui.cpp:191
msgid "Character Catalog"
msgstr "Katalog znakov"
#: zrcolagui.cpp:185
#: zrcolagui.cpp:195
msgid "(De)Composer"
msgstr "Raz/Sestavljalnik"
#: zrcolagui.cpp:224
#: zrcolagui.cpp:234
msgid "Decomposed Text"
msgstr "Razstavljeno besedilo"
#: zrcolagui.cpp:244
#: zrcolagui.cpp:254
msgid "Decomposed Unicode Dump"
msgstr "Unicode razstavljenega"
#: zrcolagui.cpp:271
#: zrcolagui.cpp:281
msgid "Composed Text"
msgstr "Sestavljeno besedilo"
#: zrcolagui.cpp:291
#: zrcolagui.cpp:301
msgid "Composed Unicode Dump"
msgstr "Unicode sestavljenega"
#: zrcolagui.cpp:411
#: zrcolagui.cpp:421
msgid "&Browse"
msgstr "Pre&brskaj"
#: zrcolagui.cpp:418
#: zrcolagui.cpp:428
msgid ""
"Full or partial terms from Unicode character description (in English) to "
"search for"
msgstr ""
"Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
#: zrcolagui.cpp:424
#: zrcolagui.cpp:432
msgid "Search Options"
msgstr "Možnosti iskanja"
#: zrcolagui.cpp:433
msgid "Shows/hides additional search options"
msgstr "Prikaže/skrije dodatne možnosti iskanja"
#: zrcolagui.cpp:445
msgid "List of Unicode character categories to search in"
msgstr "Seznam kategorij znaka Unicode za iskanje"
#: zrcolagui.cpp:431
#: zrcolagui.cpp:452
msgid "All"
msgstr "Vse"
#: zrcolagui.cpp:432
#: zrcolagui.cpp:453
msgid "Select all categories"
msgstr "Izberi vse kategorije"
#: zrcolagui.cpp:436
#: zrcolagui.cpp:457
msgid "None"
msgstr "Nič"
#: zrcolagui.cpp:437
#: zrcolagui.cpp:458
msgid "Clear category selection"
msgstr "Počisti izbor kategorij"
#: zrcolagui.cpp:441
#: zrcolagui.cpp:462
msgid "Invert"
msgstr "Obrni"
#: zrcolagui.cpp:442
#: zrcolagui.cpp:463
msgid "Invert category selection"
msgstr "Obrni izbor kategorij"
#: zrcolagui.cpp:475
#: zrcolagui.cpp:502
msgid "Character search results"
msgstr "Rezultati iskanja znakov"
#: zrcolagui.cpp:485
#: zrcolagui.cpp:512
msgid "Re&cently Used"
msgstr "Nedavno &uporabljeni"
#: zrcolagui.cpp:513
#: zrcolagui.cpp:540
msgid "List of recently inserted characters"
msgstr "Seznam nedavno vstavljenih znakov"
#: zrcolagui.cpp:527
#: zrcolagui.cpp:554
msgid "Preview"
msgstr "Predogled"
#: zrcolagui.cpp:532
#: zrcolagui.cpp:559
msgid "U+"
msgstr "U+"
#: zrcolagui.cpp:537
#: zrcolagui.cpp:564
msgid "Unicode hexadecimal code"
msgstr "Šestnajstiška koda Unicode"
#: zrcolagui.cpp:542
#: zrcolagui.cpp:569
msgid "Keyboard shortcut in Composer window"
msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
#: zrcolagui.cpp:577
#: zrcolagui.cpp:604
msgid "Character preview"
msgstr "Predogled znaka"
#: zrcolagui.cpp:582
#: zrcolagui.cpp:609
msgid "Unicode character description"
msgstr "Opis znaka Unicode"
#: zrcolagui.cpp:587
#: zrcolagui.cpp:614
msgid "Unicode character category"
msgstr "Kategorija znaka Unicode"
#: zrcolagui.cpp:594
#: zrcolagui.cpp:621
msgid "« Back"
msgstr "« Nazaj"
#: zrcolagui.cpp:596
#: zrcolagui.cpp:623
msgid "To previously viewed character"
msgstr "Na prejšnji prikazan znak"
#: zrcolagui.cpp:600
#: zrcolagui.cpp:627
msgid "Forward »"
msgstr "Naprej »"
#: zrcolagui.cpp:602
#: zrcolagui.cpp:629
msgid "To following viewed character"
msgstr "Na naslednji prikazan znak"
#: zrcolagui.cpp:613
#: zrcolagui.cpp:640
msgid "Re&lated"
msgstr "&Sorodni"
#: zrcolagui.cpp:640
#: zrcolagui.cpp:667
msgid "List of related characters"
msgstr "Seznam sorodnih znakov"
#: zrcolagui.cpp:727
#: zrcolagui.cpp:756
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
@@ -346,19 +402,19 @@ msgstr ""
"razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik."
#: zrcolagui.cpp:731
#: zrcolagui.cpp:760
msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
#: zrcolagui.cpp:734
#: zrcolagui.cpp:763
msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:"
#: zrcolagui.cpp:746
#: zrcolagui.cpp:775
msgid "Text Language"
msgstr "Jezik besedila"
#: zrcolagui.cpp:751
#: zrcolagui.cpp:780
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
"It will be available on the system tray and via registered shortcuts Win+F5 "
@@ -368,29 +424,29 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6."
#: zrcolagui.cpp:755
#: zrcolagui.cpp:784
msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi"
#: zrcolagui.cpp:762
#: zrcolagui.cpp:791
msgid "Startup"
msgstr "Zagon"
#: zrcolagui.cpp:841
#: zrcolagui.cpp:870
msgid ""
"Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n"
"Program and Website Editor: Janoš Ježovnik\n"
"Development: Amebis, d. o. o., Kamnik\n"
"Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr ""
"Urednik: Janoš Ježovnik\n"
"Razvoj: Amebis d. o. o.\n"
"Urednik programa in spletne strani: Janoš Ježovnik\n"
"Razvoj: Amebis, d. o. o., Kamnik\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
#: zrcolagui.cpp:849
msgid "www.zrc-sazu.si"
msgstr "www.zrc-sazu.si"
#: zrcolagui.cpp:878
msgid "zrcola.zrc-sazu.si"
msgstr "zrcola.zrc-sazu.si"
#: zrcolagui.cpp:855
#: zrcolagui.cpp:884
msgid ""
"Texts made using ZRCola have to include in the colophon, foreword, footnote "
"or some other appropriate part of the publication the note below:"
@@ -399,7 +455,7 @@ msgstr ""
"opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
"zapisom:"
#: zrcolagui.cpp:859
#: zrcolagui.cpp:888
msgid ""
"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
"si), developed at the Science and Research Centre of SAZU in Ljubljana "
@@ -409,18 +465,69 @@ msgstr ""
"sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani "
"(http://www.zrc-sazu.si) razvil dr. Peter Weiss."
#: zrcolagui.cpp:900
#: zrcolagui.cpp:929
msgid "Log"
msgstr "Dnevnik"
#: zrcolagui.cpp:916
msgid "&Update"
msgstr "&Posodobi"
#: zrcolagui.cpp:945
msgid "Quit and &Update..."
msgstr "Za&ustavi in posodobi ..."
#: zrcolagui.cpp:921
#: zrcolagui.cpp:947
msgid "Exit this program and launch product update"
msgstr "Zaustavi ta program in zaženi posodobitev izdelka"
#: zrcolagui.cpp:951
msgid "&Close"
msgstr "&Zapri"
#: zrcolagui.cpp:952
msgid "Close this window"
msgstr "Zapri to okno"
#: zrcolagui.cpp:991
msgid "Enter the &character you would like to request:"
msgstr "Vpišite &znak, ki ga želite zahtevati:"
#: zrcolagui.cpp:998
msgid "Decomposed character to request"
msgstr "Razstavljen znak, ki ga zahtevate"
# Please use a double && for final "&" character
#: zrcolagui.cpp:1002
msgid ""
"Please, use the decomposed form.\n"
"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
"it from the Decomposed window."
msgstr ""
"Uporabite razstavljeno obliko.\n"
"Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate "
"in prilepite iz okna z razstavljenim besedilom."
#: zrcolagui.cpp:1012
msgid ""
"The &context, examples or short description why and where the character is "
"required:"
msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:"
#: zrcolagui.cpp:1018
msgid "Additional notes for character request"
msgstr "Dodatne opombe za zahtevo znaka"
#: zrcolagui.cpp:1025
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
"Your e-mail application might not display all the characters correctly, but "
"we'll encode the necessarry information so the Editor will be able to read "
"it correctly."
msgstr ""
"Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim "
"boste lahko oddali zahtevo za novi znak uredniku ZRCole.\n"
"Vaš e-poštni program mogoče ne bo prikazal vseh znakov pravilno, toda mi "
"bomo vse potrebne podatke ustrezno kodirali, da jih bo urednik lahko "
"pravilno prebral."
#: zrcolakeyhndlr.cpp:44
msgid ""
"INS key is pressed. Type the Unicode code of desired character now (up to "
@@ -433,33 +540,178 @@ msgstr ""
msgid "Start ZRCola automatically on logon"
msgstr "Samodejno zaženi ZRColo ob prijavi"
#: zrcolagui.h:275
msgid "Settings"
msgstr "Nastavitve"
#: zrcolaupdater.cpp:94
msgid ""
"This program will now close and the upgrade will be launched.\n"
"Are you sure?"
msgstr ""
"Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
"Ali ste prepričani?"
#: zrcolagui.h:301
msgid "About ZRCola"
msgstr "O ZRColi"
#: zrcolagui.h:324
#: zrcolaupdater.cpp:94 zrcolagui.h:331
msgid "Product Update"
msgstr "Posodabljanje izdelka"
#: zrcolagui.h:243
msgid "Character Search"
msgstr "Poišči znak"
#: zrcolagui.h:280
msgid "Settings"
msgstr "Nastavitve"
#: zrcolagui.h:306
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"
@@ -469,8 +721,9 @@ msgstr "Vnašalni sistem za jezikoslovno rabo"
#~ msgid "&Start on Logon"
#~ msgstr "Z&aženi ob prijavi"
#, fuzzy
#~ msgid "Start this program automatically on logon"
#~ msgstr "Samodejno zaženi ta program ob prijavi"
#~ msgstr "Samodejno zaženi ZRColo ob prijavi"
#~ msgid "Set language according to keyboard layout automatically"
#~ msgstr "Samodejno nastavi jezik glede na izbrano tipkovnico"
@@ -544,8 +797,9 @@ msgstr "Vnašalni sistem za jezikoslovno rabo"
#~ msgid "Shift"
#~ msgstr "Shift"
#, fuzzy
#~ msgid "Alt"
#~ msgstr "Alt"
#~ msgstr "Vse"
#~ msgid "Ctrl"
#~ msgstr "Ctrl"
@@ -619,11 +873,13 @@ msgstr "Vnašalni sistem za jezikoslovno rabo"
#~ msgid "INS"
#~ msgstr "INS"
#, fuzzy
#~ msgid "Character &Groups"
#~ msgstr "Skupine &znakov"
#~ msgstr "Znak"
#, fuzzy
#~ msgid "Language:"
#~ msgstr "Jezik:"
#~ msgstr "Jezik besedila"
#~ msgid "&About"
#~ msgstr "O progr&amu"
@@ -637,27 +893,32 @@ msgstr "Vnašalni sistem za jezikoslovno rabo"
#~ msgid "Inserts text from the clipboard"
#~ msgstr "Vstavi besedilo z odložišča"
#, fuzzy
#~ msgid "&Copy"
#~ msgstr "&Kopiraj"
#~ msgstr "Kopiraj"
#, fuzzy
#~ msgid "&Paste"
#~ msgstr "&Prilepi"
#~ msgstr "Prilepi"
#~ msgid "&File"
#~ msgstr "&Datoteka"
#, fuzzy
#~ msgid "Send Decomposed (F6)"
#~ msgstr "Pošlji razstavljeno (F6)"
#~ msgstr "Pošlji razstavljeno"
#, fuzzy
#~ msgid "Send Composed (F5)"
#~ msgstr "Pošlji sestavljeno (F5)"
#~ msgstr "Pošlji sestavljeno"
#, fuzzy
#~ 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."
#~ "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
#~ "funkcionalnosti ne bo na voljo."
#, fuzzy
#~ msgid "Authentication progress real time monitor"
@@ -708,9 +969,17 @@ msgstr "Vnašalni sistem za jezikoslovno rabo"
#~ msgid "Welcome to wxWidgets!"
#~ msgstr "Dobrodošli v wxWidgets!"
#~ msgid ""
#~ "ZRCola v%s\n"
#~ "Copyright 2015-%s Amebis"
#~ msgstr ""
#~ "ZRCola v%s\n"
#~ "Vse pravice pridržane 2015-%s Amebis"
#~ msgid "▼ Search Options"
#~ msgstr "▼ Možnosti iskanja"
#~ msgid "Less Search Options ▲"
#~ msgstr "Manj možnosti iskanja ▲"
#~ msgid "Character Selector"
#~ msgstr "Izbirnik znaka"
#~ msgid "Display character selector to select character to insert into text"
#~ msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
#~ msgid "C&haracter Selector..."
#~ msgstr "Izbirnik &znaka ..."

View File

@@ -22,8 +22,9 @@
#include "../include/zrcola.h"
#include "zrcolaabout.h"
#include "zrcolaapp.h"
#include "zrcolachrgrid.h"
#include "zrcolachrcatpnl.h"
#include "zrcolachrgrid.h"
#include "zrcolachrreq.h"
#include "zrcolacomppnl.h"
#include "zrcolafrm.h"
#include "zrcolakeyhndlr.h"
@@ -33,6 +34,7 @@
#include <Updater/chkthread.h>
#include <wxex/common.h>
#include <wxex/url.h>
#include <wxex/persist/auimanager.h>
#include <wx/ffile.h>
@@ -43,6 +45,8 @@
#include <wx/valtext.h>
#include <wx/socket.h>
#include <WinStd/MSI.h>
#include <fstream>
#include <string>
#include <utility>

View File

@@ -89,7 +89,7 @@ bool ZRColaApp::OnInit()
}
#endif
std::fstream dat((LPCTSTR)GetDatabasePath(), std::ios_base::in | std::ios_base::binary);
std::fstream dat((LPCTSTR)GetDatabaseFilePath(), std::ios_base::in | std::ios_base::binary);
if (dat.good()) {
if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
ZRCola::recordsize_t size;

View File

@@ -60,10 +60,15 @@ public:
virtual int OnExit();
///
/// \returns Path to ZRCola.zrcdb file
/// \returns Path to database files
///
inline wxString GetDatabasePath() const;
///
/// \returns Path to ZRCola.zrcdb file
///
inline wxString GetDatabaseFilePath() const;
public:
ZRCola::translation_db m_t_db; ///< Translation database
ZRCola::langchar_db m_lc_db; ///< Language character database
@@ -91,12 +96,17 @@ inline wxString ZRColaApp::GetDatabasePath() const
wxString sPath;
if (wxConfigBase::Get()->Read(wxT("DatabasePath"), &sPath)) {
if (!wxEndsWithPathSeparator(sPath))
sPath << wxFILE_SEP_PATH;
sPath += wxFILE_SEP_PATH;
} else {
sPath = wxPathOnly(argv[0]);
sPath << wxT("\\..\\data\\");
sPath += wxT("\\..\\data\\");
}
sPath << wxT("ZRCola.zrcdb");
return sPath;
}
inline wxString ZRColaApp::GetDatabaseFilePath() const
{
return GetDatabasePath() + wxT("ZRCola.zrcdb");
}

View File

@@ -31,7 +31,7 @@ END_EVENT_TABLE()
wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) : wxZRColaCharacterCatalogPanelBase(parent)
{
std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabasePath(), std::ios_base::in | std::ios_base::binary);
std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabaseFilePath(), std::ios_base::in | std::ios_base::binary);
if (dat.good()) {
if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
ZRCola::recordsize_t size;

101
ZRCola/zrcolachrreq.cpp Normal file
View File

@@ -0,0 +1,101 @@
/*
Copyright 2015-2016 Amebis
This file is part of ZRCola.
ZRCola is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ZRCola is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdafx.h"
//////////////////////////////////////////////////////////////////////////
// wxZRColaCharRequest
//////////////////////////////////////////////////////////////////////////
wxZRColaCharRequest::wxZRColaCharRequest(wxWindow* parent) : wxZRColaCharRequestBase(parent)
{
m_character->PushEventHandler(new wxZRColaKeyHandler());
m_context->PushEventHandler(new wxZRColaKeyHandler());
}
wxZRColaCharRequest::~wxZRColaCharRequest()
{
m_context->PopEventHandler(true);
m_character->PopEventHandler(true);
}
void wxZRColaCharRequest::OnOKButtonClick(wxCommandEvent& event)
{
event.Skip();
const wxString chr = m_character->GetValue();
const wxString ctx = m_context->GetValue();
wxString body;
body += _("Character") + wxT(": ");
for (size_t i = 0, i_end = chr.Length(); i < i_end; i++) {
if (chr[i] < 0x7f)
body += chr[i];
else
body += wxString::Format(wxT("(U+%04X)"), chr[i]);
}
body += wxT('\n');
if (!ctx.IsEmpty()) {
body += _("Context") + wxT(": ");
body += ctx;
body += wxT('\n');
}
wxLaunchDefaultBrowser(wxString::Format(wxT("mailto:janos.jezovnik@zrc-sazu.si&subject=%s&body=%s"),
wxURLEncode(wxString((wxString(wxT("[ZRCola] ")) + _("Request a New Character")).ToUTF8())),
wxURLEncode(body.ToUTF8())
));
}
//////////////////////////////////////////////////////////////////////////
// wxPersistentZRColaCharRequest
//////////////////////////////////////////////////////////////////////////
wxPersistentZRColaCharRequest::wxPersistentZRColaCharRequest(wxZRColaCharRequest *wnd) : wxPersistentDialog(wnd)
{
}
void wxPersistentZRColaCharRequest::Save() const
{
wxPersistentDialog::Save();
const wxZRColaCharRequest * const wnd = static_cast<const wxZRColaCharRequest*>(GetWindow());
SaveValue(wxT("character"), wnd->m_character->GetValue());
SaveValue(wxT("context"), wnd->m_context->GetValue());
}
bool wxPersistentZRColaCharRequest::Restore()
{
wxZRColaCharRequest * const wnd = static_cast<wxZRColaCharRequest*>(GetWindow());
wxString str;
if (RestoreValue(wxT("character"), &str))
wnd->m_character->SetValue(str);
if (RestoreValue(wxT("context"), &str))
wnd->m_context->SetValue(str);
return wxPersistentDialog::Restore();
}

65
ZRCola/zrcolachrreq.h Normal file
View File

@@ -0,0 +1,65 @@
/*
Copyright 2015-2016 Amebis
This file is part of ZRCola.
ZRCola is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ZRCola is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
*/
///
/// Forward declarations
///
class wxZRColaCharRequest;
#pragma once
#include "zrcolagui.h"
#include "zrcolakeyhndlr.h"
///
/// ZRCola New Character Request dialog
///
class wxZRColaCharRequest : public wxZRColaCharRequestBase
{
public:
wxZRColaCharRequest(wxWindow* parent);
virtual ~wxZRColaCharRequest();
friend class wxPersistentZRColaCharRequest; // Allow saving/restoring window state.
protected:
virtual void OnOKButtonClick(wxCommandEvent& event);
};
///
/// Supports saving/restoring wxZRColaCharRequest state
///
class wxPersistentZRColaCharRequest : public wxPersistentDialog
{
public:
wxPersistentZRColaCharRequest(wxZRColaCharRequest *wnd);
virtual void Save() const;
virtual bool Restore();
};
inline wxPersistentObject *wxCreatePersistentObject(wxZRColaCharRequest *wnd)
{
return new wxPersistentZRColaCharRequest(wnd);
}

View File

@@ -1,4 +1,4 @@
/*
/*
Copyright 2015-2016 Amebis
This file is part of ZRCola.
@@ -36,6 +36,8 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
{
Connect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this);
m_search_more->SetLabel(_(L"▸ Search Options"));
m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char, wxNUM_VAL_DEFAULT, 4));
// Fill categories.
@@ -169,6 +171,22 @@ void wxZRColaCharSelect::OnSearchText(wxCommandEvent& event)
}
void wxZRColaCharSelect::OnSearchMore(wxHyperlinkEvent& event)
{
event.StopPropagation();
if (m_search_panel->IsShown()) {
m_search_panel->Show(false);
m_search_more->SetLabel(_(L"▸ Search Options"));
} else {
m_search_panel->Show(true);
m_search_more->SetLabel(_(L"▾ Search Options"));
}
this->Layout();
}
void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event)
{
event.StopPropagation();
@@ -221,7 +239,7 @@ void wxZRColaCharSelect::OnSearchComplete(wxThreadEvent& event)
// Display results.
wxString chars;
chars.reserve(m_searchThread->m_hits.size());
for (std::vector< std::pair<unsigned long, wchar_t> >::const_iterator i = m_searchThread->m_hits.cbegin(), i_end = m_searchThread->m_hits.cend(); i != i_end; ++i)
for (std::vector<std::pair<ZRCola::charrank_t, wchar_t> >::const_iterator i = m_searchThread->m_hits.cbegin(), i_end = m_searchThread->m_hits.cend(); i != i_end; ++i)
chars += i->second;
m_gridResults->SetCharacters(chars);
@@ -483,17 +501,17 @@ wxZRColaCharSelect::SearchThread::SearchThread(wxZRColaCharSelect *parent) :
wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
{
ZRColaApp *app = (ZRColaApp*)wxTheApp;
std::map<wchar_t, unsigned long> hits;
std::map<wchar_t, ZRCola::charrank_t> hits;
if (TestDestroy()) return (wxThread::ExitCode)1;
{
// Search by indexes and merge results.
std::map<wchar_t, unsigned long> hits_sub;
std::map<wchar_t, ZRCola::charrank_t> hits_sub;
if (!app->m_chr_db.Search(m_search.c_str(), m_cats, hits, hits_sub, TestDestroyS, this)) return (wxThread::ExitCode)1;
for (std::map<wchar_t, unsigned long>::const_iterator i = hits_sub.cbegin(), i_end = hits_sub.cend(); i != i_end; ++i) {
for (std::map<wchar_t, ZRCola::charrank_t>::const_iterator i = hits_sub.cbegin(), i_end = hits_sub.cend(); i != i_end; ++i) {
if (TestDestroy()) return (wxThread::ExitCode)1;
std::map<wchar_t, unsigned long>::iterator idx = hits.find(i->first);
std::map<wchar_t, ZRCola::charrank_t>::iterator idx = hits.find(i->first);
if (idx == hits.end())
hits.insert(std::make_pair(i->first, i->second / 4));
else
@@ -501,13 +519,23 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
}
}
// Now sort the characters by rank.
m_hits.reserve(hits.size());
for (std::map<wchar_t, unsigned long>::const_iterator i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
// Get best rank.
ZRCola::charrank_t rank_ref = 0;
for (std::map<wchar_t, ZRCola::charrank_t>::const_iterator i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
if (TestDestroy()) return (wxThread::ExitCode)1;
m_hits.push_back(std::make_pair(i->second, i->first));
if (i->second > rank_ref)
rank_ref = i->second;
}
std::qsort(m_hits.data(), m_hits.size(), sizeof(std::pair<unsigned long, wchar_t>), CompareHits);
// Now sort the characters by rank (taking only top 3/4 by rank).
ZRCola::charrank_t rank_threshold = rank_ref*3/4;
m_hits.reserve(hits.size());
for (std::map<wchar_t, ZRCola::charrank_t>::const_iterator i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
if (TestDestroy()) return (wxThread::ExitCode)1;
if (i->second > rank_threshold)
m_hits.push_back(std::make_pair(i->second, i->first));
}
std::qsort(m_hits.data(), m_hits.size(), sizeof(std::pair<ZRCola::charrank_t, wchar_t>), CompareHits);
// Signal the event handler that this thread is going to be destroyed.
// NOTE: here we assume that using the m_parent pointer is safe,
@@ -520,8 +548,8 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
int __cdecl wxZRColaCharSelect::SearchThread::CompareHits(const void *a, const void *b)
{
const std::pair<unsigned long, wchar_t> *_a = (const std::pair<unsigned long, wchar_t>*)a;
const std::pair<unsigned long, wchar_t> *_b = (const std::pair<unsigned long, wchar_t>*)b;
const std::pair<ZRCola::charrank_t, wchar_t> *_a = (const std::pair<ZRCola::charrank_t, wchar_t>*)a;
const std::pair<ZRCola::charrank_t, wchar_t> *_b = (const std::pair<ZRCola::charrank_t, wchar_t>*)b;
if (_a->first > _b->first) return -1;
else if (_a->first < _b->first) return 1;
@@ -563,6 +591,8 @@ void wxPersistentZRColaCharSelect::Save() const
name.Append(cc.id.data, _countof(cc.id.data));
SaveValue(name, wnd->m_categories->IsChecked(i));
}
SaveValue(wxT("searchPanel"), wnd->m_search_panel->IsShown());
}
@@ -583,6 +613,18 @@ bool wxPersistentZRColaCharSelect::Restore()
if (RestoreValue(name, &val))
wnd->m_categories->Check(i, val);
}
bool search_panel;
if (RestoreValue(wxT("searchPanel"), &search_panel)) {
if (search_panel) {
wnd->m_search_panel->Show(true);
wnd->m_search_more->SetLabel(_(L"▾ Search Options"));
} else {
wnd->m_search_panel->Show(false);
wnd->m_search_more->SetLabel(_(L"▸ Search Options"));
}
}
wnd->ResetResults();
return wxPersistentDialog::Restore();

View File

@@ -34,6 +34,7 @@ class wxPersistentZRColaCharSelect;
#include <wx/thread.h>
#include <list>
#include <map>
#include <vector>
wxDECLARE_EVENT(wxEVT_SEARCH_COMPLETE, wxThreadEvent);
@@ -54,6 +55,7 @@ public:
protected:
virtual void OnIdle(wxIdleEvent& event);
virtual void OnSearchText(wxCommandEvent& event);
virtual void OnSearchMore(wxHyperlinkEvent& event);
virtual void OnCategoriesAll(wxHyperlinkEvent& event);
virtual void OnCategoriesNone(wxHyperlinkEvent& event);
virtual void OnCategoriesInvert(wxHyperlinkEvent& event);
@@ -101,7 +103,7 @@ protected:
public:
std::wstring m_search; ///< Search phrase
std::set<ZRCola::chrcatid_t> m_cats; ///< Search categories
std::vector< std::pair<unsigned long, wchar_t> > m_hits; ///< Search results
std::vector<std::pair<ZRCola::charrank_t, wchar_t> > m_hits; ///< Search results
protected:
wxZRColaCharSelect *m_parent; ///< Thread owner

View File

@@ -49,6 +49,9 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
EVT_MENU (wxID_PANEL_CHRGRPS , wxZRColaFrame::OnPanelCharacterCatalog )
EVT_MENU (wxID_FOCUS_CHARACTER_CATALOG , wxZRColaFrame::OnPanelCharacterCatalogFocus )
EVT_MENU (wxID_HELP_INSTRUCTIONS , wxZRColaFrame::OnHelpInstructions )
EVT_MENU (wxID_HELP_SHORTCUTS , wxZRColaFrame::OnHelpShortcuts )
EVT_MENU (wxID_HELP_REQCHAR , wxZRColaFrame::OnHelpReqChar )
EVT_MENU (wxID_HELP_UPDATE , wxZRColaFrame::OnHelpUpdate )
EVT_MENU (wxID_ABOUT , wxZRColaFrame::OnHelpAbout )
@@ -59,6 +62,7 @@ wxZRColaFrame::wxZRColaFrame() :
m_hWndSource(NULL),
m_chrSelect(NULL),
m_settings(NULL),
m_chrReq(NULL),
wxZRColaFrameBase(NULL)
{
{
@@ -96,15 +100,12 @@ wxZRColaFrame::wxZRColaFrame() :
m_chrSelect = new wxZRColaCharSelect(this);
wxPersistentRegisterAndRestore<wxZRColaCharSelect>(m_chrSelect);
m_chrReq = new wxZRColaCharRequest(this);
wxPersistentRegisterAndRestore<wxZRColaCharRequest>(m_chrReq);
// Set focus.
m_panel->m_decomposed->SetFocus();
// Register global hotkey(s).
if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, wxMOD_WIN, VK_F5))
wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
#if defined(__WXMSW__)
// Register notification sink for language detection.
m_ulRefCount = 1;
@@ -134,11 +135,21 @@ wxZRColaFrame::wxZRColaFrame() :
// Restore persistent state of wxAuiManager manually, since m_mgr is not on the heap.
wxPersistentAuiManager(&m_mgr).Restore();
// Register global hotkey(s).
if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, wxMOD_WIN, VK_F5))
wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
}
wxZRColaFrame::~wxZRColaFrame()
{
// Unregister global hotkey(s).
UnregisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE);
UnregisterHotKey(wxZRColaHKID_INVOKE_COMPOSE);
#if defined(__WXMSW__)
if (m_tfSource) {
m_tfSource->UnadviseSink(m_dwCookie);
@@ -146,9 +157,8 @@ wxZRColaFrame::~wxZRColaFrame()
}
#endif
// Unregister global hotkey(s).
UnregisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE);
UnregisterHotKey(wxZRColaHKID_INVOKE_COMPOSE);
if (m_chrReq)
delete m_chrReq;
if (m_chrSelect)
delete m_chrSelect;
@@ -336,9 +346,39 @@ void wxZRColaFrame::OnPanelCharacterCatalogFocus(wxCommandEvent& event)
}
void wxZRColaFrame::OnHelpInstructions(wxCommandEvent& event)
{
wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/en/info/instructions/"));
}
void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event)
{
winstd::tstring pdf_path;
#ifdef __WXMSW__
// Search and try to launch installed PDF.
INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(ZRCOLA_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path);
if ((pdf_is == INSTALLSTATE_LOCAL || pdf_is == INSTALLSTATE_SOURCE) &&
wxFileExists(pdf_path) &&
(int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
#endif
// Search and try to launch local PDF copy.
ZRColaApp *app = (ZRColaApp*)wxTheApp;
pdf_path = app->GetDatabasePath();
pdf_path += _T("ZRCola_keyboard.pdf");
if (wxFileExists(pdf_path) &&
(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"));
}
void wxZRColaFrame::OnHelpReqChar(wxCommandEvent& event)
{
wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/en/contact/"));
m_chrReq->ShowModal();
}

View File

@@ -27,6 +27,7 @@ class wxZRColaFrame;
#include "zrcolagui.h"
#include "zrcolachrslct.h"
#include "zrcolachrreq.h"
#include "zrcolasettings.h"
#include <zrcola/language.h>
#include <wx/taskbar.h>
@@ -85,6 +86,8 @@ protected:
void OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event);
void OnPanelCharacterCatalog(wxCommandEvent& event);
void OnPanelCharacterCatalogFocus(wxCommandEvent& event);
void OnHelpInstructions(wxCommandEvent& event);
void OnHelpShortcuts(wxCommandEvent& event);
void OnHelpReqChar(wxCommandEvent& event);
void OnHelpUpdate(wxCommandEvent& event);
void OnHelpAbout(wxCommandEvent& event);
@@ -118,6 +121,7 @@ protected:
WXHWND m_hWndSource; ///< Handle of the active window, when the ZRCola hotkey was pressed
wxTaskBarIcon *m_taskBarIcon; ///< Taskbar icon
wxZRColaCharSelect *m_chrSelect; ///< Character selection dialog
wxZRColaCharRequest *m_chrReq; ///< Request a New Character dialog
wxZRColaSettings *m_settings; ///< Configuration dialog
};

View File

@@ -75,7 +75,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
m_menuEdit->AppendSeparator();
wxMenuItem* m_menuCharSelect;
m_menuCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("C&haracter Selector...") ) + wxT('\t') + wxT("F8"), _("Display character selector to select character to insert into text"), wxITEM_NORMAL );
m_menuCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Display character search to select character to insert into text"), wxITEM_NORMAL );
#ifdef __WXMSW__
m_menuCharSelect->SetBitmaps( wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -138,6 +138,16 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
m_menubar->Append( m_menuView, _("&View") );
m_menuHelp = new wxMenu();
wxMenuItem* m_menuHelpInstructions;
m_menuHelpInstructions = new wxMenuItem( m_menuHelp, wxID_HELP_INSTRUCTIONS, wxString( _("&Instructions...") ) + wxT('\t') + wxT("F1"), _("Open a web site with product instructions"), wxITEM_NORMAL );
m_menuHelp->Append( m_menuHelpInstructions );
wxMenuItem* m_menuHelpShortcuts;
m_menuHelpShortcuts = new wxMenuItem( m_menuHelp, wxID_HELP_SHORTCUTS, wxString( _("Keyboard &Shortcuts...") ) , _("Open a list of keyboard shortcuts"), wxITEM_NORMAL );
m_menuHelp->Append( m_menuHelpShortcuts );
m_menuHelp->AppendSeparator();
wxMenuItem* m_menuHelpReqChar;
m_menuHelpReqChar = new wxMenuItem( m_menuHelp, wxID_HELP_REQCHAR, wxString( _("&Request a new character...") ) , _("Submit a request to ZRC to add a new character"), wxITEM_NORMAL );
m_menuHelp->Append( m_menuHelpReqChar );
@@ -167,7 +177,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
m_toolbarCompose = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
m_toolCharSelect = m_toolbarCompose->AddTool( wxID_CHARACTER_SELECTOR, _("Character Selector"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Character Selector"), _("Display character selector to select character to insert into text"), NULL );
m_toolCharSelect = m_toolbarCompose->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Find Character"), _("Display character search to select character to insert into text"), NULL );
m_toolSendComposed = m_toolbarCompose->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL );
@@ -419,32 +429,49 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 );
m_search_more = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Search Options"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_search_more->SetToolTip( _("Shows/hides additional search options") );
sbSizerBrowse->Add( m_search_more, 0, wxALL|wxEXPAND, 5 );
m_search_panel = new wxPanel( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_search_panel->Hide();
wxBoxSizer* sbSizerSearch;
sbSizerSearch = new wxBoxSizer( wxVERTICAL );
wxArrayString m_categoriesChoices;
m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
m_categories = new wxCheckListBox( m_search_panel, wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
m_categories->SetToolTip( _("List of Unicode character categories to search in") );
sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
sbSizerSearch->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
wxBoxSizer* bSizerCategoriesCtrl;
bSizerCategoriesCtrl = new wxBoxSizer( wxHORIZONTAL );
m_categoriesAll = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesAll = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesAll->SetToolTip( _("Select all categories") );
bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, 5 );
m_categoriesNone = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesNone = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesNone->SetToolTip( _("Clear category selection") );
bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, 5 );
m_categoriesInvert = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesInvert = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_categoriesInvert->SetToolTip( _("Invert category selection") );
bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, 5 );
sbSizerBrowse->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 );
sbSizerSearch->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 );
m_search_panel->SetSizer( sbSizerSearch );
m_search_panel->Layout();
sbSizerSearch->Fit( m_search_panel );
sbSizerBrowse->Add( m_search_panel, 0, wxEXPAND, 5 );
m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSTATIC_BORDER );
@@ -670,6 +697,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
// Connect Events
this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) );
m_search->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this );
m_search_more->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnSearchMore ), NULL, this );
m_categories->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
m_categoriesAll->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this );
m_categoriesNone->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this );
@@ -693,6 +721,7 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
// Disconnect Events
this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) );
m_search->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this );
m_search_more->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnSearchMore ), NULL, this );
m_categories->Disconnect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this );
m_categoriesAll->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this );
m_categoriesNone->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this );
@@ -838,7 +867,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
m_staticTextVersion->Wrap( -1 );
bSizerText->Add( m_staticTextVersion, 0, wxALL|wxEXPAND, 5 );
m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Editor: Janoš Ježovnik\nDevelopment: Amebis d. o. o.\nDevelopment and maintenance (2004-2015): dr. Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Program and Website Editor: Janoš Ježovnik\nDevelopment: Amebis, d. o. o., Kamnik\nDevelopment and maintenance (2004-2015): dr. Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextColophone->Wrap( -1 );
bSizerText->Add( m_staticTextColophone, 0, wxALL|wxEXPAND, 5 );
@@ -846,11 +875,11 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
m_staticTextCopyright->Wrap( -1 );
bSizerText->Add( m_staticTextCopyright, 0, wxALL|wxEXPAND, 5 );
m_hyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("www.zrc-sazu.si"), wxT("http://www.zrc-sazu.si/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_hyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("zrcola.zrc-sazu.si"), wxT("http://zrcola.zrc-sazu.si/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
bSizerText->Add( m_hyperlink, 0, wxALL|wxEXPAND, 5 );
bSizerText->Add( 0, 10, 1, wxEXPAND, 5 );
bSizerText->Add( 0, 0, 0, wxALL|wxEXPAND, 5 );
m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDeclaration->Wrap( 400 );
@@ -913,12 +942,15 @@ wxZRColaUpdaterBase::wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id, const
wxBoxSizer* bSizerButtons;
bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
m_buttonUpdate = new wxButton( this, wxID_ANY, _("&Update"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonUpdate = new wxButton( this, wxID_ANY, _("Quit and &Update..."), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonUpdate->Enable( false );
m_buttonUpdate->SetToolTip( _("Exit this program and launch product update") );
bSizerButtons->Add( m_buttonUpdate, 0, wxALL, 5 );
m_buttonClose = new wxButton( this, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonClose->SetToolTip( _("Close this window") );
bSizerButtons->Add( m_buttonClose, 0, wxALL, 5 );
@@ -932,12 +964,94 @@ wxZRColaUpdaterBase::wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id, const
this->Centre( wxBOTH );
// Connect Events
this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaUpdaterBase::OnIdle ) );
m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this );
m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnClose ), NULL, this );
}
wxZRColaUpdaterBase::~wxZRColaUpdaterBase()
{
// Disconnect Events
this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaUpdaterBase::OnIdle ) );
m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this );
m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnClose ), NULL, this );
}
wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerContent;
bSizerContent = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizerCharacter;
sbSizerCharacter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Character") ), wxVERTICAL );
m_characterLbl = new wxStaticText( sbSizerCharacter->GetStaticBox(), wxID_ANY, _("Enter the &character you would like to request:"), wxDefaultPosition, wxDefaultSize, 0 );
m_characterLbl->Wrap( 400 );
sbSizerCharacter->Add( m_characterLbl, 0, wxALL|wxEXPAND, 5 );
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->SetToolTip( _("Decomposed character to request") );
sbSizerCharacter->Add( m_character, 0, wxALL|wxEXPAND, 5 );
m_characterNote = new wxStaticText( sbSizerCharacter->GetStaticBox(), wxID_ANY, _("Please, use the decomposed form.\nYou can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."), wxDefaultPosition, wxDefaultSize, 0 );
m_characterNote->Wrap( 400 );
sbSizerCharacter->Add( m_characterNote, 0, wxALL|wxEXPAND, 5 );
bSizerContent->Add( sbSizerCharacter, 40, wxALL|wxEXPAND, 5 );
wxStaticBoxSizer* sbSizerContext;
sbSizerContext = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Context") ), wxVERTICAL );
m_contextLbl = new wxStaticText( sbSizerContext->GetStaticBox(), wxID_ANY, _("The &context, examples or short description why and where the character is required:"), wxDefaultPosition, wxDefaultSize, 0 );
m_contextLbl->Wrap( 400 );
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->SetToolTip( _("Additional notes for character request") );
sbSizerContext->Add( m_context, 1, wxALL|wxEXPAND, 5 );
bSizerContent->Add( sbSizerContext, 60, wxALL|wxEXPAND, 5 );
m_note = new wxStaticText( this, wxID_ANY, _("After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\nYour e-mail application might not display all the characters correctly, but we'll encode the necessarry information so the Editor will be able to read it correctly."), wxDefaultPosition, wxDefaultSize, 0 );
m_note->Wrap( 400 );
bSizerContent->Add( m_note, 0, wxALL|wxEXPAND, 5 );
bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, 5 );
m_sdbSizerButtons = new wxStdDialogButtonSizer();
m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
m_sdbSizerButtons->Realize();
bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 );
this->SetSizer( bSizerContent );
this->Layout();
bSizerContent->Fit( this );
this->Centre( wxBOTH );
// Connect Events
m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this );
}
wxZRColaCharRequestBase::~wxZRColaCharRequestBase()
{
// Disconnect Events
m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this );
}

View File

@@ -38,8 +38,8 @@ class wxZRColaComposerPanel;
#include <wx/choice.h>
#include <wx/grid.h>
#include <wx/srchctrl.h>
#include <wx/checklst.h>
#include <wx/hyperlink.h>
#include <wx/checklst.h>
#include <wx/stattext.h>
#include <wx/button.h>
#include <wx/dialog.h>
@@ -70,6 +70,8 @@ class wxZRColaFrameBase : public wxFrame
wxID_TOOLBAR_EDIT,
wxID_TOOLBAR_COMPOSE,
wxID_PANEL_CHRGRPS,
wxID_HELP_INSTRUCTIONS,
wxID_HELP_SHORTCUTS,
wxID_HELP_REQCHAR,
wxID_HELP_UPDATE
};
@@ -193,6 +195,8 @@ class wxZRColaCharSelectBase : public wxDialog
protected:
wxSearchCtrl* m_search;
wxHyperlinkCtrl* m_search_more;
wxPanel* m_search_panel;
wxCheckListBox* m_categories;
wxHyperlinkCtrl* m_categoriesAll;
wxHyperlinkCtrl* m_categoriesNone;
@@ -215,6 +219,7 @@ class wxZRColaCharSelectBase : public wxDialog
// Virtual event handlers, overide them in your derived class
virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); }
virtual void OnSearchMore( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCategoriesAll( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnCategoriesNone( wxHyperlinkEvent& event ) { event.Skip(); }
@@ -235,7 +240,7 @@ class wxZRColaCharSelectBase : public wxDialog
public:
wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Selector"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") );
wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") );
~wxZRColaCharSelectBase();
};
@@ -316,7 +321,9 @@ class wxZRColaUpdaterBase : public wxDialog
wxButton* m_buttonClose;
// Virtual event handlers, overide them in your derived class
virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); }
virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
public:
@@ -326,4 +333,33 @@ class wxZRColaUpdaterBase : public wxDialog
};
///////////////////////////////////////////////////////////////////////////////
/// Class wxZRColaCharRequestBase
///////////////////////////////////////////////////////////////////////////////
class wxZRColaCharRequestBase : public wxDialog
{
private:
protected:
wxStaticText* m_characterLbl;
wxTextCtrl* m_character;
wxStaticText* m_characterNote;
wxStaticText* m_contextLbl;
wxTextCtrl* m_context;
wxStaticText* m_note;
wxStdDialogButtonSizer* m_sdbSizerButtons;
wxButton* m_sdbSizerButtonsOK;
wxButton* m_sdbSizerButtonsCancel;
// Virtual event handlers, overide them in your derived class
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
public:
wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") );
~wxZRColaCharRequestBase();
};
#endif //__ZRCOLAGUI_H__

View File

@@ -25,6 +25,8 @@ class wxZRColaKeyHandler;
#pragma once
#include <zrcolaui/keyboard.h>
#include <wx/event.h>
#include <vector>

View File

@@ -28,6 +28,7 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
m_logLevelOrig(wxLOG_Warning),
m_logOrig(NULL),
m_updater(NULL),
m_finished(false),
wxZRColaUpdaterBase(parent)
{
// Setup logging.
@@ -35,17 +36,17 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
m_logLevelOrig = wxLog::GetLogLevel();
wxLog::SetLogLevel(wxLOG_Info);
// Connect events.
Connect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
//// Connect events.
//Connect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
// Launch Updater thread.
// Prepare Updater.
ZRColaApp *app = (ZRColaApp*)wxTheApp;
m_updater = new wxUpdCheckThread(app->m_locale.GetCanonicalName(), this);
if (m_updater->Run() != wxTHREAD_NO_ERROR) {
wxFAIL_MSG(wxT("Can't create the thread!"));
delete m_updater;
m_updater = NULL;
}
//if (m_updater->Run() != wxTHREAD_NO_ERROR) {
// wxFAIL_MSG(wxT("Can't create the thread!"));
// delete m_updater;
// m_updater = NULL;
//}
}
@@ -53,11 +54,12 @@ wxZRColaUpdater::~wxZRColaUpdater()
{
if (m_updater) {
// Terminate the Updater thread.
m_updater->Delete();
//m_updater->Delete();
delete m_updater;
}
// Disconnect events.
Disconnect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
//// Disconnect events.
//Disconnect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
wxLog::SetLogLevel(m_logLevelOrig);
if (m_logOrig) {
@@ -67,11 +69,20 @@ wxZRColaUpdater::~wxZRColaUpdater()
}
void wxZRColaUpdater::OnCheckComplete(wxThreadEvent& event)
{
event.Skip();
//void wxZRColaUpdater::OnCheckComplete(wxThreadEvent& event)
//{
// event.Skip();
//
// m_buttonUpdate->Enable(event.GetInt() == wxUpdCheckThread::wxUpdUpdateAvailable);
//}
m_buttonUpdate->Enable(event.GetInt() == wxUpdCheckThread::wxUpdUpdateAvailable);
void wxZRColaUpdater::OnIdle(wxIdleEvent& event)
{
if (!m_finished) {
m_buttonUpdate->Enable(m_updater->CheckForUpdate() == wxUpdCheckThread::wxUpdUpdateAvailable);
m_finished = true;
}
}
@@ -79,6 +90,21 @@ void wxZRColaUpdater::OnUpdate(wxCommandEvent& event)
{
event.Skip();
if (m_updater)
m_updater->LaunchUpdate();
if (m_updater) {
if (wxMessageBox(_("This program will now close and the upgrade will be launched.\nAre you sure?"), _("Product Update"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this) == wxYES) {
m_updater->LaunchUpdate();
Close(true);
((ZRColaApp*)wxTheApp)->m_mainWnd->Close();
}
}
}
void wxZRColaUpdater::OnClose(wxCommandEvent& event)
{
if (m_updater)
m_updater->Abort();
event.Skip();
}

View File

@@ -42,11 +42,14 @@ public:
virtual ~wxZRColaUpdater();
protected:
void OnCheckComplete(wxThreadEvent& event);
//void OnCheckComplete(wxThreadEvent& event);
virtual void OnIdle(wxIdleEvent& event);
virtual void OnUpdate(wxCommandEvent& event);
virtual void OnClose(wxCommandEvent& event);
protected:
wxLogLevel m_logLevelOrig; ///< Original log level
wxLog *m_logOrig; ///< Original log
wxUpdCheckThread *m_updater; ///< Updater thread
bool m_finished; ///< Is Updater finished?
};

View File

@@ -300,7 +300,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comCharacterGroup)));
wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_ActiveConnection(ATL::CComVariant(m_db))));
wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandType(adCmdText)));
wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [Znak] FROM [VRS_SkupineZnakov] WHERE [Skupina]=? ORDER BY [Rang] ASC, [Znak] ASC"))));
wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [VRS_SkupineZnakov].[Znak] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
{
// Create and add command parameters.
ATL::CComPtr<ADOParameters> params;

View File

@@ -120,7 +120,7 @@ int _tmain(int argc, _TCHAR *argv[])
db.data .reserve(count*4);
// Parse translations and build index and data.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read translation from the database.
if (src.GetTranslation(rs, trans)) {
// Add translation to index and data.
@@ -137,8 +137,6 @@ int _tmain(int argc, _TCHAR *argv[])
db.idxDecomp.push_back(idx);
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Sort indices.
@@ -172,7 +170,7 @@ int _tmain(int argc, _TCHAR *argv[])
db.data .reserve(count*4);
// Parse key sequences and build index and data.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read key sequence from the database.
if (src.GetKeySequence(rs, ks)) {
// Add key sequence to index and data.
@@ -193,8 +191,6 @@ int _tmain(int argc, _TCHAR *argv[])
db.idxKey.push_back(idx);
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Sort indices.
@@ -240,9 +236,12 @@ int _tmain(int argc, _TCHAR *argv[])
db.data .reserve(count*4);
// Parse languages and build index and data.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read language from the database.
if (src.GetLanguage(rs, lang)) {
if (build_pot)
pot.insert(lang.name);
// Add language to index and data.
unsigned __int32 idx = db.data.size();
for (wstring::size_type i = 0; i < sizeof(ZRCola::langid_t)/sizeof(unsigned __int16); i++)
@@ -253,12 +252,8 @@ int _tmain(int argc, _TCHAR *argv[])
for (wstring::size_type i = 0; i < n; i++)
db.data.push_back(lang.name[i]);
db.idxLng.push_back(idx);
if (build_pot)
pot.insert(lang.name);
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Sort indices.
@@ -293,7 +288,7 @@ int _tmain(int argc, _TCHAR *argv[])
db.data .reserve(count*4);
// Parse language characters and build index and data.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read language characters from the database.
if (src.GetLanguageCharacter(rs, lc)) {
// Add language characters to index and data.
@@ -307,8 +302,6 @@ int _tmain(int argc, _TCHAR *argv[])
#endif
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Sort indices.
@@ -343,9 +336,17 @@ int _tmain(int argc, _TCHAR *argv[])
db.data .reserve(count*4);
// Parse character groups and build index and data.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read character group from the database.
if (src.GetCharacterGroup(rs, cg)) {
if (build_pot)
pot.insert(cg.name);
if (cg.chars.empty()) {
// Skip empty character groups.
continue;
}
// Add character group to index and data.
unsigned __int32 idx = db.data.size();
wxASSERT_MSG((int)0xffff8000 <= cg.id && cg.id <= (int)0x00007fff, wxT("character group ID out of bounds"));
@@ -363,12 +364,8 @@ int _tmain(int argc, _TCHAR *argv[])
for (wstring::size_type i = 0; i < n_char; i++)
db.data.push_back(cg.chars[i]);
db.idxRnk.push_back(idx);
if (build_pot)
pot.insert(cg.name);
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Sort indices.
@@ -399,7 +396,7 @@ int _tmain(int argc, _TCHAR *argv[])
ZRCola::DBSource::character_bank chrs;
// Phase 1: Parse characters and build indexes.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read character from the database.
unique_ptr<ZRCola::DBSource::character> c(new ZRCola::DBSource::character);
if (src.GetCharacter(rs, *c)) {
@@ -407,8 +404,6 @@ int _tmain(int argc, _TCHAR *argv[])
chrs[chr.chr].swap(c);
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Phase 2: Build related character lists.
@@ -484,31 +479,32 @@ int _tmain(int argc, _TCHAR *argv[])
db.data .reserve(count*4);
// Parse character categories and build index and data.
while (!ZRCola::DBSource::IsEOF(rs)) {
for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
// Read character category from the database.
if (src.GetCharacterCategory(rs, cc)) {
if (categories_used.find(cc.id) != categories_used.end()) {
// Add character category to index and data.
unsigned __int32 idx = db.data.size();
for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++)
db.data.push_back(((const unsigned __int16*)cc.id.data)[i]);
wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
db.data.push_back((unsigned __int16)cc.rank);
wstring::size_type n_name = cc.name.length();
wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long"));
db.data.push_back((unsigned __int16)n_name);
for (wstring::size_type i = 0; i < n_name; i++)
db.data.push_back(cc.name[i]);
db.idxChrCat.push_back(idx);
db.idxRnk .push_back(idx);
if (build_pot)
pot.insert(cc.name);
} else
_ftprintf(stderr, wxT("%s: warning ZCC0019: Ommiting empty category %ls.\n"), (LPCTSTR)filenameIn.c_str(), (LPCWSTR)cc.name.c_str());
if (build_pot)
pot.insert(cc.name);
if (categories_used.find(cc.id) == categories_used.end()) {
// Skip empty character categories.
continue;
}
// Add character category to index and data.
unsigned __int32 idx = db.data.size();
for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++)
db.data.push_back(((const unsigned __int16*)cc.id.data)[i]);
wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
db.data.push_back((unsigned __int16)cc.rank);
wstring::size_type n_name = cc.name.length();
wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long"));
db.data.push_back((unsigned __int16)n_name);
for (wstring::size_type i = 0; i < n_name; i++)
db.data.push_back(cc.name[i]);
db.idxChrCat.push_back(idx);
db.idxRnk .push_back(idx);
} else
has_errors = true;
wxVERIFY(SUCCEEDED(rs->MoveNext()));
}
// Sort indices.

View File

@@ -24,7 +24,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_PropertySheetDisplayName>ZRCola Win32</_PropertySheetDisplayName>
<LibraryPath>$(WX_INSTALL_PATH)\lib\vc$(PlatformToolsetVersion)_dll;$(LibraryPath)</LibraryPath>
<LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_dll;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Lib>

View File

@@ -26,8 +26,8 @@
<IntDir>temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>
<_PropertySheetDisplayName>ZRCola Common</_PropertySheetDisplayName>
<OutDir>temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</OutDir>
<IncludePath>$(WX_INSTALL_PATH)\include\msvc;$(WX_INSTALL_PATH)\include;$(IncludePath)</IncludePath>
<SourcePath>$(WX_INSTALL_PATH)\src\aui;$(WX_INSTALL_PATH)\src\cocoa;$(WX_INSTALL_PATH)\src\common;$(WX_INSTALL_PATH)\src\dfb;$(WX_INSTALL_PATH)\src\expat;$(WX_INSTALL_PATH)\src\generic;$(WX_INSTALL_PATH)\src\gtk;$(WX_INSTALL_PATH)\src\gtk1;$(WX_INSTALL_PATH)\src\html;$(WX_INSTALL_PATH)\src\jpeg;$(WX_INSTALL_PATH)\src\motif;$(WX_INSTALL_PATH)\src\msdos;$(WX_INSTALL_PATH)\src\msw;$(WX_INSTALL_PATH)\src\os2;$(WX_INSTALL_PATH)\src\osx;$(WX_INSTALL_PATH)\src\png;$(WX_INSTALL_PATH)\src\propgrid;$(WX_INSTALL_PATH)\src\regex;$(WX_INSTALL_PATH)\src\ribbon;$(WX_INSTALL_PATH)\src\richtext;$(WX_INSTALL_PATH)\src\stc;$(WX_INSTALL_PATH)\src\tiff;$(WX_INSTALL_PATH)\src\univ;$(WX_INSTALL_PATH)\src\unix;$(WX_INSTALL_PATH)\src\x11;$(WX_INSTALL_PATH)\src\xml;$(WX_INSTALL_PATH)\src\xrc;$(WX_INSTALL_PATH)\src\zlib;$(SourcePath)</SourcePath>
<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>
<ItemDefinitionGroup>
<ClCompile>

View File

@@ -24,7 +24,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_PropertySheetDisplayName>ZRCola x64</_PropertySheetDisplayName>
<LibraryPath>$(WX_INSTALL_PATH)\lib\vc$(PlatformToolsetVersion)_x64_dll;$(LibraryPath)</LibraryPath>
<LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_dll;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Lib>

View File

@@ -23,7 +23,7 @@
// Product version as a single DWORD
// Note: Used for version comparison within C/C++ code.
//
#define ZRCOLA_VERSION 0x01ff0a00
#define ZRCOLA_VERSION 0x01ff0d00
//
// Product version by components
@@ -33,26 +33,26 @@
//
#define ZRCOLA_VERSION_MAJ 1
#define ZRCOLA_VERSION_MIN 255
#define ZRCOLA_VERSION_REV 10
#define ZRCOLA_VERSION_REV 13
#define ZRCOLA_VERSION_BUILD 0
//
// Human readable product version and build year for UI
//
#define ZRCOLA_VERSION_STR "2.0-beta2"
#define ZRCOLA_VERSION_STR "2.0-beta5"
#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.10"
#define ZRCOLA_VERSION_INST "1.255.13"
//
// 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 "{9E9D6C73-A404-4BD2-94EC-91E861ECE7D3}"
#define ZRCOLA_VERSION_GUID "{E3BC491A-D30B-47E6-9C91-7D2034E21024}"
//
// The product vendor and application name for configuration keeping.

1
lib/WinStd Submodule

Submodule lib/WinStd added at f688509e5f

View File

@@ -36,6 +36,11 @@
namespace ZRCola {
///
/// Character rank type
///
typedef double charrank_t;
///
/// Character category ID type
/// Two letter abbreviation, non-terminated
@@ -237,7 +242,7 @@ namespace ZRCola {
/// \param[in] fn_abort Pointer to function to periodically test for search cancellation
/// \param[in] cookie Cookie for \p fn_abort call
///
bool Search(_In_z_ const wchar_t *str, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, unsigned long> &hits, _Inout_ std::map<wchar_t, unsigned long> &hits_sub, _In_opt_ bool (__cdecl *fn_abort)(void *cookie) = NULL, _In_opt_ void *cookie = NULL) const;
bool Search(_In_z_ const wchar_t *str, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, charrank_t> &hits, _Inout_ std::map<wchar_t, charrank_t> &hits_sub, _In_opt_ bool (__cdecl *fn_abort)(void *cookie) = NULL, _In_opt_ void *cookie = NULL) const;
///
/// Get character category

View File

@@ -20,7 +20,7 @@
#include "stdafx.h"
bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, unsigned long> &hits, _Inout_ std::map<wchar_t, unsigned long> &hits_sub, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const
bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, charrank_t> &hits, _Inout_ std::map<wchar_t, charrank_t> &hits_sub, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const
{
assert(str);
@@ -77,13 +77,13 @@ bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set
if (fn_abort && fn_abort(cookie)) return false;
wchar_t c = data[i];
if (cats.find(GetCharCat(c)) != cats.end()) {
std::map<wchar_t, unsigned long>::iterator idx = hits.find(c);
std::map<wchar_t, charrank_t>::iterator idx = hits.find(c);
if (idx == hits.end()) {
// New character.
hits.insert(std::make_pair(data[i], 1));
hits.insert(std::make_pair(data[i], 1.0/len));
} else {
// Increment existing character.
idx->second++;
// Increase rating of existing character.
idx->second += 1.0/len;
}
}
}
@@ -95,13 +95,13 @@ bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set
if (fn_abort && fn_abort(cookie)) return false;
wchar_t c = data[i];
if (cats.find(GetCharCat(c)) != cats.end()) {
std::map<wchar_t, unsigned long>::iterator idx = hits_sub.find(c);
std::map<wchar_t, charrank_t>::iterator idx = hits_sub.find(c);
if (idx == hits_sub.end()) {
// New character.
hits_sub.insert(std::make_pair(data[i], 1));
hits_sub.insert(std::make_pair(data[i], 1.0/len));
} else {
// Increment existing character.
idx->second++;
// Increase rating of existing character.
idx->second += 1.0/len;
}
}
}

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1,5 @@
*/libZRColaUI.mo
*/wxExtend12.mo
*/wxExtend13.mo
*/Updater10.mo
*/ZRCola.mo
*/ZRColaCompile.mo

View File

@@ -5,11 +5,14 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: ZRColaCompile 2.0-beta1\n"
"X-Generator: ZRColaCompile 2.0-beta4\n"
msgid "Albanian"
msgstr ""
msgid "Arabic"
msgstr ""
msgid "Arrows"
msgstr ""
@@ -34,18 +37,30 @@ msgstr ""
msgid "Combine Over"
msgstr ""
msgid "Combining Marks"
msgstr ""
msgid "Croatian"
msgstr ""
msgid "Currencies"
msgstr ""
msgid "Cyrillic"
msgstr ""
msgid "Czech"
msgstr ""
msgid "Danish"
msgstr ""
msgid "Diacritics"
msgstr ""
msgid "Encircled Characters"
msgstr ""
msgid "English"
msgstr ""
@@ -61,9 +76,21 @@ msgstr ""
msgid "Friulian"
msgstr ""
msgid "Geometrical Shapes"
msgstr ""
msgid "German"
msgstr ""
msgid "Glagolitic"
msgstr ""
msgid "Greek"
msgstr ""
msgid "Hebrew"
msgstr ""
msgid "Hungarian"
msgstr ""
@@ -73,6 +100,99 @@ msgstr ""
msgid "Joined"
msgstr ""
msgid "Joined strings with A"
msgstr ""
msgid "Joined strings with B"
msgstr ""
msgid "Joined strings with C"
msgstr ""
msgid "Joined strings with D"
msgstr ""
msgid "Joined strings with E"
msgstr ""
msgid "Joined strings with F"
msgstr ""
msgid "Joined strings with G"
msgstr ""
msgid "Joined strings with H"
msgstr ""
msgid "Joined strings with I"
msgstr ""
msgid "Joined strings with J"
msgstr ""
msgid "Joined strings with K"
msgstr ""
msgid "Joined strings with L"
msgstr ""
msgid "Joined strings with M"
msgstr ""
msgid "Joined strings with N"
msgstr ""
msgid "Joined strings with O"
msgstr ""
msgid "Joined strings with P"
msgstr ""
msgid "Joined strings with Q"
msgstr ""
msgid "Joined strings with R"
msgstr ""
msgid "Joined strings with S"
msgstr ""
msgid "Joined strings with T"
msgstr ""
msgid "Joined strings with U"
msgstr ""
msgid "Joined strings with V"
msgstr ""
msgid "Joined strings with W"
msgstr ""
msgid "Joined strings with X"
msgstr ""
msgid "Joined strings with Y"
msgstr ""
msgid "Joined strings with Z"
msgstr ""
msgid "Joined strings with a"
msgstr ""
msgid "Joined strings with e"
msgstr ""
msgid "Joined strings with i"
msgstr ""
msgid "Joined strings with o"
msgstr ""
msgid "Joined strings with u"
msgstr ""
msgid "Kashubian"
msgstr ""
@@ -208,6 +328,12 @@ msgstr ""
msgid "Mark, Non-Spacing"
msgstr ""
msgid "Mark, Spacing Combining"
msgstr ""
msgid "Mathematical And Physical Characters"
msgstr ""
msgid "Metric"
msgstr ""
@@ -220,6 +346,9 @@ msgstr ""
msgid "Moldavian Latinic"
msgstr ""
msgid "Musical Characters"
msgstr ""
msgid "Norwegian"
msgstr ""
@@ -262,15 +391,21 @@ msgstr ""
msgid "Number, Other"
msgstr ""
msgid "Numbers"
msgstr ""
msgid "Numbers - Circled"
msgstr ""
msgid "Other modifiers"
msgid "Other Modifiers"
msgstr ""
msgid "Other, Format"
msgstr ""
msgid "Other, Surrogate"
msgstr ""
msgid "Parentheses"
msgstr ""
@@ -280,6 +415,9 @@ msgstr ""
msgid "Portuguese"
msgstr ""
msgid "Punctuation"
msgstr ""
msgid "Punctuation, Close"
msgstr ""
@@ -310,6 +448,12 @@ msgstr ""
msgid "Russian"
msgstr ""
msgid "Separator, Line"
msgstr ""
msgid "Separator, Paragraph"
msgstr ""
msgid "Separator, Space"
msgstr ""
@@ -322,12 +466,18 @@ msgstr ""
msgid "Slovak"
msgstr ""
msgid "Slovene Historical Writings"
msgstr ""
msgid "Slovenian"
msgstr ""
msgid "Sorbian"
msgstr ""
msgid "Spaces"
msgstr ""
msgid "Spanish"
msgstr ""
@@ -337,6 +487,12 @@ msgstr ""
msgid "Strokes"
msgstr ""
msgid "Subscript Characters"
msgstr ""
msgid "Superscript Sharacters"
msgstr ""
msgid "Surrounded"
msgstr ""
@@ -391,11 +547,20 @@ msgstr ""
msgid "Symbol, Other"
msgstr ""
msgid "Technical Characters"
msgstr ""
msgid "Transliterated"
msgstr ""
msgid "Transliterating Marks"
msgstr ""
msgid "Turkish"
msgstr ""
msgid "Ukrainian"
msgstr ""
msgid "Units"
msgstr ""

Binary file not shown.

View File

@@ -9,13 +9,17 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
msgid "Albanian"
msgstr ""
#, fuzzy
msgid "Arabic"
msgstr "Arabisch"
msgid "Arrows"
msgstr ""
@@ -40,18 +44,31 @@ msgstr ""
msgid "Combine Over"
msgstr ""
msgid "Combining Marks"
msgstr ""
msgid "Croatian"
msgstr ""
msgid "Currencies"
msgstr ""
#, fuzzy
msgid "Cyrillic"
msgstr "Windows Kyrillisch (CP 1251)"
msgid "Czech"
msgstr ""
msgid "Danish"
msgstr ""
msgid "Diacritics"
msgstr ""
msgid "Encircled Characters"
msgstr ""
msgid "English"
msgstr ""
@@ -67,9 +84,23 @@ msgstr ""
msgid "Friulian"
msgstr ""
msgid "Geometrical Shapes"
msgstr ""
msgid "German"
msgstr ""
msgid "Glagolitic"
msgstr ""
#, fuzzy
msgid "Greek"
msgstr "Windows Griechisch (CP 1253)"
#, fuzzy
msgid "Hebrew"
msgstr "Windows Hebräisch (CP 1255)"
msgid "Hungarian"
msgstr ""
@@ -79,6 +110,99 @@ msgstr ""
msgid "Joined"
msgstr ""
msgid "Joined strings with A"
msgstr ""
msgid "Joined strings with B"
msgstr ""
msgid "Joined strings with C"
msgstr ""
msgid "Joined strings with D"
msgstr ""
msgid "Joined strings with E"
msgstr ""
msgid "Joined strings with F"
msgstr ""
msgid "Joined strings with G"
msgstr ""
msgid "Joined strings with H"
msgstr ""
msgid "Joined strings with I"
msgstr ""
msgid "Joined strings with J"
msgstr ""
msgid "Joined strings with K"
msgstr ""
msgid "Joined strings with L"
msgstr ""
msgid "Joined strings with M"
msgstr ""
msgid "Joined strings with N"
msgstr ""
msgid "Joined strings with O"
msgstr ""
msgid "Joined strings with P"
msgstr ""
msgid "Joined strings with Q"
msgstr ""
msgid "Joined strings with R"
msgstr ""
msgid "Joined strings with S"
msgstr ""
msgid "Joined strings with T"
msgstr ""
msgid "Joined strings with U"
msgstr ""
msgid "Joined strings with V"
msgstr ""
msgid "Joined strings with W"
msgstr ""
msgid "Joined strings with X"
msgstr ""
msgid "Joined strings with Y"
msgstr ""
msgid "Joined strings with Z"
msgstr ""
msgid "Joined strings with a"
msgstr ""
msgid "Joined strings with e"
msgstr ""
msgid "Joined strings with i"
msgstr ""
msgid "Joined strings with o"
msgstr ""
msgid "Joined strings with u"
msgstr ""
msgid "Kashubian"
msgstr ""
@@ -216,6 +340,12 @@ msgstr ""
msgid "Mark, Non-Spacing"
msgstr ""
msgid "Mark, Spacing Combining"
msgstr ""
msgid "Mathematical And Physical Characters"
msgstr ""
msgid "Metric"
msgstr ""
@@ -229,6 +359,9 @@ msgstr ""
msgid "Moldavian Latinic"
msgstr ""
msgid "Musical Characters"
msgstr ""
msgid "Norwegian"
msgstr ""
@@ -271,15 +404,22 @@ msgstr ""
msgid "Number, Other"
msgstr ""
msgid "Numbers"
msgstr ""
msgid "Numbers - Circled"
msgstr ""
msgid "Other modifiers"
msgstr ""
#, fuzzy
msgid "Other Modifiers"
msgstr "Geändert"
msgid "Other, Format"
msgstr ""
msgid "Other, Surrogate"
msgstr ""
msgid "Parentheses"
msgstr ""
@@ -289,6 +429,9 @@ msgstr ""
msgid "Portuguese"
msgstr ""
msgid "Punctuation"
msgstr ""
msgid "Punctuation, Close"
msgstr ""
@@ -319,6 +462,12 @@ msgstr ""
msgid "Russian"
msgstr ""
msgid "Separator, Line"
msgstr ""
msgid "Separator, Paragraph"
msgstr ""
msgid "Separator, Space"
msgstr ""
@@ -331,12 +480,18 @@ msgstr ""
msgid "Slovak"
msgstr ""
msgid "Slovene Historical Writings"
msgstr ""
msgid "Slovenian"
msgstr ""
msgid "Sorbian"
msgstr ""
msgid "Spaces"
msgstr ""
msgid "Spanish"
msgstr ""
@@ -346,6 +501,12 @@ msgstr ""
msgid "Strokes"
msgstr ""
msgid "Subscript Characters"
msgstr ""
msgid "Superscript Sharacters"
msgstr ""
msgid "Surrounded"
msgstr ""
@@ -412,12 +573,21 @@ msgstr ""
msgid "Symbol, Other"
msgstr ""
msgid "Technical Characters"
msgstr ""
msgid "Transliterated"
msgstr ""
msgid "Transliterating Marks"
msgstr ""
#, fuzzy
msgid "Turkish"
msgstr "Windows Türkisch (CP 1254)"
msgid "Ukrainian"
msgstr ""
msgid "Units"
msgstr ""

Binary file not shown.

View File

@@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"Plural-Forms: nplurals=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"
@@ -17,6 +17,9 @@ msgstr ""
msgid "Albanian"
msgstr ""
msgid "Arabic"
msgstr ""
msgid "Arrows"
msgstr ""
@@ -41,18 +44,30 @@ msgstr ""
msgid "Combine Over"
msgstr ""
msgid "Combining Marks"
msgstr ""
msgid "Croatian"
msgstr ""
msgid "Currencies"
msgstr ""
msgid "Cyrillic"
msgstr ""
msgid "Czech"
msgstr ""
msgid "Danish"
msgstr ""
msgid "Diacritics"
msgstr ""
msgid "Encircled Characters"
msgstr ""
msgid "English"
msgstr ""
@@ -68,9 +83,21 @@ msgstr ""
msgid "Friulian"
msgstr ""
msgid "Geometrical Shapes"
msgstr ""
msgid "German"
msgstr ""
msgid "Glagolitic"
msgstr ""
msgid "Greek"
msgstr ""
msgid "Hebrew"
msgstr ""
msgid "Hungarian"
msgstr ""
@@ -80,6 +107,99 @@ msgstr ""
msgid "Joined"
msgstr ""
msgid "Joined strings with A"
msgstr ""
msgid "Joined strings with B"
msgstr ""
msgid "Joined strings with C"
msgstr ""
msgid "Joined strings with D"
msgstr ""
msgid "Joined strings with E"
msgstr ""
msgid "Joined strings with F"
msgstr ""
msgid "Joined strings with G"
msgstr ""
msgid "Joined strings with H"
msgstr ""
msgid "Joined strings with I"
msgstr ""
msgid "Joined strings with J"
msgstr ""
msgid "Joined strings with K"
msgstr ""
msgid "Joined strings with L"
msgstr ""
msgid "Joined strings with M"
msgstr ""
msgid "Joined strings with N"
msgstr ""
msgid "Joined strings with O"
msgstr ""
msgid "Joined strings with P"
msgstr ""
msgid "Joined strings with Q"
msgstr ""
msgid "Joined strings with R"
msgstr ""
msgid "Joined strings with S"
msgstr ""
msgid "Joined strings with T"
msgstr ""
msgid "Joined strings with U"
msgstr ""
msgid "Joined strings with V"
msgstr ""
msgid "Joined strings with W"
msgstr ""
msgid "Joined strings with X"
msgstr ""
msgid "Joined strings with Y"
msgstr ""
msgid "Joined strings with Z"
msgstr ""
msgid "Joined strings with a"
msgstr ""
msgid "Joined strings with e"
msgstr ""
msgid "Joined strings with i"
msgstr ""
msgid "Joined strings with o"
msgstr ""
msgid "Joined strings with u"
msgstr ""
msgid "Kashubian"
msgstr ""
@@ -215,6 +335,12 @@ msgstr ""
msgid "Mark, Non-Spacing"
msgstr ""
msgid "Mark, Spacing Combining"
msgstr ""
msgid "Mathematical And Physical Characters"
msgstr ""
msgid "Metric"
msgstr ""
@@ -227,6 +353,9 @@ msgstr ""
msgid "Moldavian Latinic"
msgstr ""
msgid "Musical Characters"
msgstr ""
msgid "Norwegian"
msgstr ""
@@ -269,15 +398,21 @@ msgstr ""
msgid "Number, Other"
msgstr ""
msgid "Numbers"
msgstr ""
msgid "Numbers - Circled"
msgstr ""
msgid "Other modifiers"
msgid "Other Modifiers"
msgstr ""
msgid "Other, Format"
msgstr ""
msgid "Other, Surrogate"
msgstr ""
msgid "Parentheses"
msgstr ""
@@ -287,6 +422,9 @@ msgstr ""
msgid "Portuguese"
msgstr ""
msgid "Punctuation"
msgstr ""
msgid "Punctuation, Close"
msgstr ""
@@ -317,6 +455,12 @@ msgstr ""
msgid "Russian"
msgstr ""
msgid "Separator, Line"
msgstr ""
msgid "Separator, Paragraph"
msgstr ""
msgid "Separator, Space"
msgstr ""
@@ -329,12 +473,18 @@ msgstr ""
msgid "Slovak"
msgstr ""
msgid "Slovene Historical Writings"
msgstr ""
msgid "Slovenian"
msgstr ""
msgid "Sorbian"
msgstr ""
msgid "Spaces"
msgstr ""
msgid "Spanish"
msgstr ""
@@ -344,6 +494,12 @@ msgstr ""
msgid "Strokes"
msgstr ""
msgid "Subscript Characters"
msgstr ""
msgid "Superscript Sharacters"
msgstr ""
msgid "Surrounded"
msgstr ""
@@ -398,11 +554,20 @@ msgstr ""
msgid "Symbol, Other"
msgstr ""
msgid "Technical Characters"
msgstr ""
msgid "Transliterated"
msgstr ""
msgid "Transliterating Marks"
msgstr ""
msgid "Turkish"
msgstr ""
msgid "Ukrainian"
msgstr ""
msgid "Units"
msgstr ""

Binary file not shown.

View File

@@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
"X-Generator: Poedit 1.8.8\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
"X-Poedit-SourceCharset: UTF-8\n"
@@ -17,6 +17,9 @@ msgstr ""
msgid "Albanian"
msgstr "albanščina"
msgid "Arabic"
msgstr "Arabski znaki"
msgid "Arrows"
msgstr "Puščice"
@@ -41,18 +44,30 @@ msgstr "Kombinirano spodaj"
msgid "Combine Over"
msgstr "Kombinirano prečrtano"
msgid "Combining Marks"
msgstr "Sestavljiva znamenja"
msgid "Croatian"
msgstr "hrvaščina"
msgid "Currencies"
msgstr "Valute"
msgid "Cyrillic"
msgstr "Cirilski znaki"
msgid "Czech"
msgstr "češčina"
msgid "Danish"
msgstr "danščina"
msgid "Diacritics"
msgstr "Ločevalna znamenja"
msgid "Encircled Characters"
msgstr "Obkroženi znaki"
msgid "English"
msgstr "angleščina"
@@ -68,9 +83,21 @@ msgstr "francoščina"
msgid "Friulian"
msgstr "furlanščina"
msgid "Geometrical Shapes"
msgstr "Geometrijski liki"
msgid "German"
msgstr "nemščina"
msgid "Glagolitic"
msgstr "Glagolski znaki"
msgid "Greek"
msgstr "Grški znaki"
msgid "Hebrew"
msgstr "Hebrejski znaki"
msgid "Hungarian"
msgstr "madžarščina"
@@ -80,6 +107,99 @@ msgstr "irščina"
msgid "Joined"
msgstr "Povezano"
msgid "Joined strings with A"
msgstr "Povezajni nizi z A"
msgid "Joined strings with B"
msgstr "Povezajni nizi z B"
msgid "Joined strings with C"
msgstr "Povezajni nizi z C"
msgid "Joined strings with D"
msgstr "Povezajni nizi z D"
msgid "Joined strings with E"
msgstr "Povezajni nizi z E"
msgid "Joined strings with F"
msgstr "Povezajni nizi z F"
msgid "Joined strings with G"
msgstr "Povezajni nizi z G"
msgid "Joined strings with H"
msgstr "Povezajni nizi z H"
msgid "Joined strings with I"
msgstr "Povezajni nizi z I"
msgid "Joined strings with J"
msgstr "Povezajni nizi z J"
msgid "Joined strings with K"
msgstr "Povezajni nizi z K"
msgid "Joined strings with L"
msgstr "Povezajni nizi z L"
msgid "Joined strings with M"
msgstr "Povezajni nizi z M"
msgid "Joined strings with N"
msgstr "Povezajni nizi z N"
msgid "Joined strings with O"
msgstr "Povezajni nizi z O"
msgid "Joined strings with P"
msgstr "Povezajni nizi z P"
msgid "Joined strings with Q"
msgstr "Povezajni nizi z Q"
msgid "Joined strings with R"
msgstr "Povezajni nizi z R"
msgid "Joined strings with S"
msgstr "Povezajni nizi z S"
msgid "Joined strings with T"
msgstr "Povezajni nizi z T"
msgid "Joined strings with U"
msgstr "Povezajni nizi z U"
msgid "Joined strings with V"
msgstr "Povezajni nizi z V"
msgid "Joined strings with W"
msgstr "Povezajni nizi z W"
msgid "Joined strings with X"
msgstr "Povezajni nizi z X"
msgid "Joined strings with Y"
msgstr "Povezajni nizi z Y"
msgid "Joined strings with Z"
msgstr "Povezajni nizi z Z"
msgid "Joined strings with a"
msgstr "Povezajni nizi z a"
msgid "Joined strings with e"
msgstr "Povezajni nizi z e"
msgid "Joined strings with i"
msgstr "Povezajni nizi z i"
msgid "Joined strings with o"
msgstr "Povezajni nizi z o"
msgid "Joined strings with u"
msgstr "Povezajni nizi z u"
msgid "Kashubian"
msgstr "kašubščina"
@@ -215,6 +335,12 @@ msgstr "Ločevalo, obdajajoča"
msgid "Mark, Non-Spacing"
msgstr "Ločevalo, neločljivo"
msgid "Mark, Spacing Combining"
msgstr "Ločevalo, ločljivo"
msgid "Mathematical And Physical Characters"
msgstr "Matematični in fizikalni znaki"
msgid "Metric"
msgstr "Metrično"
@@ -227,6 +353,9 @@ msgstr "moldavščina cirilica"
msgid "Moldavian Latinic"
msgstr "moldavščina latinica"
msgid "Musical Characters"
msgstr "Glasbeni znaki"
msgid "Norwegian"
msgstr "norveščina"
@@ -269,15 +398,21 @@ msgstr "Številka, črka"
msgid "Number, Other"
msgstr "Številka, drugo"
msgid "Numbers"
msgstr "Številke"
msgid "Numbers - Circled"
msgstr "Številke - obkroženo"
msgid "Other modifiers"
msgid "Other Modifiers"
msgstr "Druga spreminjevala"
msgid "Other, Format"
msgstr "Drugo, oblikovni"
msgid "Other, Surrogate"
msgstr "Drugo, nadomestni"
msgid "Parentheses"
msgstr "Oklepaji"
@@ -287,6 +422,9 @@ msgstr "poljščina"
msgid "Portuguese"
msgstr "portugalščina"
msgid "Punctuation"
msgstr "Ločila"
msgid "Punctuation, Close"
msgstr "Ločilo, zapiralno"
@@ -317,6 +455,12 @@ msgstr "romunščina"
msgid "Russian"
msgstr "ruščina"
msgid "Separator, Line"
msgstr "Ločilo, vrstic"
msgid "Separator, Paragraph"
msgstr "Ločilo, odstavkov"
msgid "Separator, Space"
msgstr "Ločilo, presledek"
@@ -329,12 +473,18 @@ msgstr "srbščina latinica"
msgid "Slovak"
msgstr "slovaščina"
msgid "Slovene Historical Writings"
msgstr "Slovenske zgodovinske pisave"
msgid "Slovenian"
msgstr "slovenščina"
msgid "Sorbian"
msgstr "lužiščini"
msgid "Spaces"
msgstr "Presledki"
msgid "Spanish"
msgstr "španščina"
@@ -344,6 +494,12 @@ msgstr "Posebni znaki"
msgid "Strokes"
msgstr "Poševnica"
msgid "Subscript Characters"
msgstr "Podpisani znaki"
msgid "Superscript Sharacters"
msgstr "Nadpisani znaki"
msgid "Surrounded"
msgstr "Obkroženi"
@@ -398,26 +554,23 @@ msgstr "Simbol, ločevalo"
msgid "Symbol, Other"
msgstr "Simbol, drugo"
msgid "Technical Characters"
msgstr "Tehnični znaki"
msgid "Transliterated"
msgstr "Prečrkovano"
msgid "Transliterating Marks"
msgstr "Prečrkovano"
msgid "Turkish"
msgstr "turščina"
msgid "Ukrainian"
msgstr "ukrajinščina"
#~ msgid "Mark, Spacing Combining"
#~ msgstr "Ločevalo, ločljivo"
#~ msgid "Other, Surrogate"
#~ msgstr "Drugo, nadomestni"
#~ msgid "Separator, Line"
#~ msgstr "Ločilo, vrstic"
#~ msgid "Separator, Paragraph"
#~ msgstr "Ločilo, odstavkov"
msgid "Units"
msgstr "Enote"
#~ msgid "Letter b"
#~ msgstr "Črka b"
@@ -482,8 +635,5 @@ msgstr "ukrajinščina"
#~ msgid "Letter z"
#~ msgstr "Črka z"
#~ msgid "Numbers"
#~ msgstr "Številke"
#~ msgid "Other, Control"
#~ msgstr "Drugo, kontrolni"