diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 6973abf..3ed5bc6 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -455,9 +455,9 @@ s$(MSIBUILD_LENGTH_ID) l0 Manufacturer Amebis, Slovenia, E.U. ARPCONTACT Fran Ramovš Institute of Slovenian Language SRC SASA ARPHELPTELEPHONE +386 1 470 6170 -ARPURLINFOABOUT http://zrcola-2.amebis.si/en/contact/ -ARPHELPLINK http://zrcola-2.amebis.si/en/info/instructions/ -ARPURLUPDATEINFO http://zrcola-2.amebis.si/en/install/ +ARPURLINFOABOUT http://zrcola.zrc-sazu.si/en/contact/ +ARPHELPLINK http://zrcola.zrc-sazu.si/en/info/instructions/ +ARPURLUPDATEINFO http://zrcola.zrc-sazu.si/en/install/ <\n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -28,8 +28,9 @@ msgid "&Continue" msgstr "&Nadaljuj" #: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13 +#, fuzzy msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font" -msgstr "" +msgstr "[DlgTitleFont]\"00 ZRCola\" v pisavo \"ZRCola\"" #: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6 #, fuzzy @@ -804,8 +805,9 @@ msgid "Amebis, Slovenia, E.U." msgstr "Amebis, d. o. o., Kamnik" #: En.Win32.Release.Control-2.idtx:14 En.x64.Release.Control-2.idtx:14 +#, fuzzy msgid "binfontsubst.bmp" -msgstr "" +msgstr "binfontsubst.bmp" #: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5 #, fuzzy @@ -833,19 +835,17 @@ msgid "Fran RamovÅ¡ Institute of Slovenian Language SRC SASA" msgstr "InÅ¡titut za slovenski jezik Frana RamovÅ¡a ZRC SAZU" #: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7 -#, fuzzy -msgid "http://zrcola-2.amebis.si/en/contact/" -msgstr "http://zrcola-2.amebis.si/contact/" +msgid "http://zrcola.zrc-sazu.si/en/contact/" +msgstr "" #: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8 #, fuzzy -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/info/instructions/" #: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9 -#, fuzzy -msgid "http://zrcola-2.amebis.si/en/install/" -msgstr "http://zrcola-2.amebis.si/install/" +msgid "http://zrcola.zrc-sazu.si/en/install/" +msgstr "" #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 #, fuzzy @@ -873,10 +873,13 @@ msgid "Texts made using ZRCola have to include in the colophon, foreword, footno 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.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15 +#, fuzzy msgid "" "The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after " "the next restart." msgstr "" +"Pisavo \"00 ZRCola\" je nadomestila pisava \"ZRCola\". Da bodo vaÅ¡i prejÅ¡nji dokumenti prikazani pravilno, smo na vaÅ¡em raÄunalniku uredili nadomeÅ¡Äanje pisave, ki bo stopilo v veljavo " +"po naslednjem zagonu." #: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 #, fuzzy diff --git a/MSI/ZRCola/locale/de_DE.po b/MSI/ZRCola/locale/de_DE.po index 0fa9467..ae22c0e 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-07-22 01:04+0200\n" +"POT-Creation-Date: 2016-08-02 17:45+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1562,16 +1562,16 @@ msgid "Fran RamovÅ¡ Institute of Slovenian Language SRC SASA" msgstr "" #: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7 -msgid "http://zrcola-2.amebis.si/en/contact/" -msgstr "http://zrcola-2.amebis.si/de/contact/" +msgid "http://zrcola.zrc-sazu.si/en/contact/" +msgstr "http://zrcola.zrc-sazu.si/de/contact/" #: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8 -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/de/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/" #: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9 -msgid "http://zrcola-2.amebis.si/en/install/" -msgstr "http://zrcola-2.amebis.si/de/install/" +msgid "http://zrcola.zrc-sazu.si/en/install/" +msgstr "http://zrcola.zrc-sazu.si/de/install/" #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." @@ -1626,5 +1626,5 @@ msgstr "" #~ msgid "00 ZRCola" #~ msgstr "00 ZRCola" -#~ msgid "http://zrcola-2.amebis.si/en/" -#~ msgstr "http://zrcola-2.amebis.si/de/" +#~ msgid "http://zrcola.zrc-sazu.si/en/" +#~ msgstr "http://zrcola.zrc-sazu.si/de/" diff --git a/MSI/ZRCola/locale/ru_RU.po b/MSI/ZRCola/locale/ru_RU.po index fc084a7..443e60e 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-07-22 01:03+0200\n" +"POT-Creation-Date: 2016-08-02 17:45+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1560,16 +1560,16 @@ msgid "Fran RamovÅ¡ Institute of Slovenian Language SRC SASA" msgstr "" #: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7 -msgid "http://zrcola-2.amebis.si/en/contact/" -msgstr "http://zrcola-2.amebis.si/ru/contact/" +msgid "http://zrcola.zrc-sazu.si/en/contact/" +msgstr "http://zrcola.zrc-sazu.si/ru/contact/" #: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8 -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/ru/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/" #: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9 -msgid "http://zrcola-2.amebis.si/en/install/" -msgstr "http://zrcola-2.amebis.si/ru/install/" +msgid "http://zrcola.zrc-sazu.si/en/install/" +msgstr "http://zrcola.zrc-sazu.si/ru/install/" #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." @@ -1624,8 +1624,8 @@ msgstr "" #~ msgid "00 ZRCola" #~ msgstr "00 ZRCola" -#~ msgid "http://zrcola-2.amebis.si/en/" -#~ msgstr "http://zrcola-2.amebis.si/ru/" +#~ msgid "http://zrcola.zrc-sazu.si/en/" +#~ msgstr "http://zrcola.zrc-sazu.si/ru/" #~ msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U." #~ msgstr "Amebis, p. p. 69, SI-1241 Kamnik, СловениÑ, ЕС" diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index 6c1740d..f474e08 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-07-22 01:01+0200\n" +"POT-Creation-Date: 2016-08-02 17:45+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1564,16 +1564,16 @@ msgid "Fran RamovÅ¡ Institute of Slovenian Language SRC SASA" msgstr "InÅ¡titut za slovenski jezik Frana RamovÅ¡a ZRC SAZU" #: En.Win32.Release.Property-2.idtx:7 En.x64.Release.Property-2.idtx:7 -msgid "http://zrcola-2.amebis.si/en/contact/" -msgstr "http://zrcola-2.amebis.si/contact/" +msgid "http://zrcola.zrc-sazu.si/en/contact/" +msgstr "http://zrcola.zrc-sazu.si/contact/" #: En.Win32.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:8 -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/info/instructions/" #: En.Win32.Release.Property-2.idtx:9 En.x64.Release.Property-2.idtx:9 -msgid "http://zrcola-2.amebis.si/en/install/" -msgstr "http://zrcola-2.amebis.si/install/" +msgid "http://zrcola.zrc-sazu.si/en/install/" +msgstr "http://zrcola.zrc-sazu.si/install/" #: En.Win32.Release.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." @@ -1630,8 +1630,8 @@ msgstr "ZRCOLA~1|ZRColine bližnjice na tipkovnici" #~ msgid "00 ZRCola" #~ msgstr "00 ZRCola" -#~ msgid "http://zrcola-2.amebis.si/en/" -#~ msgstr "http://zrcola-2.amebis.si/" +#~ msgid "http://zrcola.zrc-sazu.si/en/" +#~ msgstr "http://zrcola.zrc-sazu.si/" #~ msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U." #~ msgstr "Amebis, p. p. 69, 1241 Kamnik" diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot index e20e322..ea75121 100644 --- a/ZRCola/locale/ZRCola.pot +++ b/ZRCola/locale/ZRCola.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-06-14 11:32+0200\n" +"POT-Creation-Date: 2016-08-02 17:32+0200\n" "PO-Revision-Date: 2016-05-13 15:52+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -81,18 +81,14 @@ msgstr "" "funkcionalnosti ne bo na voljo." #: zrcolafrm.cpp:351 -#, fuzzy -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "" #: zrcolafrm.cpp:375 -#, fuzzy msgid "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" -"Tipkovnica_2009-06-21.pdf" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/" +"ZRCola_tipkovnica_Jun2016.pdf" msgstr "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" -"Tipkovnica_2009-06-21.pdf" #: zrcolagui.cpp:36 #, fuzzy @@ -340,17 +336,19 @@ msgid "Composed Unicode Dump" msgstr "Unicode sestavljenega" #: zrcolagui.cpp:355 +#, fuzzy msgid "Select category to display" -msgstr "" +msgstr "Izberi kategorijo za prikaz" #: zrcolagui.cpp:389 #, fuzzy msgid "Show &All" -msgstr "Prikaži vse" +msgstr "Prik&aži vse" #: zrcolagui.cpp:390 +#, fuzzy msgid "Toggle display of less frequent characters" -msgstr "" +msgstr "Prikaži/skrij manj pogoste znake" #: zrcolagui.cpp:430 #, fuzzy diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po index fb798dd..6b73123 100644 --- a/ZRCola/locale/de_DE.po +++ b/ZRCola/locale/de_DE.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-06-14 11:33+0200\n" -"PO-Revision-Date: 2016-06-14 11:34+0200\n" +"POT-Creation-Date: 2016-08-02 17:32+0200\n" +"PO-Revision-Date: 2016-08-02 17:32+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: de_DE\n" @@ -27,7 +27,7 @@ msgstr "" #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 #, fuzzy msgid "ZRCola" -msgstr "ZRCola:." +msgstr "ZRCola" #: zrcolachrreq.cpp:49 zrcolagui.cpp:998 #, fuzzy @@ -69,15 +69,16 @@ msgid "" msgstr "" #: zrcolafrm.cpp:351 -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/de/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/" #: zrcolafrm.cpp:375 +#, fuzzy msgid "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" -"Tipkovnica_2009-06-21.pdf" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/" +"ZRCola_tipkovnica_Jun2016.pdf" msgstr "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/04/5_ZRCola-" "Tipkovnica_2009-06-21.pdf" #: zrcolagui.cpp:36 diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index cf9ae71..ca0a484 100644 --- a/ZRCola/locale/ru_RU.po +++ b/ZRCola/locale/ru_RU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-06-14 11:33+0200\n" -"PO-Revision-Date: 2016-07-14 17:50+0200\n" +"POT-Creation-Date: 2016-08-02 17:32+0200\n" +"PO-Revision-Date: 2016-08-02 17:32+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: ru_RU\n" @@ -28,7 +28,7 @@ msgstr "" #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 #, fuzzy msgid "ZRCola" -msgstr "ZRCola:." +msgstr "ZRCola" #: zrcolachrreq.cpp:49 zrcolagui.cpp:998 #, fuzzy @@ -68,15 +68,16 @@ msgid "" msgstr "" #: zrcolafrm.cpp:351 -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/ru/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/" #: zrcolafrm.cpp:375 +#, fuzzy msgid "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" -"Tipkovnica_2009-06-21.pdf" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/" +"ZRCola_tipkovnica_Jun2016.pdf" msgstr "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/04/5_ZRCola-" "Tipkovnica_2009-06-21.pdf" #: zrcolagui.cpp:36 diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po index 9566e31..0cde4e9 100644 --- a/ZRCola/locale/sl_SI.po +++ b/ZRCola/locale/sl_SI.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-06-14 11:33+0200\n" -"PO-Revision-Date: 2016-06-14 11:33+0200\n" +"POT-Creation-Date: 2016-08-02 17:32+0200\n" +"PO-Revision-Date: 2016-08-02 17:32+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -70,16 +70,16 @@ msgstr "" "funkcionalnosti ne bo na voljo." #: zrcolafrm.cpp:351 -msgid "http://zrcola-2.amebis.si/en/info/instructions/" -msgstr "http://zrcola-2.amebis.si/info/instructions/" +msgid "http://zrcola.zrc-sazu.si/en/info/instructions/" +msgstr "http://zrcola.zrc-sazu.si/info/instructions/" #: zrcolafrm.cpp:375 msgid "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" -"Tipkovnica_2009-06-21.pdf" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/" +"ZRCola_tipkovnica_Jun2016.pdf" msgstr "" -"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-" -"Tipkovnica_2009-06-21.pdf" +"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/" +"ZRCola_tipkovnica_Jun2016.pdf" #: zrcolagui.cpp:36 msgid "E&xit" diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index 68386b8..a72f551 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -348,7 +348,7 @@ void wxZRColaFrame::OnPanelCharacterCatalogFocus(wxCommandEvent& event) void wxZRColaFrame::OnHelpInstructions(wxCommandEvent& event) { - wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/en/info/instructions/")); + wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/en/info/instructions/")); } @@ -372,7 +372,7 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event) (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return; // When everything else fail, try the online version. - wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-Tipkovnica_2009-06-21.pdf")); + wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf")); }