From 2a85814c785c6cc6afd85a62ccbebd4615331065 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 11 Mar 2016 13:34:35 +0100 Subject: [PATCH 1/3] MSIBuild fixed --- MSICA/MSIBuild/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MSICA/MSIBuild/Makefile b/MSICA/MSIBuild/Makefile index 251b71e..e7fbeb6 100644 --- a/MSICA/MSIBuild/Makefile +++ b/MSICA/MSIBuild/Makefile @@ -137,7 +137,7 @@ Binary Name binMSICA.dll MSICA.dll < NUL From 2593212e7e72f3e34358a070fd6a7b724d0196e3 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 11 Mar 2016 13:34:50 +0100 Subject: [PATCH 2/3] Translations updated --- MSICA/L10N/sl_SI.po | 87 ++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/MSICA/L10N/sl_SI.po b/MSICA/L10N/sl_SI.po index 3c4dd3c..e786ace 100644 --- a/MSICA/L10N/sl_SI.po +++ b/MSICA/L10N/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: MSICA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-24 09:30+0100\n" +"POT-Creation-Date: 2016-03-11 13:31+0100\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -13,62 +13,17 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: __\n" "X-Poedit-Basepath: ..\n" -"X-Generator: Poedit 1.7.4\n" +"X-Generator: Poedit 1.8.7\n" "X-Poedit-SearchPath-0: MSIBuild\n" -# Language Code and Windows Charset (hexadecimal) -# If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. -# For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). -#: res/MSICA.rcx:42 -msgid "040904e4" -msgstr "042404e2" - -# Language Code (hexadecimal) -# If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. -# For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). -#: res/MSICA.rcx:60 -msgid "0x409" -msgstr "0x424" - # Windows charset for this language (decimal) -#: res/MSICA.rcx:60 MSIBuild/En.Win32.Debug.ActionText-2.idtx:3 +#: MSIBuild/En.Win32.Debug.ActionText-2.idtx:3 #: MSIBuild/En.Win32.Release.ActionText-2.idtx:3 #: MSIBuild/En.x64.Debug.ActionText-2.idtx:3 #: MSIBuild/En.x64.Release.ActionText-2.idtx:3 msgid "1252" msgstr "1250" -# The name of the constant in RC to include the resources in this language. -#: res/MSICA.rcx:41 res/MSICA.rcx:59 res/MSICA.rcx:75 -msgid "AFX_TARG_ENU" -msgstr "AFX_TARG_SLV" - -#: res/MSICA.rcx:44 -msgid "Amebis, d. o. o., Kamnik, Slovenia" -msgstr "Amebis, d. o. o., Kamnik, Slovenija" - -#: res/MSICA.rcx:48 -msgid "Copyright © Amebis, 2012" -msgstr "Vse pravice pridržane © Amebis, 2012" - -#: res/MSICA.rcx:45 -msgid "Installation Support Library" -msgstr "Podporna knjižnica za namestitve" - -# Language Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) -#: res/MSICA.rcx:77 -msgid "LANG_ENGLISH" -msgstr "LANG_SLOVENIAN" - -#: res/MSICA.rcx:47 res/MSICA.rcx:49 -msgid "MSICA" -msgstr "MSICA" - -# Sublanguage Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) -#: res/MSICA.rcx:77 -msgid "SUBLANG_DEFAULT" -msgstr "SUBLANG_DEFAULT" - #: MSIBuild/En.Win32.Debug.ActionText-2.idtx:7 #: MSIBuild/En.Win32.Debug.ActionText-2.idtx:8 #: MSIBuild/En.Win32.Release.ActionText-2.idtx:7 @@ -179,3 +134,39 @@ msgstr "Zaustavitev servisov" #: MSIBuild/En.x64.Release.ActionText-2.idtx:9 msgid "WLAN profile: [1]" msgstr "Profil WLAN: [1]" + +# Language Code and Windows Charset (hexadecimal) +# If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. +# For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). +#~ msgid "040904e4" +#~ msgstr "042404e2" + +# Language Code (hexadecimal) +# If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. +# For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). +#~ msgid "0x409" +#~ msgstr "0x424" + +# The name of the constant in RC to include the resources in this language. +#~ msgid "AFX_TARG_ENU" +#~ msgstr "AFX_TARG_SLV" + +#~ msgid "Amebis, d. o. o., Kamnik, Slovenia" +#~ msgstr "Amebis, d. o. o., Kamnik, Slovenija" + +#~ msgid "Copyright © Amebis, 2012" +#~ msgstr "Vse pravice pridržane © Amebis, 2012" + +#~ msgid "Installation Support Library" +#~ msgstr "Podporna knjižnica za namestitve" + +# Language Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) +#~ msgid "LANG_ENGLISH" +#~ msgstr "LANG_SLOVENIAN" + +#~ msgid "MSICA" +#~ msgstr "MSICA" + +# Sublanguage Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) +#~ msgid "SUBLANG_DEFAULT" +#~ msgstr "SUBLANG_DEFAULT" From 6aaa31def234773bd63719e034094897287d9bef Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 11 Mar 2016 14:12:44 +0100 Subject: [PATCH 3/3] Common property sheet removed and referenced in Win32 and x64 property sheets now --- MSICA/MSICA.vcxproj | 3 --- include/Win32.props | 4 +++- include/x64.props | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MSICA/MSICA.vcxproj b/MSICA/MSICA.vcxproj index 8b83c62..6de0d78 100644 --- a/MSICA/MSICA.vcxproj +++ b/MSICA/MSICA.vcxproj @@ -49,7 +49,6 @@ - @@ -63,14 +62,12 @@ - - diff --git a/include/Win32.props b/include/Win32.props index fbd0e31..b63e5b4 100644 --- a/include/Win32.props +++ b/include/Win32.props @@ -1,6 +1,8 @@  - + + + <_PropertySheetDisplayName>MSICA Win32 diff --git a/include/x64.props b/include/x64.props index ff52cec..30140ff 100644 --- a/include/x64.props +++ b/include/x64.props @@ -1,6 +1,8 @@  - + + + <_PropertySheetDisplayName>MSICA x64