diff --git a/.gitmodules b/.gitmodules index 62059e9..115887f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/MSI/ZRCola/Main/Icon/PDF.ico b/MSI/ZRCola/Main/Icon/PDF.ico new file mode 100644 index 0000000..e6b4bfb Binary files /dev/null and b/MSI/ZRCola/Main/Icon/PDF.ico differ diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index bdedd3a..efcc56f 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -60,6 +60,7 @@ 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 +compZRCola_keyboard.pdf {68AC2C38-10E2-41A3-B92C-844C03FFDF6A} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola_keyboard.pdf comp00_ZRCola_Re.ttf {B6CE8B39-11DC-4B59-B10C-3F0FFE8F81AF} FontsFolder 0 file00_ZRCola_Re.ttf comp00_ZRCola_It.ttf {10613965-2874-470D-9D5A-B7D535AA3317} FontsFolder 0 file00_ZRCola_It.ttf comp00_ZRCola_Bd.ttf {C036BE8D-6D2F-4DBF-99D6-F53702EAEBB6} FontsFolder 0 file00_ZRCola_Bd.ttf @@ -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 < NUL +Name Data +s$(MSIBUILD_LENGTH_ID) v0 +Icon Name +iconPDF.ico PDF.ico +< NUL + + ###################################################################### # InstallExecuteSequence @@ -377,7 +402,7 @@ All :: "$(LANG).$(PLAT).$(CFG).Property-1.idt" Property Value s$(MSIBUILD_LENGTH_ID) l0 Property Property -ARPPRODUCTICON iconZRCola.ico +ARPPRODUCTICON iconPDF.ico ALLUSERS 1 DISABLEADVTSHORTCUTS 1 INSTALLLEVEL 3 @@ -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 +< 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 +< 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! ###################################################################### diff --git a/MSI/ZRCola/locale/ZRCola.pot b/MSI/ZRCola/locale/ZRCola.pot index 6eb95e7..8ccaff2 100644 --- a/MSI/ZRCola/locale/ZRCola.pot +++ b/MSI/ZRCola/locale/ZRCola.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-31 10:09+0200\n" +"POT-Creation-Date: 2016-06-01 19:00+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -14,25 +14,25 @@ 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 +#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 #, fuzzy msgid "#60" msgstr "#176" -#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 +#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 #, fuzzy msgid "&Continue" msgstr "&Nadaljuj" -#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 +#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 #, fuzzy msgid "[DlgTitleFont][SimpleProductName] Declaration" msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]" -#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 +#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 msgid "" "{\\rtf1\\adeflang1025\\ansi" "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi " @@ -770,7 +770,7 @@ msgid "" "0105000002000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000c0ef044c8850cf01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}}" msgstr "" -#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 +#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 #, fuzzy msgid "" "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New " @@ -782,54 +782,82 @@ msgstr "" "pripravljeno z vna\\'9aalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil dr. Peter Weiss." "\\i0\\f1\\par}" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 #, fuzzy 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.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3 +#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1250" -#: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 +#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 #, fuzzy msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +#, fuzzy +msgid "Documentation" +msgstr "Dokumentacija" + +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 #, fuzzy msgid "Fonts" msgstr "Pisave" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 #, fuzzy msgid "Fonts used by ZRCola" msgstr "Pisave, ki jih uporablja ZRCola" -#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 +#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 #, fuzzy msgid "I &agree." msgstr "&Strinjam se." -#: 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.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +#, fuzzy +msgid "Keyboard Shortcuts" +msgstr "Bližnjice na tipkovnici" -#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 +#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 +#, fuzzy +msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website." +msgstr "Opomba: Ta deklaracija je na voljo tudi v dialogu vizitke [SimpleProductName] ali na spletni strani." + +#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +#, fuzzy +msgid "PDF document with a list of ZRCola keyboard shortcuts" +msgstr "Dokument PDF s seznamom ZRColinih bližnjic na tipkovnici" + +#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 #, fuzzy msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:" msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 #, fuzzy msgid "Times New Roman based font" msgstr "Pisava na osnovi Times New Roman" -#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +#, fuzzy +msgid "ZRCola Documentation" +msgstr "Dokumentacija ZRCola" + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +#, fuzzy +msgid "ZRCola Keyboard Shortcuts" +msgstr "ZRColine bližnjice na tipkovnici" + +#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 #, fuzzy msgid "ZRCola:." msgstr "ZRCola:." + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" +msgstr "" diff --git a/MSI/ZRCola/locale/de_DE.po b/MSI/ZRCola/locale/de_DE.po index 0ab529f..a990303 100644 --- a/MSI/ZRCola/locale/de_DE.po +++ b/MSI/ZRCola/locale/de_DE.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-31 10:10+0200\n" +"POT-Creation-Date: 2016-06-01 19:01+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -13,19 +13,19 @@ 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) -#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 +#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 msgid "#60" msgstr "#89" -#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 +#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 msgid "&Continue" msgstr "" -#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 +#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 msgid "[DlgTitleFont][SimpleProductName] Declaration" msgstr "" @@ -33,7 +33,7 @@ msgstr "" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 +#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 msgid "" "{\\rtf1\\adeflang1025\\ansi" "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi " @@ -1509,54 +1509,77 @@ msgstr "" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 +#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 msgid "" "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New " "Roman;}Times New Roman CE;}}{\\colortbl ;\\red0\\green0\\blue255;}{\\*\\generator Msftedit 5.41.21.2510;}\\viewkind4\\uc1\\pard\\sa200\\sl276\\slmult1\\i\\f0\\fs22 This text was written " "using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Dr. Peter Weiss.\\f1\\par}" msgstr "" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 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.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3 +#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 msgid "1252" msgstr "1252" -#: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 +#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +#, fuzzy +msgid "Documentation" +msgstr "Dokumentation von " + +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 #, fuzzy msgid "Fonts" msgstr "Listet die verfügbaren Schriftarten auf." -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 msgid "Fonts used by ZRCola" msgstr "" -#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 +#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." msgstr "" -#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 +#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +msgid "Keyboard Shortcuts" +msgstr "" + +#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website." msgstr "" -#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 +#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +msgid "PDF document with a list of ZRCola keyboard shortcuts" +msgstr "" + +#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:" msgstr "" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 msgid "Times New Roman based font" msgstr "" -#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +msgid "ZRCola Documentation" +msgstr "" + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCola Keyboard Shortcuts" +msgstr "" + +#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 msgid "ZRCola:." msgstr "ZRCola:." + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" +msgstr "" diff --git a/MSI/ZRCola/locale/ru_RU.po b/MSI/ZRCola/locale/ru_RU.po index 61a7ad3..535a678 100644 --- a/MSI/ZRCola/locale/ru_RU.po +++ b/MSI/ZRCola/locale/ru_RU.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-31 10:09+0200\n" +"POT-Creation-Date: 2016-06-01 19:00+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -13,19 +13,19 @@ 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) -#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 +#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 msgid "#60" msgstr "#158" -#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 +#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 msgid "&Continue" msgstr "" -#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 +#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 msgid "[DlgTitleFont][SimpleProductName] Declaration" msgstr "" @@ -33,7 +33,7 @@ msgstr "" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 +#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 msgid "" "{\\rtf1\\adeflang1025\\ansi" "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi " @@ -1509,53 +1509,75 @@ msgstr "" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 +#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 msgid "" "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New " "Roman;}Times New Roman CE;}}{\\colortbl ;\\red0\\green0\\blue255;}{\\*\\generator Msftedit 5.41.21.2510;}\\viewkind4\\uc1\\pard\\sa200\\sl276\\slmult1\\i\\f0\\fs22 This text was written " "using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Dr. Peter Weiss.\\f1\\par}" msgstr "" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 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.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3 +#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 msgid "1252" msgstr "1251" -#: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 +#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +msgid "Documentation" +msgstr "" + +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 msgid "Fonts" msgstr "" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 msgid "Fonts used by ZRCola" msgstr "" -#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 +#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." msgstr "" -#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 +#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +msgid "Keyboard Shortcuts" +msgstr "" + +#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website." msgstr "" -#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 +#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +msgid "PDF document with a list of ZRCola keyboard shortcuts" +msgstr "" + +#: En.Win32.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:" msgstr "" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 msgid "Times New Roman based font" msgstr "" -#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +msgid "ZRCola Documentation" +msgstr "" + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCola Keyboard Shortcuts" +msgstr "" + +#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 msgid "ZRCola:." msgstr "ZRCola:." + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" +msgstr "" diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index a56901b..d28460f 100644 --- a/MSI/ZRCola/locale/sl_SI.po +++ b/MSI/ZRCola/locale/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-31 10:09+0200\n" +"POT-Creation-Date: 2016-06-01 19:00+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -13,19 +13,19 @@ 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) -#: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 +#: En.Win32.Release.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 msgid "#60" msgstr "#176" -#: En.Win32.Debug.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:11 En.x64.Debug.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 +#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11 msgid "&Continue" msgstr "&Nadaljuj" -#: En.Win32.Debug.Control-2.idtx:6 En.Win32.Release.Control-2.idtx:6 En.x64.Debug.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 +#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 msgid "[DlgTitleFont][SimpleProductName] Declaration" msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]" @@ -33,7 +33,7 @@ msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 +#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 msgid "" "{\\rtf1\\adeflang1025\\ansi" "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi " @@ -1509,7 +1509,7 @@ msgstr "" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:8 En.Win32.Release.Control-2.idtx:8 En.x64.Debug.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 +#: En.Win32.Release.Control-2.idtx:8 En.x64.Release.Control-2.idtx:8 msgid "" "{\\rtf1\\ansi\\ansicpg1250\\deff0\\deflang1060\\deflangfe1060\\deftab708{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset238 Calibri;}{\\f1\\froman\\fprq2\\fcharset238{\\*\\fname Times New " "Roman;}Times New Roman CE;}}{\\colortbl ;\\red0\\green0\\blue255;}{\\*\\generator Msftedit 5.41.21.2510;}\\viewkind4\\uc1\\pard\\sa200\\sl276\\slmult1\\i\\f0\\fs22 This text was written " @@ -1520,50 +1520,72 @@ msgstr "" "pripravljeno z vna\\'9aalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil dr. Peter Weiss." "\\i0\\f1\\par}" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 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.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Registry-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3 +#: En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 msgid "1252" msgstr "1250" -#: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 +#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +msgid "Documentation" +msgstr "Dokumentacija" + +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 msgid "Fonts" msgstr "Pisave" -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 msgid "Fonts used by ZRCola" msgstr "Pisave, ki jih uporablja ZRCola" -#: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 +#: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." msgstr "&Strinjam se." -#: En.Win32.Debug.Control-2.idtx:9 En.Win32.Release.Control-2.idtx:9 En.x64.Debug.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 +#: En.Win32.Release.Feature-2.idtx:7 En.x64.Release.Feature-2.idtx:7 +msgid "Keyboard Shortcuts" +msgstr "Bližnjice na tipkovnici" + +#: En.Win32.Release.Control-2.idtx:9 En.x64.Release.Control-2.idtx:9 msgid "Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website." msgstr "Opomba: Ta deklaracija je na voljo tudi v dialogu vizitke [SimpleProductName] ali na spletni strani." -#: En.Win32.Debug.Control-2.idtx:7 En.Win32.Release.Control-2.idtx:7 En.x64.Debug.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 +#: En.Win32.Release.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.Release.Control-2.idtx:7 En.x64.Release.Control-2.idtx:7 msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:" msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:" -#: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 +#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 msgid "Times New Roman based font" msgstr "Pisava na osnovi Times New Roman" -#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 +#: En.Win32.Release.Feature-2.idtx:6 En.x64.Release.Feature-2.idtx:6 +msgid "ZRCola Documentation" +msgstr "Dokumentacija ZRCola" + +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCola Keyboard Shortcuts" +msgstr "ZRColine bližnjice na tipkovnici" + +#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 msgid "ZRCola:." msgstr "ZRCola:." +#: En.Win32.Release.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 +msgid "ZRCOLA~1|ZRCola Keyboard Shortcuts" +msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici" + #, fuzzy #~ msgid "Determining required space for installation..." #~ msgstr "Ugotavljanje potrebnega prostora za namestitev ..." diff --git a/ZRCola.sln b/ZRCola.sln index ec365f6..1569fd7 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -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 diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp index 346ea2b..8eb05a9 100644 --- a/ZRCola/ZRCola.fbp +++ b/ZRCola/ZRCola.fbp @@ -367,6 +367,40 @@ &Help m_menuHelp protected + + + 0 + 1 + Open a web site with product instructions + wxID_HELP_INSTRUCTIONS + wxITEM_NORMAL + &Instructions... + m_menuHelpInstructions + none + F1 + + + + + + + 0 + 1 + Open a list of keyboard shortcuts + wxID_HELP_SHORTCUTS + wxITEM_NORMAL + Keyboard &Shortcuts... + m_menuHelpShortcuts + none + + + + + + + separator + none + 0 diff --git a/ZRCola/ZRCola.props b/ZRCola/ZRCola.props index efb6302..7aa1237 100644 --- a/ZRCola/ZRCola.props +++ b/ZRCola/ZRCola.props @@ -7,7 +7,7 @@ - ..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include + ..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot index 8115ff3..eeff895 100644 --- a/ZRCola/locale/ZRCola.pot +++ b/ZRCola/locale/ZRCola.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-31 14:24+0200\n" +"POT-Creation-Date: 2016-06-01 18:55+0200\n" "PO-Revision-Date: 2016-05-13 15:52+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \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,7 +23,7 @@ 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:841 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -32,12 +32,22 @@ msgstr "© 2004-%s ZRC SAZU" msgid "ZRCola" msgstr "ZRCola" -#: zrcolachrreq.cpp:49 zrcolagui.h:353 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:963 +#, fuzzy +msgid "Character" +msgstr "Znak" + +#: zrcolachrreq.cpp:58 zrcolagui.cpp:984 +#, fuzzy +msgid "Context" +msgstr "Kontekst" + +#: zrcolachrreq.cpp:64 zrcolagui.h:355 #, fuzzy msgid "Request a New Character" msgstr "Zahtevaj nov znak" -#: zrcolafrm.cpp:104 +#: zrcolafrm.cpp:111 #, fuzzy msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " @@ -46,12 +56,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:111 zrcolafrm.cpp:113 #, fuzzy msgid "Warning" msgstr "Opozorilo" -#: zrcolafrm.cpp:106 +#: zrcolafrm.cpp:113 #, fuzzy msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " @@ -60,6 +70,16 @@ msgstr "" "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj " "funkcionalnosti ne bo na voljo." +#: zrcolafrm.cpp:351 +msgid "http://zrcola-2.amebis.si/en/info/instructions/" +msgstr "" + +#: zrcolafrm.cpp:373 +msgid "" +"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" +"Tipkovnica_2009-06-21.pdf" +msgstr "" + #: zrcolagui.cpp:36 #, fuzzy msgid "E&xit" @@ -90,7 +110,7 @@ msgstr "Izberi celotno besedilo" msgid "C&haracter Selector..." msgstr "Izbirnik &znaka ..." -#: 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" @@ -100,7 +120,7 @@ msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo" 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 +130,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" @@ -176,121 +196,138 @@ msgid "&View" msgstr "Po&gled" #: zrcolagui.cpp:142 +msgid "&Instructions..." +msgstr "" + +#: zrcolagui.cpp:142 +msgid "Open a web site with product instructions" +msgstr "" + +#: zrcolagui.cpp:146 +#, fuzzy +msgid "Keyboard &Shortcuts..." +msgstr "Bližnjice na tipkovnici" + +#: zrcolagui.cpp:146 +msgid "Open a list of keyboard shortcuts" +msgstr "" + +#: 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 zrcolagui.h:240 #, fuzzy msgid "Character Selector" msgstr "Izbirnik znaka" -#: 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 +335,122 @@ msgid "" msgstr "" "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje" -#: zrcolagui.cpp:424 +#: zrcolagui.cpp:434 #, fuzzy msgid "List of Unicode character categories to search in" msgstr "Seznam kategorij znaka Unicode za iskanje" -#: zrcolagui.cpp:431 +#: zrcolagui.cpp:441 #, fuzzy msgid "All" msgstr "Vse" -#: zrcolagui.cpp:432 +#: zrcolagui.cpp:442 #, fuzzy msgid "Select all categories" msgstr "Izberi vse kategorije" -#: zrcolagui.cpp:436 +#: zrcolagui.cpp:446 #, fuzzy msgid "None" msgstr "Nič" -#: zrcolagui.cpp:437 +#: zrcolagui.cpp:447 #, fuzzy msgid "Clear category selection" msgstr "Počisti izbor kategorij" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:451 #, fuzzy msgid "Invert" msgstr "Obrni" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:452 #, fuzzy msgid "Invert category selection" msgstr "Obrni izbor kategorij" -#: zrcolagui.cpp:475 +#: zrcolagui.cpp:485 #, fuzzy msgid "Character search results" msgstr "Rezultati iskanja znakov" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:495 #, fuzzy msgid "Re¢ly Used" msgstr "Nedavno &uporabljeni" -#: zrcolagui.cpp:513 +#: zrcolagui.cpp:523 #, fuzzy msgid "List of recently inserted characters" msgstr "Seznam nedavno vstavljenih znakov" -#: zrcolagui.cpp:527 +#: zrcolagui.cpp:537 #, fuzzy msgid "Preview" msgstr "Predogled:" -#: zrcolagui.cpp:532 +#: zrcolagui.cpp:542 #, fuzzy msgid "U+" msgstr "U+" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:547 #, fuzzy msgid "Unicode hexadecimal code" msgstr "Šestnajstiška koda Unicode" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:552 #, fuzzy msgid "Keyboard shortcut in Composer window" msgstr "Bližnjica na tipkovnici v oknu sestavljalnika" -#: zrcolagui.cpp:577 +#: zrcolagui.cpp:587 #, fuzzy msgid "Character preview" msgstr "Predogled znaka" -#: zrcolagui.cpp:582 +#: zrcolagui.cpp:592 #, fuzzy msgid "Unicode character description" msgstr "Opis znaka Unicode" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:597 #, fuzzy msgid "Unicode character category" msgstr "Kategorija znaka Unicode" -#: zrcolagui.cpp:594 +#: zrcolagui.cpp:604 #, fuzzy msgid "« Back" msgstr "< &Nazaj" -#: zrcolagui.cpp:596 +#: zrcolagui.cpp:606 #, fuzzy msgid "To previously viewed character" msgstr "Na prejšnji prikazan znak" -#: zrcolagui.cpp:600 +#: zrcolagui.cpp:610 #, fuzzy msgid "Forward »" msgstr "Naprej »" -#: zrcolagui.cpp:602 +#: zrcolagui.cpp:612 #, fuzzy msgid "To following viewed character" msgstr "Na naslednji prikazan znak" -#: zrcolagui.cpp:613 +#: zrcolagui.cpp:623 #, fuzzy msgid "Re&lated" msgstr "&Sorodni" -#: zrcolagui.cpp:640 +#: zrcolagui.cpp:650 #, fuzzy msgid "List of related characters" msgstr "Seznam sorodnih znakov" -#: zrcolagui.cpp:727 +#: zrcolagui.cpp:737 #, fuzzy msgid "" "Some character native to specific language you are working with should not " @@ -424,22 +461,22 @@ msgstr "" "razstaviti v dele.\n" "Za optimalno razstavljanje izberite pravilni jezik." -#: zrcolagui.cpp:731 +#: zrcolagui.cpp:741 #, fuzzy msgid "Select language &automatically according to selected keyboard" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" -#: zrcolagui.cpp:734 +#: zrcolagui.cpp:744 #, fuzzy msgid "&Manually select the language from the list below:" msgstr "Ročno izberi jezik na spodnje&m spisku:" -#: zrcolagui.cpp:746 +#: zrcolagui.cpp:756 #, fuzzy msgid "Text Language" msgstr "Jezik besedila" -#: zrcolagui.cpp:751 +#: zrcolagui.cpp:761 #, fuzzy msgid "" "ZRCola can be launched every time you log in to your computer.\n" @@ -450,17 +487,17 @@ msgstr "" "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "bližnjic Win+F5 in Win+F6." -#: zrcolagui.cpp:755 +#: zrcolagui.cpp:765 #, fuzzy msgid "Start ZRCola &automatically on logon" msgstr "S&amodejno zaženi ZRColo ob prijavi" -#: zrcolagui.cpp:762 +#: zrcolagui.cpp:772 #, fuzzy msgid "Startup" msgstr "Zagon" -#: zrcolagui.cpp:841 +#: zrcolagui.cpp:851 #, fuzzy msgid "" "Editor: Janoš Ježovnik\n" @@ -471,12 +508,12 @@ msgstr "" "Razvoj: Amebis d. o. o.\n" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" -#: zrcolagui.cpp:849 +#: zrcolagui.cpp:859 #, fuzzy msgid "www.zrc-sazu.si" msgstr "www.zrc-sazu.si" -#: zrcolagui.cpp:855 +#: zrcolagui.cpp:865 #, fuzzy msgid "" "Texts made using ZRCola have to include in the colophon, foreword, footnote " @@ -486,7 +523,7 @@ msgstr "" "opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim " "zapisom:" -#: zrcolagui.cpp:859 +#: zrcolagui.cpp:869 #, fuzzy msgid "" "This text was written using the ZRCola input system (http://zrcola.zrc-sazu." @@ -497,37 +534,32 @@ 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:910 #, fuzzy msgid "Log" msgstr "Dnevnik" -#: zrcolagui.cpp:916 +#: zrcolagui.cpp:926 #, fuzzy msgid "&Update" msgstr "&Posodobi" -#: zrcolagui.cpp:921 +#: zrcolagui.cpp:931 #, fuzzy msgid "&Close" msgstr "&Zapri" -#: zrcolagui.cpp:953 -#, fuzzy -msgid "Character" -msgstr "Znak" - -#: zrcolagui.cpp:955 +#: zrcolagui.cpp:965 #, fuzzy msgid "Enter the &character you would like to request:" msgstr "Vpišite &znak, ki ga želite zahtevati:" -#: zrcolagui.cpp:961 +#: zrcolagui.cpp:972 #, fuzzy msgid "Decomposed character to request" msgstr "Razstavljen znak, ki ga zahtevate" -#: zrcolagui.cpp:965 +#: zrcolagui.cpp:976 #, fuzzy msgid "" "Please, use the decomposed form.\n" @@ -538,24 +570,20 @@ msgstr "" "Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate " "in prilepite iz okna z razstavljenim besedilom." -#: zrcolagui.cpp:973 -#, fuzzy -msgid "Context" -msgstr "Kontekst" - -#: zrcolagui.cpp:975 +#: zrcolagui.cpp:986 #, 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:981 +#: zrcolagui.cpp:992 #, fuzzy msgid "Additional notes for character request" msgstr "Dodatne opombe za zahtevo znaka" -#: zrcolagui.cpp:988 +#: zrcolagui.cpp:999 +#, fuzzy msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -563,6 +591,11 @@ msgid "" "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 @@ -578,17 +611,17 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "Samodejno zaženi ZRColo ob prijavi" -#: zrcolagui.h:275 +#: zrcolagui.h:277 #, fuzzy msgid "Settings" msgstr "Nastavitve" -#: zrcolagui.h:301 +#: zrcolagui.h:303 #, fuzzy msgid "About ZRCola" msgstr "O ZRColi" -#: zrcolagui.h:324 +#: zrcolagui.h:326 #, fuzzy msgid "Product Update" msgstr "Posodabljanje izdelka" diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po index 7e4cf08..14313dc 100644 --- a/ZRCola/locale/de_DE.po +++ b/ZRCola/locale/de_DE.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-31 14:26+0200\n" -"PO-Revision-Date: 2016-05-31 14:26+0200\n" +"POT-Creation-Date: 2016-06-01 18:57+0200\n" +"PO-Revision-Date: 2016-06-01 18:57+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \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,7 +20,7 @@ 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:841 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -29,27 +29,49 @@ msgstr "" msgid "ZRCola" msgstr "ZRCola:." -#: zrcolachrreq.cpp:49 zrcolagui.h:353 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:963 +#, fuzzy +msgid "Character" +msgstr "Eingabe eines Zeichenstils" + +#: zrcolachrreq.cpp:58 zrcolagui.cpp:984 +#, fuzzy +msgid "Context" +msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren." + +#: zrcolachrreq.cpp:64 zrcolagui.h:355 msgid "Request a New Character" msgstr "" -#: zrcolafrm.cpp:104 +#: zrcolafrm.cpp:111 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:111 zrcolafrm.cpp:113 #, fuzzy msgid "Warning" msgstr "Warnung: " -#: zrcolafrm.cpp:106 +#: zrcolafrm.cpp:113 msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " "will not be available." msgstr "" +#: zrcolafrm.cpp:351 +msgid "http://zrcola-2.amebis.si/en/info/instructions/" +msgstr "http://zrcola-2.amebis.si/de/info/instructions/" + +#: zrcolafrm.cpp:373 +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" msgstr "" @@ -77,7 +99,7 @@ msgstr "" msgid "C&haracter Selector..." msgstr "" -#: zrcolagui.cpp:78 zrcolagui.cpp:170 +#: zrcolagui.cpp:78 zrcolagui.cpp:180 msgid "Display character selector to select character to insert into text" msgstr "" @@ -85,7 +107,7 @@ msgstr "" msgid "&Send Composed" msgstr "" -#: zrcolagui.cpp:89 zrcolagui.cpp:172 +#: zrcolagui.cpp:89 zrcolagui.cpp:182 msgid "Send composed text to source window" msgstr "" @@ -93,7 +115,7 @@ msgstr "" msgid "Send &Decomposed" msgstr "" -#: zrcolagui.cpp:98 zrcolagui.cpp:174 +#: zrcolagui.cpp:98 zrcolagui.cpp:184 msgid "Send decomposed text to source window" msgstr "" @@ -148,323 +170,329 @@ 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 +#: zrcolagui.cpp:180 zrcolagui.h:240 msgid "Character Selector" msgstr "" -#: zrcolagui.cpp:172 +#: zrcolagui.cpp:182 msgid "Send Composed" msgstr "" -#: zrcolagui.cpp:174 +#: zrcolagui.cpp:184 msgid "Send Decomposed" msgstr "" -#: 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:434 msgid "List of Unicode character categories to search in" msgstr "" -#: zrcolagui.cpp:431 +#: zrcolagui.cpp:441 #, fuzzy msgid "All" msgstr "Alle" -#: zrcolagui.cpp:432 +#: zrcolagui.cpp:442 msgid "Select all categories" msgstr "" -#: zrcolagui.cpp:436 +#: zrcolagui.cpp:446 #, fuzzy msgid "None" msgstr "Kein" -#: zrcolagui.cpp:437 +#: zrcolagui.cpp:447 #, fuzzy msgid "Clear category selection" msgstr "Auswahl kopieren" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:451 msgid "Invert" msgstr "" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:452 #, fuzzy msgid "Invert category selection" msgstr "Auswahl einfügen" -#: zrcolagui.cpp:475 +#: zrcolagui.cpp:485 #, fuzzy msgid "Character search results" msgstr "Skupine &znakov" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:495 msgid "Re¢ly Used" msgstr "" -#: zrcolagui.cpp:513 +#: zrcolagui.cpp:523 msgid "List of recently inserted characters" msgstr "" -#: zrcolagui.cpp:527 +#: zrcolagui.cpp:537 #, fuzzy msgid "Preview" msgstr " Vorschau" -#: zrcolagui.cpp:532 +#: zrcolagui.cpp:542 #, fuzzy msgid "U+" msgstr "Hilfeverzeichnis %u nicht gefunden." -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:547 msgid "Unicode hexadecimal code" msgstr "" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:552 msgid "Keyboard shortcut in Composer window" msgstr "" -#: zrcolagui.cpp:577 +#: zrcolagui.cpp:587 #, fuzzy msgid "Character preview" msgstr "Skupine &znakov" -#: zrcolagui.cpp:582 +#: zrcolagui.cpp:592 msgid "Unicode character description" msgstr "" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:597 msgid "Unicode character category" msgstr "" -#: zrcolagui.cpp:594 +#: zrcolagui.cpp:604 #, fuzzy msgid "« Back" msgstr "< &Zurück" -#: zrcolagui.cpp:596 +#: zrcolagui.cpp:606 msgid "To previously viewed character" msgstr "" -#: zrcolagui.cpp:600 +#: zrcolagui.cpp:610 #, fuzzy msgid "Forward »" msgstr "&Vorwärts" -#: zrcolagui.cpp:602 +#: zrcolagui.cpp:612 msgid "To following viewed character" msgstr "" -#: zrcolagui.cpp:613 +#: zrcolagui.cpp:623 msgid "Re&lated" msgstr "" -#: zrcolagui.cpp:640 +#: zrcolagui.cpp:650 msgid "List of related characters" msgstr "" -#: zrcolagui.cpp:727 +#: zrcolagui.cpp:737 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:741 msgid "Select language &automatically according to selected keyboard" msgstr "" -#: zrcolagui.cpp:734 +#: zrcolagui.cpp:744 msgid "&Manually select the language from the list below:" msgstr "" -#: zrcolagui.cpp:746 +#: zrcolagui.cpp:756 msgid "Text Language" msgstr "" -#: zrcolagui.cpp:751 +#: zrcolagui.cpp:761 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:765 msgid "Start ZRCola &automatically on logon" msgstr "" -#: zrcolagui.cpp:762 +#: zrcolagui.cpp:772 msgid "Startup" msgstr "" -#: zrcolagui.cpp:841 +#: zrcolagui.cpp:851 msgid "" "Editor: Janoš Ježovnik\n" "Development: Amebis d. o. o.\n" "Development and maintenance (2004-2015): dr. Peter Weiss" msgstr "" -#: zrcolagui.cpp:849 +#: zrcolagui.cpp:859 msgid "www.zrc-sazu.si" msgstr "" -#: zrcolagui.cpp:855 +#: zrcolagui.cpp:865 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:869 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:910 #, fuzzy msgid "Log" msgstr "&Log" -#: zrcolagui.cpp:916 +#: zrcolagui.cpp:926 #, fuzzy msgid "&Update" msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren." -#: zrcolagui.cpp:921 +#: zrcolagui.cpp:931 #, fuzzy msgid "&Close" msgstr "&Schließen" -#: zrcolagui.cpp:953 -#, fuzzy -msgid "Character" -msgstr "Eingabe eines Zeichenstils" - -#: zrcolagui.cpp:955 +#: zrcolagui.cpp:965 msgid "Enter the &character you would like to request:" msgstr "" -#: zrcolagui.cpp:961 +#: zrcolagui.cpp:972 msgid "Decomposed character to request" msgstr "" -#: zrcolagui.cpp:965 +#: zrcolagui.cpp:976 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:973 -#, fuzzy -msgid "Context" -msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren." - -#: zrcolagui.cpp:975 +#: zrcolagui.cpp:986 msgid "" "The &context, examples or short description why and where the character is " "required:" msgstr "" -#: zrcolagui.cpp:981 +#: zrcolagui.cpp:992 msgid "Additional notes for character request" msgstr "" -#: zrcolagui.cpp:988 +#: zrcolagui.cpp:999 msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -483,15 +511,15 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "" -#: zrcolagui.h:275 +#: zrcolagui.h:277 msgid "Settings" msgstr "" -#: zrcolagui.h:301 +#: zrcolagui.h:303 msgid "About ZRCola" msgstr "" -#: zrcolagui.h:324 +#: zrcolagui.h:326 msgid "Product Update" msgstr "" diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index 0a4a6ce..7413427 100644 --- a/ZRCola/locale/ru_RU.po +++ b/ZRCola/locale/ru_RU.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-31 14:26+0200\n" -"PO-Revision-Date: 2016-05-31 14:26+0200\n" +"POT-Creation-Date: 2016-06-01 18:57+0200\n" +"PO-Revision-Date: 2016-06-01 18:57+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \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,7 +21,7 @@ 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:841 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -30,26 +30,47 @@ msgstr "" msgid "ZRCola" msgstr "ZRCola:." -#: zrcolachrreq.cpp:49 zrcolagui.h:353 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:963 +#, fuzzy +msgid "Character" +msgstr "Skupine &znakov" + +#: zrcolachrreq.cpp:58 zrcolagui.cpp:984 +msgid "Context" +msgstr "" + +#: zrcolachrreq.cpp:64 zrcolagui.h:355 msgid "Request a New Character" msgstr "" -#: zrcolafrm.cpp:104 +#: zrcolafrm.cpp:111 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:111 zrcolafrm.cpp:113 msgid "Warning" msgstr "" -#: zrcolafrm.cpp:106 +#: zrcolafrm.cpp:113 msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " "will not be available." msgstr "" +#: zrcolafrm.cpp:351 +msgid "http://zrcola-2.amebis.si/en/info/instructions/" +msgstr "http://zrcola-2.amebis.si/ru/info/instructions/" + +#: zrcolafrm.cpp:373 +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" msgstr "" @@ -74,7 +95,7 @@ msgstr "" msgid "C&haracter Selector..." msgstr "" -#: zrcolagui.cpp:78 zrcolagui.cpp:170 +#: zrcolagui.cpp:78 zrcolagui.cpp:180 msgid "Display character selector to select character to insert into text" msgstr "" @@ -82,7 +103,7 @@ msgstr "" msgid "&Send Composed" msgstr "" -#: zrcolagui.cpp:89 zrcolagui.cpp:172 +#: zrcolagui.cpp:89 zrcolagui.cpp:182 msgid "Send composed text to source window" msgstr "" @@ -90,7 +111,7 @@ msgstr "" msgid "Send &Decomposed" msgstr "" -#: zrcolagui.cpp:98 zrcolagui.cpp:174 +#: zrcolagui.cpp:98 zrcolagui.cpp:184 msgid "Send decomposed text to source window" msgstr "" @@ -143,303 +164,310 @@ 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 msgid "Copy" msgstr "" -#: zrcolagui.cpp:162 +#: zrcolagui.cpp:172 msgid "Copy selection" msgstr "" -#: zrcolagui.cpp:164 +#: zrcolagui.cpp:174 msgid "Paste" msgstr "" -#: 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 +#: zrcolagui.cpp:180 zrcolagui.h:240 msgid "Character Selector" msgstr "" -#: zrcolagui.cpp:172 +#: zrcolagui.cpp:182 msgid "Send Composed" msgstr "" -#: zrcolagui.cpp:174 +#: zrcolagui.cpp:184 msgid "Send Decomposed" msgstr "" -#: 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:434 msgid "List of Unicode character categories to search in" msgstr "" -#: zrcolagui.cpp:431 +#: zrcolagui.cpp:441 #, fuzzy msgid "All" msgstr "Alt" -#: zrcolagui.cpp:432 +#: zrcolagui.cpp:442 msgid "Select all categories" msgstr "" -#: zrcolagui.cpp:436 +#: zrcolagui.cpp:446 msgid "None" msgstr "" -#: zrcolagui.cpp:437 +#: zrcolagui.cpp:447 msgid "Clear category selection" msgstr "" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:451 msgid "Invert" msgstr "" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:452 msgid "Invert category selection" msgstr "" -#: zrcolagui.cpp:475 +#: zrcolagui.cpp:485 #, fuzzy msgid "Character search results" msgstr "Skupine &znakov" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:495 msgid "Re¢ly Used" msgstr "" -#: zrcolagui.cpp:513 +#: zrcolagui.cpp:523 msgid "List of recently inserted characters" msgstr "" -#: zrcolagui.cpp:527 +#: zrcolagui.cpp:537 msgid "Preview" msgstr "" -#: zrcolagui.cpp:532 +#: zrcolagui.cpp:542 msgid "U+" msgstr "" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:547 msgid "Unicode hexadecimal code" msgstr "" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:552 msgid "Keyboard shortcut in Composer window" msgstr "" -#: zrcolagui.cpp:577 +#: zrcolagui.cpp:587 #, fuzzy msgid "Character preview" msgstr "Skupine &znakov" -#: zrcolagui.cpp:582 +#: zrcolagui.cpp:592 msgid "Unicode character description" msgstr "" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:597 msgid "Unicode character category" msgstr "" -#: zrcolagui.cpp:594 +#: zrcolagui.cpp:604 msgid "« Back" msgstr "" -#: zrcolagui.cpp:596 +#: zrcolagui.cpp:606 msgid "To previously viewed character" msgstr "" -#: zrcolagui.cpp:600 +#: zrcolagui.cpp:610 msgid "Forward »" msgstr "" -#: zrcolagui.cpp:602 +#: zrcolagui.cpp:612 msgid "To following viewed character" msgstr "" -#: zrcolagui.cpp:613 +#: zrcolagui.cpp:623 msgid "Re&lated" msgstr "" -#: zrcolagui.cpp:640 +#: zrcolagui.cpp:650 msgid "List of related characters" msgstr "" -#: zrcolagui.cpp:727 +#: zrcolagui.cpp:737 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:741 msgid "Select language &automatically according to selected keyboard" msgstr "" -#: zrcolagui.cpp:734 +#: zrcolagui.cpp:744 msgid "&Manually select the language from the list below:" msgstr "" -#: zrcolagui.cpp:746 +#: zrcolagui.cpp:756 msgid "Text Language" msgstr "" -#: zrcolagui.cpp:751 +#: zrcolagui.cpp:761 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:765 msgid "Start ZRCola &automatically on logon" msgstr "" -#: zrcolagui.cpp:762 +#: zrcolagui.cpp:772 msgid "Startup" msgstr "" -#: zrcolagui.cpp:841 +#: zrcolagui.cpp:851 msgid "" "Editor: Janoš Ježovnik\n" "Development: Amebis d. o. o.\n" "Development and maintenance (2004-2015): dr. Peter Weiss" msgstr "" -#: zrcolagui.cpp:849 +#: zrcolagui.cpp:859 msgid "www.zrc-sazu.si" msgstr "" -#: zrcolagui.cpp:855 +#: zrcolagui.cpp:865 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:869 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:910 msgid "Log" msgstr "" -#: zrcolagui.cpp:916 +#: zrcolagui.cpp:926 msgid "&Update" msgstr "" -#: zrcolagui.cpp:921 +#: zrcolagui.cpp:931 msgid "&Close" msgstr "" -#: zrcolagui.cpp:953 -#, fuzzy -msgid "Character" -msgstr "Skupine &znakov" - -#: zrcolagui.cpp:955 +#: zrcolagui.cpp:965 msgid "Enter the &character you would like to request:" msgstr "" -#: zrcolagui.cpp:961 +#: zrcolagui.cpp:972 msgid "Decomposed character to request" msgstr "" -#: zrcolagui.cpp:965 +#: zrcolagui.cpp:976 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:973 -msgid "Context" -msgstr "" - -#: zrcolagui.cpp:975 +#: zrcolagui.cpp:986 msgid "" "The &context, examples or short description why and where the character is " "required:" msgstr "" -#: zrcolagui.cpp:981 +#: zrcolagui.cpp:992 msgid "Additional notes for character request" msgstr "" -#: zrcolagui.cpp:988 +#: zrcolagui.cpp:999 msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -458,15 +486,15 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "" -#: zrcolagui.h:275 +#: zrcolagui.h:277 msgid "Settings" msgstr "" -#: zrcolagui.h:301 +#: zrcolagui.h:303 msgid "About ZRCola" msgstr "" -#: zrcolagui.h:324 +#: zrcolagui.h:326 msgid "Product Update" msgstr "" diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po index 96f014b..dd1f94a 100644 --- a/ZRCola/locale/sl_SI.po +++ b/ZRCola/locale/sl_SI.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-31 14:24+0200\n" -"PO-Revision-Date: 2016-05-31 14:26+0200\n" +"POT-Creation-Date: 2016-06-01 18:56+0200\n" +"PO-Revision-Date: 2016-06-01 18:57+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \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,7 +21,7 @@ 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:841 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -29,11 +29,19 @@ msgstr "© 2004-%s ZRC SAZU" msgid "ZRCola" msgstr "ZRCola" -#: zrcolachrreq.cpp:49 zrcolagui.h:353 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:963 +msgid "Character" +msgstr "Znak" + +#: zrcolachrreq.cpp:58 zrcolagui.cpp:984 +msgid "Context" +msgstr "Kontekst" + +#: zrcolachrreq.cpp:64 zrcolagui.h:355 msgid "Request a New Character" msgstr "Zahtevaj nov znak" -#: zrcolafrm.cpp:104 +#: zrcolafrm.cpp:111 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " "will not be available." @@ -41,11 +49,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:111 zrcolafrm.cpp:113 msgid "Warning" msgstr "Opozorilo" -#: zrcolafrm.cpp:106 +#: zrcolafrm.cpp:113 msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " "will not be available." @@ -53,6 +61,18 @@ msgstr "" "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj " "funkcionalnosti ne bo na voljo." +#: zrcolafrm.cpp:351 +msgid "http://zrcola-2.amebis.si/en/info/instructions/" +msgstr "http://zrcola-2.amebis.si/info/instructions/" + +#: zrcolafrm.cpp:373 +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" msgstr "I&zhod" @@ -77,7 +97,7 @@ msgstr "Izberi celotno besedilo" msgid "C&haracter Selector..." msgstr "Izbirnik &znaka ..." -#: zrcolagui.cpp:78 zrcolagui.cpp:170 +#: zrcolagui.cpp:78 zrcolagui.cpp:180 msgid "Display character selector to select character to insert into text" msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo" @@ -85,7 +105,7 @@ msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo" 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 +113,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 +166,213 @@ 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 +#: zrcolagui.cpp:180 zrcolagui.h:240 msgid "Character Selector" msgstr "Izbirnik znaka" -#: 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:434 msgid "List of Unicode character categories to search in" msgstr "Seznam kategorij znaka Unicode za iskanje" -#: zrcolagui.cpp:431 +#: zrcolagui.cpp:441 msgid "All" msgstr "Vse" -#: zrcolagui.cpp:432 +#: zrcolagui.cpp:442 msgid "Select all categories" msgstr "Izberi vse kategorije" -#: zrcolagui.cpp:436 +#: zrcolagui.cpp:446 msgid "None" msgstr "Nič" -#: zrcolagui.cpp:437 +#: zrcolagui.cpp:447 msgid "Clear category selection" msgstr "Počisti izbor kategorij" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:451 msgid "Invert" msgstr "Obrni" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:452 msgid "Invert category selection" msgstr "Obrni izbor kategorij" -#: zrcolagui.cpp:475 +#: zrcolagui.cpp:485 msgid "Character search results" msgstr "Rezultati iskanja znakov" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:495 msgid "Re¢ly Used" msgstr "Nedavno &uporabljeni" -#: zrcolagui.cpp:513 +#: zrcolagui.cpp:523 msgid "List of recently inserted characters" msgstr "Seznam nedavno vstavljenih znakov" -#: zrcolagui.cpp:527 +#: zrcolagui.cpp:537 msgid "Preview" msgstr "Predogled" -#: zrcolagui.cpp:532 +#: zrcolagui.cpp:542 msgid "U+" msgstr "U+" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:547 msgid "Unicode hexadecimal code" msgstr "Šestnajstiška koda Unicode" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:552 msgid "Keyboard shortcut in Composer window" msgstr "Bližnjica na tipkovnici v oknu sestavljalnika" -#: zrcolagui.cpp:577 +#: zrcolagui.cpp:587 msgid "Character preview" msgstr "Predogled znaka" -#: zrcolagui.cpp:582 +#: zrcolagui.cpp:592 msgid "Unicode character description" msgstr "Opis znaka Unicode" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:597 msgid "Unicode character category" msgstr "Kategorija znaka Unicode" -#: zrcolagui.cpp:594 +#: zrcolagui.cpp:604 msgid "« Back" msgstr "« Nazaj" -#: zrcolagui.cpp:596 +#: zrcolagui.cpp:606 msgid "To previously viewed character" msgstr "Na prejšnji prikazan znak" -#: zrcolagui.cpp:600 +#: zrcolagui.cpp:610 msgid "Forward »" msgstr "Naprej »" -#: zrcolagui.cpp:602 +#: zrcolagui.cpp:612 msgid "To following viewed character" msgstr "Na naslednji prikazan znak" -#: zrcolagui.cpp:613 +#: zrcolagui.cpp:623 msgid "Re&lated" msgstr "&Sorodni" -#: zrcolagui.cpp:640 +#: zrcolagui.cpp:650 msgid "List of related characters" msgstr "Seznam sorodnih znakov" -#: zrcolagui.cpp:727 +#: zrcolagui.cpp:737 msgid "" "Some character native to specific language you are working with should not " "decompose to primitives.\n" @@ -346,19 +382,19 @@ msgstr "" "razstaviti v dele.\n" "Za optimalno razstavljanje izberite pravilni jezik." -#: zrcolagui.cpp:731 +#: zrcolagui.cpp:741 msgid "Select language &automatically according to selected keyboard" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" -#: zrcolagui.cpp:734 +#: zrcolagui.cpp:744 msgid "&Manually select the language from the list below:" msgstr "Ročno izberi jezik na spodnje&m spisku:" -#: zrcolagui.cpp:746 +#: zrcolagui.cpp:756 msgid "Text Language" msgstr "Jezik besedila" -#: zrcolagui.cpp:751 +#: zrcolagui.cpp:761 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,15 +404,15 @@ msgstr "" "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "bližnjic Win+F5 in Win+F6." -#: zrcolagui.cpp:755 +#: zrcolagui.cpp:765 msgid "Start ZRCola &automatically on logon" msgstr "S&amodejno zaženi ZRColo ob prijavi" -#: zrcolagui.cpp:762 +#: zrcolagui.cpp:772 msgid "Startup" msgstr "Zagon" -#: zrcolagui.cpp:841 +#: zrcolagui.cpp:851 msgid "" "Editor: Janoš Ježovnik\n" "Development: Amebis d. o. o.\n" @@ -386,11 +422,11 @@ msgstr "" "Razvoj: Amebis d. o. o.\n" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" -#: zrcolagui.cpp:849 +#: zrcolagui.cpp:859 msgid "www.zrc-sazu.si" msgstr "www.zrc-sazu.si" -#: zrcolagui.cpp:855 +#: zrcolagui.cpp:865 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 +435,7 @@ msgstr "" "opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim " "zapisom:" -#: zrcolagui.cpp:859 +#: zrcolagui.cpp:869 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,32 +445,28 @@ 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:910 msgid "Log" msgstr "Dnevnik" -#: zrcolagui.cpp:916 +#: zrcolagui.cpp:926 msgid "&Update" msgstr "&Posodobi" -#: zrcolagui.cpp:921 +#: zrcolagui.cpp:931 msgid "&Close" msgstr "&Zapri" -#: zrcolagui.cpp:953 -msgid "Character" -msgstr "Znak" - -#: zrcolagui.cpp:955 +#: zrcolagui.cpp:965 msgid "Enter the &character you would like to request:" msgstr "Vpišite &znak, ki ga želite zahtevati:" -#: zrcolagui.cpp:961 +#: zrcolagui.cpp:972 msgid "Decomposed character to request" msgstr "Razstavljen znak, ki ga zahtevate" # Please use a double && for final "&" character -#: zrcolagui.cpp:965 +#: zrcolagui.cpp:976 msgid "" "Please, use the decomposed form.\n" "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste " @@ -444,21 +476,17 @@ msgstr "" "Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate " "in prilepite iz okna z razstavljenim besedilom." -#: zrcolagui.cpp:973 -msgid "Context" -msgstr "Kontekst" - -#: zrcolagui.cpp:975 +#: zrcolagui.cpp:986 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:981 +#: zrcolagui.cpp:992 msgid "Additional notes for character request" msgstr "Dodatne opombe za zahtevo znaka" -#: zrcolagui.cpp:988 +#: zrcolagui.cpp:999 msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -484,15 +512,15 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "Samodejno zaženi ZRColo ob prijavi" -#: zrcolagui.h:275 +#: zrcolagui.h:277 msgid "Settings" msgstr "Nastavitve" -#: zrcolagui.h:301 +#: zrcolagui.h:303 msgid "About ZRCola" msgstr "O ZRColi" -#: zrcolagui.h:324 +#: zrcolagui.h:326 msgid "Product Update" msgstr "Posodabljanje izdelka" @@ -759,9 +787,6 @@ msgstr "Vnašalni sistem za jezikoslovno rabo" #~ msgid "Welcome to wxWidgets!" #~ msgstr "Dobrodošli v wxWidgets!" -#~ msgid "http://zrcola-2.amebis.si/en/contact/" -#~ msgstr "http://zrcola-2.amebis.si/contact/" - #~ msgid "" #~ "ZRCola v%s\n" #~ "Copyright 2015-%s Amebis" diff --git a/ZRCola/stdafx.h b/ZRCola/stdafx.h index e79f933..31cdc2d 100644 --- a/ZRCola/stdafx.h +++ b/ZRCola/stdafx.h @@ -45,6 +45,8 @@ #include #include +#include + #include #include #include diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp index 56d2e19..1480e12 100644 --- a/ZRCola/zrcolaapp.cpp +++ b/ZRCola/zrcolaapp.cpp @@ -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(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) { ZRCola::recordsize_t size; diff --git a/ZRCola/zrcolaapp.h b/ZRCola/zrcolaapp.h index 32da170..afd9249 100644 --- a/ZRCola/zrcolaapp.h +++ b/ZRCola/zrcolaapp.h @@ -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"); +} diff --git a/ZRCola/zrcolachrcatpnl.cpp b/ZRCola/zrcolachrcatpnl.cpp index 9ba318d..aec74b5 100644 --- a/ZRCola/zrcolachrcatpnl.cpp +++ b/ZRCola/zrcolachrcatpnl.cpp @@ -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(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) { ZRCola::recordsize_t size; diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index c008ca6..3b823bf 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -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 ) @@ -343,6 +346,36 @@ 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) { m_chrReq->ShowModal(); diff --git a/ZRCola/zrcolafrm.h b/ZRCola/zrcolafrm.h index 23fe89a..f77ef08 100644 --- a/ZRCola/zrcolafrm.h +++ b/ZRCola/zrcolafrm.h @@ -86,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); diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index ddec1f0..b97add3 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -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 ); diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h index 26c20e4..6528b94 100644 --- a/ZRCola/zrcolagui.h +++ b/ZRCola/zrcolagui.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 }; diff --git a/lib/WinStd b/lib/WinStd new file mode 160000 index 0000000..f688509 --- /dev/null +++ b/lib/WinStd @@ -0,0 +1 @@ +Subproject commit f688509e5f869e25de686d1bf2e508503596773a diff --git a/output/data/ZRCola_keyboard.pdf b/output/data/ZRCola_keyboard.pdf new file mode 100644 index 0000000..c9fcdf4 Binary files /dev/null and b/output/data/ZRCola_keyboard.pdf differ