Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Manual check for updates added

Browse Source 
(closes #22)
This commit is contained in:
Simon Rozman 2016-05-24 16:53:26 +02:00
parent 3c2e689ae2
commit 44c86e2886
23 changed files with 927 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Updater

@ -1 +1 @@
Subproject commit 54e64515d407f654d05ca79ab911b05f770151c1 Subproject commit 529bd00da51c3bf820fd237e3695001f9b895c3a

11
ZRCola.sln
View File

@ -18,6 +18,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRCol
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -66,6 +68,14 @@ Global
{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32 {518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32
{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64 {518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64
{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64 {518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.Build.0 = Debug|Win32
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.ActiveCfg = Debug|x64
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.Build.0 = Debug|x64
{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.ActiveCfg = Release|Win32
{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
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -75,5 +85,6 @@ Global
{3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
{518777CC-0A59-4415-A12A-82751ED75343} = {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}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

2
ZRCola/MSIBuild/Makefile
View File

@ -122,6 +122,7 @@ featZRCola compZRCola.exe.$(PLAT)
featZRCola complibZRCola.dll.$(PLAT) featZRCola complibZRCola.dll.$(PLAT)
featZRCola complibZRColaUI.dll.$(PLAT) featZRCola complibZRColaUI.dll.$(PLAT)
featZRCola compwxExtend.dll.$(PLAT) featZRCola compwxExtend.dll.$(PLAT)
featZRCola compUpdater.dll.$(PLAT)
featZRCola compLocalizationRepositoryPath featZRCola compLocalizationRepositoryPath
featZRCola compLanguage featZRCola compLanguage
featZRCola compDatabasePath featZRCola compDatabasePath
@ -132,6 +133,7 @@ featZRCola compZRCola.mo.sl_SI
featZRCola compZRCola.zrcdb.mo.sl_SI featZRCola compZRCola.zrcdb.mo.sl_SI
featZRCola complibZRColaUI.mo.sl_SI featZRCola complibZRColaUI.mo.sl_SI
featZRCola compwxExtend.mo.sl_SI featZRCola compwxExtend.mo.sl_SI
featZRCola compUpdater.mo.sl_SI
featZRCola compwxstd.mo.sl_SI featZRCola compwxstd.mo.sl_SI
!ENDIF !ENDIF
<<NOKEEP <<NOKEEP

386
ZRCola/ZRCola.fbp
View File

@ -382,6 +382,21 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxMenuItem" expanded="0">
<property name="bitmap"></property>
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help">Check online for product update</property>
<property name="id">wxID_HELP_UPDATE</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Check for &amp;Updates...</property>
<property name="name">m_menuHelpUpdate</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event>
</object>
<object class="separator" expanded="0"> <object class="separator" expanded="0">
<property name="name">separator</property> <property name="name">separator</property>
<property name="permission">none</property> <property name="permission">none</property>
@ -5012,5 +5027,376 @@
</object> </object>
</object> </object>
</object> </object>
<object class="Dialog" expanded="0">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
<property name="center">wxBOTH</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">wxZRColaUpdaterBase</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">Product Update</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name">ZRColaUpdater</property>
<property name="window_style"></property>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
<event name="OnAuiFindManager"></event>
<event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneMaximize"></event>
<event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnHibernate"></event>
<event name="OnIconize"></event>
<event name="OnIdle"></event>
<event name="OnInitDialog"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizerContent</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
<property name="label">Log</property>
<property name="minimum_size"></property>
<property name="name">sbSizerLog</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">450,150</property>
<property name="moveable">1</property>
<property name="name">m_log</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxTE_MULTILINE|wxTE_READONLY</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="0">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_RIGHT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizerButtons</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">&amp;Update</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_buttonUpdate</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnUpdate</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
<property name="label">&amp;Close</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_buttonClose</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick"></event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
</object> </object>
</wxFormBuilder_Project> </wxFormBuilder_Project>

2
ZRCola/ZRCola.props
View File

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

5
ZRCola/ZRCola.vcxproj
View File

@ -90,6 +90,7 @@
<ClCompile Include="zrcolagui.cpp" /> <ClCompile Include="zrcolagui.cpp" />
<ClCompile Include="zrcolakeyhndlr.cpp" /> <ClCompile Include="zrcolakeyhndlr.cpp" />
<ClCompile Include="zrcolasettings.cpp" /> <ClCompile Include="zrcolasettings.cpp" />
<ClCompile Include="zrcolaupdater.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="stdafx.h" /> <ClInclude Include="stdafx.h" />
@ -103,6 +104,7 @@
<ClInclude Include="zrcolagui.h" /> <ClInclude Include="zrcolagui.h" />
<ClInclude Include="zrcolakeyhndlr.h" /> <ClInclude Include="zrcolakeyhndlr.h" />
<ClInclude Include="zrcolasettings.h" /> <ClInclude Include="zrcolasettings.h" />
<ClInclude Include="zrcolaupdater.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\lib\libZRColaUI\build\libZRColaUI.vcxproj"> <ProjectReference Include="..\lib\libZRColaUI\build\libZRColaUI.vcxproj">
@ -114,6 +116,9 @@
<ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj"> <ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj">
<Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project> <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Updater\Updater\build\Updater.vcxproj">
<Project>{990d8cf9-4457-4dc0-aa18-4968ef434741}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="locale\ZRCola.pot" /> <None Include="locale\ZRCola.pot" />

6
ZRCola/ZRCola.vcxproj.filters
View File

@ -52,6 +52,9 @@
<ClCompile Include="zrcolaabout.cpp"> <ClCompile Include="zrcolaabout.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="zrcolaupdater.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="stdafx.h"> <ClInclude Include="stdafx.h">
@ -87,6 +90,9 @@
<ClInclude Include="zrcolaabout.h"> <ClInclude Include="zrcolaabout.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="zrcolaupdater.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="res\zrcola.ico"> <None Include="res\zrcola.ico">

109
ZRCola/locale/ZRCola.pot
View File

@ -2,7 +2,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ZRCola\n" "Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-24 08:32+0200\n" "POT-Creation-Date: 2016-05-24 16:26+0200\n"
"PO-Revision-Date: 2016-05-13 15:52+0200\n" "PO-Revision-Date: 2016-05-13 15:52+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n" "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n" "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@ -23,7 +23,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU" msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU" msgstr "© 2004-%s ZRC SAZU"
#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 #: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
@ -94,7 +94,7 @@ msgstr "Izberi celotno besedilo"
msgid "C&haracter Selector..." msgid "C&haracter Selector..."
msgstr "Izbirnik &znaka ..." msgstr "Izbirnik &znaka ..."
#: zrcolagui.cpp:78 zrcolagui.cpp:166 #: zrcolagui.cpp:78 zrcolagui.cpp:170
#, fuzzy #, fuzzy
msgid "Display character selector to select character to insert into text" msgid "Display character selector to select character to insert into text"
msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo" msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
@ -104,7 +104,7 @@ msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
msgid "&Send Composed" msgid "&Send Composed"
msgstr "Pošlji &sestavljeno" msgstr "Pošlji &sestavljeno"
#: zrcolagui.cpp:89 zrcolagui.cpp:168 #: zrcolagui.cpp:89 zrcolagui.cpp:172
#, fuzzy #, fuzzy
msgid "Send composed text to source window" msgid "Send composed text to source window"
msgstr "Pošlji sestavljeno besedilo izvornemu oknu" msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@ -114,7 +114,7 @@ msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
msgid "Send &Decomposed" msgid "Send &Decomposed"
msgstr "Pošlji &razstavljeno" msgstr "Pošlji &razstavljeno"
#: zrcolagui.cpp:98 zrcolagui.cpp:170 #: zrcolagui.cpp:98 zrcolagui.cpp:174
#, fuzzy #, fuzzy
msgid "Send decomposed text to source window" msgid "Send decomposed text to source window"
msgstr "Pošlji razstavljeno besedilo izvornemu oknu" msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@ -189,122 +189,130 @@ msgstr "&Zahtevaj nov znak ..."
msgid "Submit a request to ZRC to add a new character" msgid "Submit a request to ZRC to add a new character"
msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka" msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka"
#: zrcolagui.cpp:151 #: zrcolagui.cpp:146
msgid "Check for &Updates..."
msgstr ""
#: zrcolagui.cpp:146
msgid "Check online for product update"
msgstr ""
#: zrcolagui.cpp:155
#, fuzzy #, fuzzy
msgid "&Help" msgid "&Help"
msgstr "Po&moč" msgstr "Po&moč"
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
#, fuzzy #, fuzzy
msgid "Cut" msgid "Cut"
msgstr "Izreži" msgstr "Izreži"
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
#, fuzzy #, fuzzy
msgid "Cut selection" msgid "Cut selection"
msgstr "Izreži izbor" msgstr "Izreži izbor"
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
#, fuzzy #, fuzzy
msgid "Copy" msgid "Copy"
msgstr "&Kopiraj" msgstr "&Kopiraj"
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
#, fuzzy #, fuzzy
msgid "Copy selection" msgid "Copy selection"
msgstr "Kopiraj izbor" msgstr "Kopiraj izbor"
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
#, fuzzy #, fuzzy
msgid "Paste" msgid "Paste"
msgstr "Prilepi" msgstr "Prilepi"
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
#, fuzzy #, fuzzy
msgid "Paste selection" msgid "Paste selection"
msgstr "Prilepi izbor" msgstr "Prilepi izbor"
#: zrcolagui.cpp:163 #: zrcolagui.cpp:167
#, fuzzy #, fuzzy
msgid "Edit" msgid "Edit"
msgstr "Urejanje" msgstr "Urejanje"
#: zrcolagui.cpp:166 zrcolagui.h:224 #: zrcolagui.cpp:170 zrcolagui.h:225
#, fuzzy #, fuzzy
msgid "Character Selector" msgid "Character Selector"
msgstr "Izbirnik znaka" msgstr "Izbirnik znaka"
#: zrcolagui.cpp:168 #: zrcolagui.cpp:172
#, fuzzy #, fuzzy
msgid "Send Composed" msgid "Send Composed"
msgstr "Pošlji sestavljeno" msgstr "Pošlji sestavljeno"
#: zrcolagui.cpp:170 #: zrcolagui.cpp:174
#, fuzzy #, fuzzy
msgid "Send Decomposed" msgid "Send Decomposed"
msgstr "Pošlji razstavljeno" msgstr "Pošlji razstavljeno"
#: zrcolagui.cpp:173 #: zrcolagui.cpp:177
#, fuzzy #, fuzzy
msgid "Compose" msgid "Compose"
msgstr "Sestavljanje" msgstr "Sestavljanje"
#: zrcolagui.cpp:177 #: zrcolagui.cpp:181
#, fuzzy #, fuzzy
msgid "Character Catalog" msgid "Character Catalog"
msgstr "Katalog znakov" msgstr "Katalog znakov"
#: zrcolagui.cpp:181 #: zrcolagui.cpp:185
#, fuzzy #, fuzzy
msgid "(De)Composer" msgid "(De)Composer"
msgstr "Raz/Sestavljalnik" msgstr "Raz/Sestavljalnik"
#: zrcolagui.cpp:218 #: zrcolagui.cpp:222
#, fuzzy #, fuzzy
msgid "Decomposed Text" msgid "Decomposed Text"
msgstr "Razstavljeno besedilo" msgstr "Razstavljeno besedilo"
#: zrcolagui.cpp:238 #: zrcolagui.cpp:242
#, fuzzy #, fuzzy
msgid "Decomposed Unicode Dump" msgid "Decomposed Unicode Dump"
msgstr "Unicode razstavljenega" msgstr "Unicode razstavljenega"
#: zrcolagui.cpp:265 #: zrcolagui.cpp:269
#, fuzzy #, fuzzy
msgid "Composed Text" msgid "Composed Text"
msgstr "Sestavljeno besedilo" msgstr "Sestavljeno besedilo"
#: zrcolagui.cpp:285 #: zrcolagui.cpp:289
#, fuzzy #, fuzzy
msgid "Composed Unicode Dump" msgid "Composed Unicode Dump"
msgstr "Unicode sestavljenega" msgstr "Unicode sestavljenega"
#: zrcolagui.cpp:405 #: zrcolagui.cpp:409
#, fuzzy #, fuzzy
msgid "&Browse" msgid "&Browse"
msgstr "Pre&brskaj" msgstr "Pre&brskaj"
#: zrcolagui.cpp:453 #: zrcolagui.cpp:457
#, fuzzy #, fuzzy
msgid "Re&cently Used" msgid "Re&cently Used"
msgstr "Nedavno &uporabljeni" msgstr "Nedavno &uporabljeni"
#: zrcolagui.cpp:494 #: zrcolagui.cpp:498
#, fuzzy #, fuzzy
msgid "Preview" msgid "Preview"
msgstr "Predogled:" msgstr "Predogled:"
#: zrcolagui.cpp:499 #: zrcolagui.cpp:503
#, fuzzy #, fuzzy
msgid "U+" msgid "U+"
msgstr "U+" msgstr "U+"
#: zrcolagui.cpp:550 #: zrcolagui.cpp:554
#, fuzzy #, fuzzy
msgid "Re&lated" msgid "Re&lated"
msgstr "&Sorodni" msgstr "&Sorodni"
#: zrcolagui.cpp:650 #: zrcolagui.cpp:654
#, fuzzy #, fuzzy
msgid "" msgid ""
"Some character native to specific language you are working with should not " "Some character native to specific language you are working with should not "
@ -315,22 +323,22 @@ msgstr ""
"razstaviti v dele.\n" "razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik." "Za optimalno razstavljanje izberite pravilni jezik."
#: zrcolagui.cpp:654 #: zrcolagui.cpp:658
#, fuzzy #, fuzzy
msgid "Select language &automatically according to selected keyboard" msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
#: zrcolagui.cpp:657 #: zrcolagui.cpp:661
#, fuzzy #, fuzzy
msgid "&Manually select the language from the list below:" msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:" msgstr "Ročno izberi jezik na spodnje&m spisku:"
#: zrcolagui.cpp:669 #: zrcolagui.cpp:673
#, fuzzy #, fuzzy
msgid "Text Language" msgid "Text Language"
msgstr "Jezik besedila" msgstr "Jezik besedila"
#: zrcolagui.cpp:674 #: zrcolagui.cpp:678
#, fuzzy #, fuzzy
msgid "" msgid ""
"ZRCola can be launched every time you log in to your computer.\n" "ZRCola can be launched every time you log in to your computer.\n"
@ -341,28 +349,47 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6." "bližnjic Win+F5 in Win+F6."
#: zrcolagui.cpp:678 #: zrcolagui.cpp:682
#, fuzzy #, fuzzy
msgid "Start ZRCola &automatically on logon" msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi" msgstr "S&amodejno zaženi ZRColo ob prijavi"
#: zrcolagui.cpp:685 #: zrcolagui.cpp:689
#, fuzzy #, fuzzy
msgid "Startup" msgid "Startup"
msgstr "Zagon" msgstr "Zagon"
#: zrcolagui.cpp:764 #: zrcolagui.cpp:768
#, fuzzy
msgid "" msgid ""
"Editor: Janoš Ježovnik\n" "Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n" "Development: Amebis d. o. o.\n"
"Development and maintenance (2004-2015): dr. Peter Weiss" "Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr "" msgstr ""
"Urednik: Janoš Ježovnik\n"
"Razvoj: Amebis d. o. o.\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
#: zrcolagui.cpp:772 #: zrcolagui.cpp:776
#, fuzzy #, fuzzy
msgid "www.zrc-sazu.si" msgid "www.zrc-sazu.si"
msgstr "www.zrc-sazu.si" msgstr "www.zrc-sazu.si"
#: zrcolagui.cpp:815
#, fuzzy
msgid "Log"
msgstr "Prijavi me"
#: zrcolagui.cpp:831
#, fuzzy
msgid "&Update"
msgstr "Potrdite osvežitev registra"
#: zrcolagui.cpp:836
#, fuzzy
msgid "&Close"
msgstr "&Zapri"
#: zrcolakeyhndlr.cpp:44 #: zrcolakeyhndlr.cpp:44
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -377,16 +404,20 @@ msgstr ""
msgid "Start ZRCola automatically on logon" msgid "Start ZRCola automatically on logon"
msgstr "Samodejno zaženi ZRColo ob prijavi" msgstr "Samodejno zaženi ZRColo ob prijavi"
#: zrcolagui.h:261 #: zrcolagui.h:262
#, fuzzy #, fuzzy
msgid "Settings" msgid "Settings"
msgstr "Nastavitve" msgstr "Nastavitve"
#: zrcolagui.h:285 #: zrcolagui.h:286
#, fuzzy #, fuzzy
msgid "About ZRCola" msgid "About ZRCola"
msgstr "O ZRColi" msgstr "O ZRColi"
#: zrcolagui.h:309
msgid "Product Update"
msgstr ""
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3

107
ZRCola/locale/de_DE.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ZRCola\n" "Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-24 08:33+0200\n" "POT-Creation-Date: 2016-05-24 16:27+0200\n"
"PO-Revision-Date: 2016-05-24 08:33+0200\n" "PO-Revision-Date: 2016-05-24 16:27+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n" "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n" "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
"Language: de_DE\n" "Language: de_DE\n"
@ -20,7 +20,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU" msgid "© 2004-%s ZRC SAZU"
msgstr "" msgstr ""
#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 #: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
@ -81,7 +81,7 @@ msgstr ""
msgid "C&haracter Selector..." msgid "C&haracter Selector..."
msgstr "" msgstr ""
#: zrcolagui.cpp:78 zrcolagui.cpp:166 #: zrcolagui.cpp:78 zrcolagui.cpp:170
msgid "Display character selector to select character to insert into text" msgid "Display character selector to select character to insert into text"
msgstr "" msgstr ""
@ -89,7 +89,7 @@ msgstr ""
msgid "&Send Composed" msgid "&Send Composed"
msgstr "" msgstr ""
#: zrcolagui.cpp:89 zrcolagui.cpp:168 #: zrcolagui.cpp:89 zrcolagui.cpp:172
msgid "Send composed text to source window" msgid "Send composed text to source window"
msgstr "" msgstr ""
@ -97,7 +97,7 @@ msgstr ""
msgid "Send &Decomposed" msgid "Send &Decomposed"
msgstr "" msgstr ""
#: zrcolagui.cpp:98 zrcolagui.cpp:170 #: zrcolagui.cpp:98 zrcolagui.cpp:174
msgid "Send decomposed text to source window" msgid "Send decomposed text to source window"
msgstr "" msgstr ""
@ -159,154 +159,177 @@ msgstr ""
msgid "Submit a request to ZRC to add a new character" msgid "Submit a request to ZRC to add a new character"
msgstr "" msgstr ""
#: zrcolagui.cpp:151 #: zrcolagui.cpp:146
msgid "Check for &Updates..."
msgstr ""
#: zrcolagui.cpp:146
msgid "Check online for product update"
msgstr ""
#: zrcolagui.cpp:155
#, fuzzy #, fuzzy
msgid "&Help" msgid "&Help"
msgstr "&Hilfe" msgstr "&Hilfe"
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
#, fuzzy #, fuzzy
msgid "Cut" msgid "Cut"
msgstr "Ausschneiden" msgstr "Ausschneiden"
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
#, fuzzy #, fuzzy
msgid "Cut selection" msgid "Cut selection"
msgstr "Auswahl ausschneiden" msgstr "Auswahl ausschneiden"
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
#, fuzzy #, fuzzy
msgid "Copy" msgid "Copy"
msgstr "Kopieren" msgstr "Kopieren"
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
#, fuzzy #, fuzzy
msgid "Copy selection" msgid "Copy selection"
msgstr "Auswahl kopieren" msgstr "Auswahl kopieren"
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
#, fuzzy #, fuzzy
msgid "Paste" msgid "Paste"
msgstr "Einfügen" msgstr "Einfügen"
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
#, fuzzy #, fuzzy
msgid "Paste selection" msgid "Paste selection"
msgstr "Auswahl einfügen" msgstr "Auswahl einfügen"
#: zrcolagui.cpp:163 #: zrcolagui.cpp:167
#, fuzzy #, fuzzy
msgid "Edit" msgid "Edit"
msgstr "Bearbeiten" msgstr "Bearbeiten"
#: zrcolagui.cpp:166 zrcolagui.h:224 #: zrcolagui.cpp:170 zrcolagui.h:225
msgid "Character Selector" msgid "Character Selector"
msgstr "" msgstr ""
#: zrcolagui.cpp:168 #: zrcolagui.cpp:172
msgid "Send Composed" msgid "Send Composed"
msgstr "" msgstr ""
#: zrcolagui.cpp:170 #: zrcolagui.cpp:174
msgid "Send Decomposed" msgid "Send Decomposed"
msgstr "" msgstr ""
#: zrcolagui.cpp:173 #: zrcolagui.cpp:177
msgid "Compose" msgid "Compose"
msgstr "" msgstr ""
#: zrcolagui.cpp:177 #: zrcolagui.cpp:181
msgid "Character Catalog" msgid "Character Catalog"
msgstr "" msgstr ""
#: zrcolagui.cpp:181 #: zrcolagui.cpp:185
msgid "(De)Composer" msgid "(De)Composer"
msgstr "" msgstr ""
#: zrcolagui.cpp:218 #: zrcolagui.cpp:222
msgid "Decomposed Text" msgid "Decomposed Text"
msgstr "" msgstr ""
#: zrcolagui.cpp:238 #: zrcolagui.cpp:242
msgid "Decomposed Unicode Dump" msgid "Decomposed Unicode Dump"
msgstr "" msgstr ""
#: zrcolagui.cpp:265 #: zrcolagui.cpp:269
msgid "Composed Text" msgid "Composed Text"
msgstr "" msgstr ""
#: zrcolagui.cpp:285 #: zrcolagui.cpp:289
msgid "Composed Unicode Dump" msgid "Composed Unicode Dump"
msgstr "" msgstr ""
#: zrcolagui.cpp:405 #: zrcolagui.cpp:409
#, fuzzy #, fuzzy
msgid "&Browse" msgid "&Browse"
msgstr "Durchsuchen" msgstr "Durchsuchen"
#: zrcolagui.cpp:453 #: zrcolagui.cpp:457
msgid "Re&cently Used" msgid "Re&cently Used"
msgstr "" msgstr ""
#: zrcolagui.cpp:494 #: zrcolagui.cpp:498
#, fuzzy #, fuzzy
msgid "Preview" msgid "Preview"
msgstr " Vorschau" msgstr " Vorschau"
#: zrcolagui.cpp:499 #: zrcolagui.cpp:503
#, fuzzy #, fuzzy
msgid "U+" msgid "U+"
msgstr "Hilfeverzeichnis %u nicht gefunden." msgstr "Hilfeverzeichnis %u nicht gefunden."
#: zrcolagui.cpp:550 #: zrcolagui.cpp:554
msgid "Re&lated" msgid "Re&lated"
msgstr "" msgstr ""
#: zrcolagui.cpp:650 #: zrcolagui.cpp:654
msgid "" msgid ""
"Some character native to specific language you are working with should not " "Some character native to specific language you are working with should not "
"decompose to primitives.\n" "decompose to primitives.\n"
"For optimal decomposition you should set the language correctly." "For optimal decomposition you should set the language correctly."
msgstr "" msgstr ""
#: zrcolagui.cpp:654 #: zrcolagui.cpp:658
msgid "Select language &automatically according to selected keyboard" msgid "Select language &automatically according to selected keyboard"
msgstr "" msgstr ""
#: zrcolagui.cpp:657 #: zrcolagui.cpp:661
msgid "&Manually select the language from the list below:" msgid "&Manually select the language from the list below:"
msgstr "" msgstr ""
#: zrcolagui.cpp:669 #: zrcolagui.cpp:673
msgid "Text Language" msgid "Text Language"
msgstr "" msgstr ""
#: zrcolagui.cpp:674 #: zrcolagui.cpp:678
msgid "" msgid ""
"ZRCola can be launched every time you log in to your computer.\n" "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 " "It will be available on the system tray and via registered shortcuts Win+F5 "
"and Win+F6." "and Win+F6."
msgstr "" msgstr ""
#: zrcolagui.cpp:678 #: zrcolagui.cpp:682
msgid "Start ZRCola &automatically on logon" msgid "Start ZRCola &automatically on logon"
msgstr "" msgstr ""
#: zrcolagui.cpp:685 #: zrcolagui.cpp:689
msgid "Startup" msgid "Startup"
msgstr "" msgstr ""
#: zrcolagui.cpp:764 #: zrcolagui.cpp:768
msgid "" msgid ""
"Editor: Janoš Ježovnik\n" "Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n" "Development: Amebis d. o. o.\n"
"Development and maintenance (2004-2015): dr. Peter Weiss" "Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr "" msgstr ""
#: zrcolagui.cpp:772 #: zrcolagui.cpp:776
msgid "www.zrc-sazu.si" msgid "www.zrc-sazu.si"
msgstr "" msgstr ""
#: zrcolagui.cpp:815
#, fuzzy
msgid "Log"
msgstr "&Log"
#: zrcolagui.cpp:831
#, fuzzy
msgid "&Update"
msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
#: zrcolagui.cpp:836
#, fuzzy
msgid "&Close"
msgstr "&Schließen"
#: zrcolakeyhndlr.cpp:44 #: zrcolakeyhndlr.cpp:44
msgid "" msgid ""
"INS key is pressed. Type the Unicode code of desired character now (up to " "INS key is pressed. Type the Unicode code of desired character now (up to "
@ -317,14 +340,18 @@ msgstr ""
msgid "Start ZRCola automatically on logon" msgid "Start ZRCola automatically on logon"
msgstr "" msgstr ""
#: zrcolagui.h:261 #: zrcolagui.h:262
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: zrcolagui.h:285 #: zrcolagui.h:286
msgid "About ZRCola" msgid "About ZRCola"
msgstr "" msgstr ""
#: zrcolagui.h:309
msgid "Product Update"
msgstr ""
# Windows charset for this language (decimal) # Windows charset for this language (decimal)
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3

104
ZRCola/locale/ru_RU.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ZRCola\n" "Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-24 08:33+0200\n" "POT-Creation-Date: 2016-05-24 16:27+0200\n"
"PO-Revision-Date: 2016-05-24 08:33+0200\n" "PO-Revision-Date: 2016-05-24 16:27+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n" "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n" "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
"Language: ru_RU\n" "Language: ru_RU\n"
@ -21,7 +21,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU" msgid "© 2004-%s ZRC SAZU"
msgstr "" msgstr ""
#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 #: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
@ -78,7 +78,7 @@ msgstr ""
msgid "C&haracter Selector..." msgid "C&haracter Selector..."
msgstr "" msgstr ""
#: zrcolagui.cpp:78 zrcolagui.cpp:166 #: zrcolagui.cpp:78 zrcolagui.cpp:170
msgid "Display character selector to select character to insert into text" msgid "Display character selector to select character to insert into text"
msgstr "" msgstr ""
@ -86,7 +86,7 @@ msgstr ""
msgid "&Send Composed" msgid "&Send Composed"
msgstr "" msgstr ""
#: zrcolagui.cpp:89 zrcolagui.cpp:168 #: zrcolagui.cpp:89 zrcolagui.cpp:172
msgid "Send composed text to source window" msgid "Send composed text to source window"
msgstr "" msgstr ""
@ -94,7 +94,7 @@ msgstr ""
msgid "Send &Decomposed" msgid "Send &Decomposed"
msgstr "" msgstr ""
#: zrcolagui.cpp:98 zrcolagui.cpp:170 #: zrcolagui.cpp:98 zrcolagui.cpp:174
msgid "Send decomposed text to source window" msgid "Send decomposed text to source window"
msgstr "" msgstr ""
@ -154,143 +154,163 @@ msgstr ""
msgid "Submit a request to ZRC to add a new character" msgid "Submit a request to ZRC to add a new character"
msgstr "" msgstr ""
#: zrcolagui.cpp:151 #: zrcolagui.cpp:146
msgid "Check for &Updates..."
msgstr ""
#: zrcolagui.cpp:146
msgid "Check online for product update"
msgstr ""
#: zrcolagui.cpp:155
msgid "&Help" msgid "&Help"
msgstr "" msgstr ""
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
msgid "Cut" msgid "Cut"
msgstr "" msgstr ""
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
msgid "Cut selection" msgid "Cut selection"
msgstr "" msgstr ""
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
msgid "Copy" msgid "Copy"
msgstr "" msgstr ""
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
msgid "Copy selection" msgid "Copy selection"
msgstr "" msgstr ""
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
msgid "Paste" msgid "Paste"
msgstr "" msgstr ""
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
msgid "Paste selection" msgid "Paste selection"
msgstr "" msgstr ""
#: zrcolagui.cpp:163 #: zrcolagui.cpp:167
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: zrcolagui.cpp:166 zrcolagui.h:224 #: zrcolagui.cpp:170 zrcolagui.h:225
msgid "Character Selector" msgid "Character Selector"
msgstr "" msgstr ""
#: zrcolagui.cpp:168 #: zrcolagui.cpp:172
msgid "Send Composed" msgid "Send Composed"
msgstr "" msgstr ""
#: zrcolagui.cpp:170 #: zrcolagui.cpp:174
msgid "Send Decomposed" msgid "Send Decomposed"
msgstr "" msgstr ""
#: zrcolagui.cpp:173 #: zrcolagui.cpp:177
msgid "Compose" msgid "Compose"
msgstr "" msgstr ""
#: zrcolagui.cpp:177 #: zrcolagui.cpp:181
msgid "Character Catalog" msgid "Character Catalog"
msgstr "" msgstr ""
#: zrcolagui.cpp:181 #: zrcolagui.cpp:185
msgid "(De)Composer" msgid "(De)Composer"
msgstr "" msgstr ""
#: zrcolagui.cpp:218 #: zrcolagui.cpp:222
msgid "Decomposed Text" msgid "Decomposed Text"
msgstr "" msgstr ""
#: zrcolagui.cpp:238 #: zrcolagui.cpp:242
msgid "Decomposed Unicode Dump" msgid "Decomposed Unicode Dump"
msgstr "" msgstr ""
#: zrcolagui.cpp:265 #: zrcolagui.cpp:269
msgid "Composed Text" msgid "Composed Text"
msgstr "" msgstr ""
#: zrcolagui.cpp:285 #: zrcolagui.cpp:289
msgid "Composed Unicode Dump" msgid "Composed Unicode Dump"
msgstr "" msgstr ""
#: zrcolagui.cpp:405 #: zrcolagui.cpp:409
msgid "&Browse" msgid "&Browse"
msgstr "" msgstr ""
#: zrcolagui.cpp:453 #: zrcolagui.cpp:457
msgid "Re&cently Used" msgid "Re&cently Used"
msgstr "" msgstr ""
#: zrcolagui.cpp:494 #: zrcolagui.cpp:498
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: zrcolagui.cpp:499 #: zrcolagui.cpp:503
msgid "U+" msgid "U+"
msgstr "" msgstr ""
#: zrcolagui.cpp:550 #: zrcolagui.cpp:554
msgid "Re&lated" msgid "Re&lated"
msgstr "" msgstr ""
#: zrcolagui.cpp:650 #: zrcolagui.cpp:654
msgid "" msgid ""
"Some character native to specific language you are working with should not " "Some character native to specific language you are working with should not "
"decompose to primitives.\n" "decompose to primitives.\n"
"For optimal decomposition you should set the language correctly." "For optimal decomposition you should set the language correctly."
msgstr "" msgstr ""
#: zrcolagui.cpp:654 #: zrcolagui.cpp:658
msgid "Select language &automatically according to selected keyboard" msgid "Select language &automatically according to selected keyboard"
msgstr "" msgstr ""
#: zrcolagui.cpp:657 #: zrcolagui.cpp:661
msgid "&Manually select the language from the list below:" msgid "&Manually select the language from the list below:"
msgstr "" msgstr ""
#: zrcolagui.cpp:669 #: zrcolagui.cpp:673
msgid "Text Language" msgid "Text Language"
msgstr "" msgstr ""
#: zrcolagui.cpp:674 #: zrcolagui.cpp:678
msgid "" msgid ""
"ZRCola can be launched every time you log in to your computer.\n" "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 " "It will be available on the system tray and via registered shortcuts Win+F5 "
"and Win+F6." "and Win+F6."
msgstr "" msgstr ""
#: zrcolagui.cpp:678 #: zrcolagui.cpp:682
msgid "Start ZRCola &automatically on logon" msgid "Start ZRCola &automatically on logon"
msgstr "" msgstr ""
#: zrcolagui.cpp:685 #: zrcolagui.cpp:689
msgid "Startup" msgid "Startup"
msgstr "" msgstr ""
#: zrcolagui.cpp:764 #: zrcolagui.cpp:768
msgid "" msgid ""
"Editor: Janoš Ježovnik\n" "Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n" "Development: Amebis d. o. o.\n"
"Development and maintenance (2004-2015): dr. Peter Weiss" "Development and maintenance (2004-2015): dr. Peter Weiss"
msgstr "" msgstr ""
#: zrcolagui.cpp:772 #: zrcolagui.cpp:776
msgid "www.zrc-sazu.si" msgid "www.zrc-sazu.si"
msgstr "" msgstr ""
#: zrcolagui.cpp:815
msgid "Log"
msgstr ""
#: zrcolagui.cpp:831
msgid "&Update"
msgstr ""
#: zrcolagui.cpp:836
msgid "&Close"
msgstr ""
#: zrcolakeyhndlr.cpp:44 #: zrcolakeyhndlr.cpp:44
msgid "" msgid ""
"INS key is pressed. Type the Unicode code of desired character now (up to " "INS key is pressed. Type the Unicode code of desired character now (up to "
@ -301,14 +321,18 @@ msgstr ""
msgid "Start ZRCola automatically on logon" msgid "Start ZRCola automatically on logon"
msgstr "" msgstr ""
#: zrcolagui.h:261 #: zrcolagui.h:262
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: zrcolagui.h:285 #: zrcolagui.h:286
msgid "About ZRCola" msgid "About ZRCola"
msgstr "" msgstr ""
#: zrcolagui.h:309
msgid "Product Update"
msgstr ""
# Windows charset for this language (decimal) # Windows charset for this language (decimal)
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3

104
ZRCola/locale/sl_SI.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ZRCola\n" "Project-Id-Version: ZRCola\n"
"POT-Creation-Date: 2016-05-24 08:32+0200\n" "POT-Creation-Date: 2016-05-24 16:26+0200\n"
"PO-Revision-Date: 2016-05-24 08:33+0200\n" "PO-Revision-Date: 2016-05-24 16:27+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n" "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n" "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
"Language: sl_SI\n" "Language: sl_SI\n"
@ -21,7 +21,7 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU" msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU" msgstr "© 2004-%s ZRC SAZU"
#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:754 zrcolagui.h:100 #: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
@ -81,7 +81,7 @@ msgstr "Izberi celotno besedilo"
msgid "C&haracter Selector..." msgid "C&haracter Selector..."
msgstr "Izbirnik &znaka ..." msgstr "Izbirnik &znaka ..."
#: zrcolagui.cpp:78 zrcolagui.cpp:166 #: zrcolagui.cpp:78 zrcolagui.cpp:170
msgid "Display character selector to select character to insert into text" msgid "Display character selector to select character to insert into text"
msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo" msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
@ -89,7 +89,7 @@ msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
msgid "&Send Composed" msgid "&Send Composed"
msgstr "Pošlji &sestavljeno" msgstr "Pošlji &sestavljeno"
#: zrcolagui.cpp:89 zrcolagui.cpp:168 #: zrcolagui.cpp:89 zrcolagui.cpp:172
msgid "Send composed text to source window" msgid "Send composed text to source window"
msgstr "Pošlji sestavljeno besedilo izvornemu oknu" msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@ -97,7 +97,7 @@ msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
msgid "Send &Decomposed" msgid "Send &Decomposed"
msgstr "Pošlji &razstavljeno" msgstr "Pošlji &razstavljeno"
#: zrcolagui.cpp:98 zrcolagui.cpp:170 #: zrcolagui.cpp:98 zrcolagui.cpp:174
msgid "Send decomposed text to source window" msgid "Send decomposed text to source window"
msgstr "Pošlji razstavljeno besedilo izvornemu oknu" msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@ -157,99 +157,107 @@ msgstr "&Zahtevaj nov znak ..."
msgid "Submit a request to ZRC to add a new character" msgid "Submit a request to ZRC to add a new character"
msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka" msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka"
#: zrcolagui.cpp:151 #: zrcolagui.cpp:146
msgid "Check for &Updates..."
msgstr "Preveri za &posodobitev ..."
#: zrcolagui.cpp:146
msgid "Check online for product update"
msgstr "Preveri na spletu za posodobitev izdelka"
#: zrcolagui.cpp:155
msgid "&Help" msgid "&Help"
msgstr "Po&moč" msgstr "Po&moč"
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
msgid "Cut" msgid "Cut"
msgstr "Izreži" msgstr "Izreži"
#: zrcolagui.cpp:156 #: zrcolagui.cpp:160
msgid "Cut selection" msgid "Cut selection"
msgstr "Izreži izbor" msgstr "Izreži izbor"
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
msgid "Copy" msgid "Copy"
msgstr "Kopiraj" msgstr "Kopiraj"
#: zrcolagui.cpp:158 #: zrcolagui.cpp:162
msgid "Copy selection" msgid "Copy selection"
msgstr "Kopiraj izbor" msgstr "Kopiraj izbor"
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
msgid "Paste" msgid "Paste"
msgstr "Prilepi" msgstr "Prilepi"
#: zrcolagui.cpp:160 #: zrcolagui.cpp:164
msgid "Paste selection" msgid "Paste selection"
msgstr "Prilepi izbor" msgstr "Prilepi izbor"
#: zrcolagui.cpp:163 #: zrcolagui.cpp:167
msgid "Edit" msgid "Edit"
msgstr "Urejanje" msgstr "Urejanje"
#: zrcolagui.cpp:166 zrcolagui.h:224 #: zrcolagui.cpp:170 zrcolagui.h:225
msgid "Character Selector" msgid "Character Selector"
msgstr "Izbirnik znaka" msgstr "Izbirnik znaka"
#: zrcolagui.cpp:168 #: zrcolagui.cpp:172
msgid "Send Composed" msgid "Send Composed"
msgstr "Pošlji sestavljeno" msgstr "Pošlji sestavljeno"
#: zrcolagui.cpp:170 #: zrcolagui.cpp:174
msgid "Send Decomposed" msgid "Send Decomposed"
msgstr "Pošlji razstavljeno" msgstr "Pošlji razstavljeno"
#: zrcolagui.cpp:173 #: zrcolagui.cpp:177
msgid "Compose" msgid "Compose"
msgstr "Sestavljanje" msgstr "Sestavljanje"
#: zrcolagui.cpp:177 #: zrcolagui.cpp:181
msgid "Character Catalog" msgid "Character Catalog"
msgstr "Katalog znakov" msgstr "Katalog znakov"
#: zrcolagui.cpp:181 #: zrcolagui.cpp:185
msgid "(De)Composer" msgid "(De)Composer"
msgstr "Raz/Sestavljalnik" msgstr "Raz/Sestavljalnik"
#: zrcolagui.cpp:218 #: zrcolagui.cpp:222
msgid "Decomposed Text" msgid "Decomposed Text"
msgstr "Razstavljeno besedilo" msgstr "Razstavljeno besedilo"
#: zrcolagui.cpp:238 #: zrcolagui.cpp:242
msgid "Decomposed Unicode Dump" msgid "Decomposed Unicode Dump"
msgstr "Unicode razstavljenega" msgstr "Unicode razstavljenega"
#: zrcolagui.cpp:265 #: zrcolagui.cpp:269
msgid "Composed Text" msgid "Composed Text"
msgstr "Sestavljeno besedilo" msgstr "Sestavljeno besedilo"
#: zrcolagui.cpp:285 #: zrcolagui.cpp:289
msgid "Composed Unicode Dump" msgid "Composed Unicode Dump"
msgstr "Unicode sestavljenega" msgstr "Unicode sestavljenega"
#: zrcolagui.cpp:405 #: zrcolagui.cpp:409
msgid "&Browse" msgid "&Browse"
msgstr "Pre&brskaj" msgstr "Pre&brskaj"
#: zrcolagui.cpp:453 #: zrcolagui.cpp:457
msgid "Re&cently Used" msgid "Re&cently Used"
msgstr "Nedavno &uporabljeni" msgstr "Nedavno &uporabljeni"
#: zrcolagui.cpp:494 #: zrcolagui.cpp:498
msgid "Preview" msgid "Preview"
msgstr "Predogled" msgstr "Predogled"
#: zrcolagui.cpp:499 #: zrcolagui.cpp:503
msgid "U+" msgid "U+"
msgstr "U+" msgstr "U+"
#: zrcolagui.cpp:550 #: zrcolagui.cpp:554
msgid "Re&lated" msgid "Re&lated"
msgstr "&Sorodni" msgstr "&Sorodni"
#: zrcolagui.cpp:650 #: zrcolagui.cpp:654
msgid "" msgid ""
"Some character native to specific language you are working with should not " "Some character native to specific language you are working with should not "
"decompose to primitives.\n" "decompose to primitives.\n"
@ -259,19 +267,19 @@ msgstr ""
"razstaviti v dele.\n" "razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik." "Za optimalno razstavljanje izberite pravilni jezik."
#: zrcolagui.cpp:654 #: zrcolagui.cpp:658
msgid "Select language &automatically according to selected keyboard" msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
#: zrcolagui.cpp:657 #: zrcolagui.cpp:661
msgid "&Manually select the language from the list below:" msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:" msgstr "Ročno izberi jezik na spodnje&m spisku:"
#: zrcolagui.cpp:669 #: zrcolagui.cpp:673
msgid "Text Language" msgid "Text Language"
msgstr "Jezik besedila" msgstr "Jezik besedila"
#: zrcolagui.cpp:674 #: zrcolagui.cpp:678
msgid "" msgid ""
"ZRCola can be launched every time you log in to your computer.\n" "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 " "It will be available on the system tray and via registered shortcuts Win+F5 "
@ -281,15 +289,15 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6." "bližnjic Win+F5 in Win+F6."
#: zrcolagui.cpp:678 #: zrcolagui.cpp:682
msgid "Start ZRCola &automatically on logon" msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi" msgstr "S&amodejno zaženi ZRColo ob prijavi"
#: zrcolagui.cpp:685 #: zrcolagui.cpp:689
msgid "Startup" msgid "Startup"
msgstr "Zagon" msgstr "Zagon"
#: zrcolagui.cpp:764 #: zrcolagui.cpp:768
msgid "" msgid ""
"Editor: Janoš Ježovnik\n" "Editor: Janoš Ježovnik\n"
"Development: Amebis d. o. o.\n" "Development: Amebis d. o. o.\n"
@ -299,10 +307,22 @@ msgstr ""
"Razvoj: Amebis d. o. o.\n" "Razvoj: Amebis d. o. o.\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
#: zrcolagui.cpp:772 #: zrcolagui.cpp:776
msgid "www.zrc-sazu.si" msgid "www.zrc-sazu.si"
msgstr "www.zrc-sazu.si" msgstr "www.zrc-sazu.si"
#: zrcolagui.cpp:815
msgid "Log"
msgstr "Dnevnik"
#: zrcolagui.cpp:831
msgid "&Update"
msgstr "&Posodobi"
#: zrcolagui.cpp:836
msgid "&Close"
msgstr "&Zapri"
#: zrcolakeyhndlr.cpp:44 #: zrcolakeyhndlr.cpp:44
msgid "" msgid ""
"INS key is pressed. Type the Unicode code of desired character now (up to " "INS key is pressed. Type the Unicode code of desired character now (up to "
@ -315,14 +335,18 @@ msgstr ""
msgid "Start ZRCola automatically on logon" msgid "Start ZRCola automatically on logon"
msgstr "Samodejno zaženi ZRColo ob prijavi" msgstr "Samodejno zaženi ZRColo ob prijavi"
#: zrcolagui.h:261 #: zrcolagui.h:262
msgid "Settings" msgid "Settings"
msgstr "Nastavitve" msgstr "Nastavitve"
#: zrcolagui.h:285 #: zrcolagui.h:286
msgid "About ZRCola" msgid "About ZRCola"
msgstr "O ZRColi" msgstr "O ZRColi"
#: zrcolagui.h:309
msgid "Product Update"
msgstr "Posodabljanje izdelka"
# Windows charset for this language (decimal) # Windows charset for this language (decimal)
#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 #: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3

29
ZRCola/stdafx.h
View File

@ -19,14 +19,29 @@
#pragma once #pragma once
#include "../include/zrcola.h"
#include "zrcolaabout.h"
#include "zrcolaapp.h"
#include "zrcolachrgrid.h"
#include "zrcolachrcatpnl.h"
#include "zrcolacomppnl.h"
#include "zrcolafrm.h"
#include "zrcolakeyhndlr.h"
#include "zrcolasettings.h"
#include "zrcolaupdater.h"
#include <Updater/chkthread.h>
#include <wxex/common.h>
#include <wxex/persist/auimanager.h>
#include <wx/ffile.h> #include <wx/ffile.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/persist.h> #include <wx/persist.h>
#include <wx/persist/toplevel.h> #include <wx/persist/toplevel.h>
#include <wx/utils.h> #include <wx/utils.h>
#include <wx/valtext.h> #include <wx/valtext.h>
#include <wxex/common.h> #include <wx/socket.h>
#include <wxex/persist/auimanager.h>
#include <fstream> #include <fstream>
#include <string> #include <string>
@ -40,13 +55,3 @@
#include <ShObjIdl.h> #include <ShObjIdl.h>
#include <ShlGuid.h> #include <ShlGuid.h>
#endif #endif
#include "../include/zrcola.h"
#include "zrcolaabout.h"
#include "zrcolaapp.h"
#include "zrcolachrgrid.h"
#include "zrcolachrcatpnl.h"
#include "zrcolacomppnl.h"
#include "zrcolafrm.h"
#include "zrcolakeyhndlr.h"
#include "zrcolasettings.h"

4
ZRCola/zrcolaapp.cpp
View File

@ -64,6 +64,7 @@ bool ZRColaApp::OnInit()
m_locale.AddCatalogLookupPathPrefix(sPath); m_locale.AddCatalogLookupPathPrefix(sPath);
wxVERIFY(m_locale.Init(language)); wxVERIFY(m_locale.Init(language));
wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion))); wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
wxVERIFY(m_locale.AddCatalog(wxT("Updater") wxT(wxUpdaterVersion)));
wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI"))); wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI")));
wxVERIFY(m_locale.AddCatalog(wxT("ZRCola"))); wxVERIFY(m_locale.AddCatalog(wxT("ZRCola")));
wxVERIFY(m_locale.AddCatalog(wxT("ZRCola-zrcdb"))); wxVERIFY(m_locale.AddCatalog(wxT("ZRCola-zrcdb")));
@ -161,6 +162,9 @@ bool ZRColaApp::OnInit()
wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database.")); wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database."));
} }
// Initialize sockets. Otherwise Updater thread will not work.
wxSocketBase::Initialize();
m_mainWnd = new wxZRColaFrame(); m_mainWnd = new wxZRColaFrame();
wxPersistentRegisterAndRestore<wxZRColaFrame>(m_mainWnd); wxPersistentRegisterAndRestore<wxZRColaFrame>(m_mainWnd);
m_mainWnd->Show(); m_mainWnd->Show();

3
ZRCola/zrcolaapp.h
View File

@ -74,8 +74,9 @@ public:
wxZRColaFrame *m_mainWnd; ///< Main window wxZRColaFrame *m_mainWnd; ///< Main window
protected:
wxLocale m_locale; ///< Current locale wxLocale m_locale; ///< Current locale
protected:
#ifdef __WXMSW__ #ifdef __WXMSW__
HANDLE m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running HANDLE m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running
#endif #endif

13
ZRCola/zrcolafrm.cpp
View File

@ -50,8 +50,8 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
EVT_MENU (wxID_FOCUS_CHARACTER_CATALOG , wxZRColaFrame::OnPanelCharacterCatalogFocus ) EVT_MENU (wxID_FOCUS_CHARACTER_CATALOG , wxZRColaFrame::OnPanelCharacterCatalogFocus )
EVT_MENU (wxID_HELP_REQCHAR , wxZRColaFrame::OnHelpReqChar ) EVT_MENU (wxID_HELP_REQCHAR , wxZRColaFrame::OnHelpReqChar )
EVT_MENU (wxID_HELP_UPDATE , wxZRColaFrame::OnHelpUpdate )
EVT_MENU (wxID_ABOUT , wxZRColaFrame::OnAbout ) EVT_MENU (wxID_ABOUT , wxZRColaFrame::OnHelpAbout )
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -337,7 +337,14 @@ void wxZRColaFrame::OnHelpReqChar(wxCommandEvent& event)
} }
void wxZRColaFrame::OnAbout(wxCommandEvent& event) void wxZRColaFrame::OnHelpUpdate(wxCommandEvent& event)
{
wxZRColaUpdater *dlg = new wxZRColaUpdater(this);
dlg->ShowModal();
}
void wxZRColaFrame::OnHelpAbout(wxCommandEvent& event)
{ {
wxZRColaAbout *dlg = new wxZRColaAbout(this); wxZRColaAbout *dlg = new wxZRColaAbout(this);
dlg->ShowModal(); dlg->ShowModal();

3
ZRCola/zrcolafrm.h
View File

@ -85,7 +85,8 @@ protected:
void OnPanelCharacterCatalog(wxCommandEvent& event); void OnPanelCharacterCatalog(wxCommandEvent& event);
void OnPanelCharacterCatalogFocus(wxCommandEvent& event); void OnPanelCharacterCatalogFocus(wxCommandEvent& event);
void OnHelpReqChar(wxCommandEvent& event); void OnHelpReqChar(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event); void OnHelpUpdate(wxCommandEvent& event);
void OnHelpAbout(wxCommandEvent& event);
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
protected: protected:

57
ZRCola/zrcolagui.cpp
View File

@ -142,6 +142,10 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
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_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 ); m_menuHelp->Append( m_menuHelpReqChar );
wxMenuItem* m_menuHelpUpdate;
m_menuHelpUpdate = new wxMenuItem( m_menuHelp, wxID_HELP_UPDATE, wxString( _("Check for &Updates...") ) , _("Check online for product update"), wxITEM_NORMAL );
m_menuHelp->Append( m_menuHelpUpdate );
m_menuHelp->AppendSeparator(); m_menuHelp->AppendSeparator();
wxMenuItem* m_menuHelpAbout; wxMenuItem* m_menuHelpAbout;
@ -799,3 +803,56 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
wxZRColaAboutBase::~wxZRColaAboutBase() wxZRColaAboutBase::~wxZRColaAboutBase()
{ {
} }
wxZRColaUpdaterBase::wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerContent;
bSizerContent = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizerLog;
sbSizerLog = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Log") ), wxVERTICAL );
m_log = new wxTextCtrl( sbSizerLog->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
m_log->SetMinSize( wxSize( 450,150 ) );
sbSizerLog->Add( m_log, 1, wxEXPAND, 5 );
bSizerContent->Add( sbSizerLog, 1, wxALL|wxEXPAND, 5 );
bSizerContent->Add( 0, 0, 0, wxEXPAND, 5 );
wxBoxSizer* bSizerButtons;
bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
m_buttonUpdate = new wxButton( this, wxID_ANY, _("&Update"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonUpdate->Enable( false );
bSizerButtons->Add( m_buttonUpdate, 0, wxALL, 5 );
m_buttonClose = new wxButton( this, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerButtons->Add( m_buttonClose, 0, wxALL, 5 );
bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT, 5 );
this->SetSizer( bSizerContent );
this->Layout();
bSizerContent->Fit( this );
this->Centre( wxBOTH );
// Connect Events
m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this );
}
wxZRColaUpdaterBase::~wxZRColaUpdaterBase()
{
// Disconnect Events
m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this );
}

26
ZRCola/zrcolagui.h
View File

@ -70,7 +70,8 @@ class wxZRColaFrameBase : public wxFrame
wxID_TOOLBAR_EDIT, wxID_TOOLBAR_EDIT,
wxID_TOOLBAR_COMPOSE, wxID_TOOLBAR_COMPOSE,
wxID_PANEL_CHRGRPS, wxID_PANEL_CHRGRPS,
wxID_HELP_REQCHAR wxID_HELP_REQCHAR,
wxID_HELP_UPDATE
}; };
wxMenuBar* m_menubar; wxMenuBar* m_menubar;
@ -287,4 +288,27 @@ class wxZRColaAboutBase : public wxDialog
}; };
///////////////////////////////////////////////////////////////////////////////
/// Class wxZRColaUpdaterBase
///////////////////////////////////////////////////////////////////////////////
class wxZRColaUpdaterBase : public wxDialog
{
private:
protected:
wxTextCtrl* m_log;
wxButton* m_buttonUpdate;
wxButton* m_buttonClose;
// Virtual event handlers, overide them in your derived class
virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); }
public:
wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") );
~wxZRColaUpdaterBase();
};
#endif //__ZRCOLAGUI_H__ #endif //__ZRCOLAGUI_H__

80
ZRCola/zrcolaupdater.cpp Normal file
View File

@ -0,0 +1,80 @@
/*
Copyright 2015-2016 Amebis
This file is part of ZRCola.
ZRCola is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ZRCola is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdafx.h"
//////////////////////////////////////////////////////////////////////////
// wxZRColaUpdater
//////////////////////////////////////////////////////////////////////////
wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
m_logOrig(NULL),
m_updater(NULL),
wxZRColaUpdaterBase(parent)
{
// Setup logging.
m_logOrig = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log));
// Connect events.
Connect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
// Launch Updater thread.
ZRColaApp *app = (ZRColaApp*)wxTheApp;
m_updater = new wxUpdCheckThread(app->m_locale.GetCanonicalName(), this);
if (m_updater->Run() != wxTHREAD_NO_ERROR) {
wxFAIL_MSG("Can't create the thread!");
delete m_updater;
m_updater = NULL;
}
}
wxZRColaUpdater::~wxZRColaUpdater()
{
if (m_updater) {
// Terminate the Updater thread.
m_updater->Delete();
}
// Disconnect events.
Disconnect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
if (m_logOrig) {
// Return logging to previous state.
delete wxLog::SetActiveTarget(m_logOrig);
}
}
void wxZRColaUpdater::OnCheckComplete(wxThreadEvent& event)
{
event.Skip();
m_buttonUpdate->Enable(event.GetInt() == wxUpdCheckThread::wxUpdUpdateAvailable);
}
void wxZRColaUpdater::OnUpdate(wxCommandEvent& event)
{
event.Skip();
if (m_updater)
m_updater->LaunchUpdate();
}

51
ZRCola/zrcolaupdater.h Normal file
View File

@ -0,0 +1,51 @@
/*
Copyright 2015-2016 Amebis
This file is part of ZRCola.
ZRCola is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ZRCola is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
*/
///
/// Forward declarations
///
class wxZRColaUpdater;
#pragma once
#include "zrcolagui.h"
#include <Updater/chkthread.h>
#include <wx/log.h>
///
/// ZRCola updater dialog
///
class wxZRColaUpdater : public wxZRColaUpdaterBase
{
public:
wxZRColaUpdater(wxWindow* parent);
virtual ~wxZRColaUpdater();
protected:
void OnCheckComplete(wxThreadEvent& event);
virtual void OnUpdate(wxCommandEvent& event);
protected:
wxLog *m_logOrig; ///< Original log
wxUpdCheckThread *m_updater; ///< Updater thread
};

BIN
include/MSIBuildCfg.mak
View File

Binary file not shown.

2
lib/wxExtend

@ -1 +1 @@
Subproject commit cdefd74f3f960d5fe6858204dd034a0b19ebac84 Subproject commit e25bce487b192b3c19d08247fbeb0817beb7ccc9

1
output/locale/.gitignore vendored
View File

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