[X2Go-Commits] [x2goclient] 01/01: x2goclient.nsi: Add descriptions for "components"
git-admin at x2go.org
git-admin at x2go.org
Sat May 9 21:57:32 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 2857e6cd9d6ee3efe55ac84b705aab5cd4c446fb
Author: Mike DePaulo <mikedep333 at gmail.com>
Date: Sat May 9 15:53:25 2015 -0400
x2goclient.nsi: Add descriptions for "components"
(English language only at this time)
---
debian/changelog | 2 ++
nsis/x2goclient.nsi | 14 +++++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 83d08b1..e6e7f76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
- Windows: Include debug build in the regular installer.
It is an optional component during the install. It is not
installed by default.
+ - Windows: Add descriptions for the "components" in the installer
+ (English language only at this time)
- Windows: Upgrade bundled PulseAudio from 5.0-rev18 to 6.0-11.1
(No known impacts to X2Go, except for the fact that many needed
patches are now included in upstream PulseAudio.)
diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi
index 43b6f54..a0e6948 100644
--- a/nsis/x2goclient.nsi
+++ b/nsis/x2goclient.nsi
@@ -148,7 +148,7 @@ Section "X2Go Client (required)" base
SectionEnd
;x2goclient bug 108 fix
-SectionGroup "Fonts"
+SectionGroup "Fonts" fonts
;Empirical testing shows that "misc" fixes compatibility for the majority
;of applications with font compatibility programs.
@@ -229,8 +229,20 @@ LangString ADM_RIGHT ${LANG_ENGLISH} "You have to be Administrator on this compu
LangString ADM_RIGHT ${LANG_GERMAN} "Sie brauchen Administratorenrechte um X2go Client zu installieren"
LangString ADM_RIGHT ${LANG_RUSSIAN} "��� ����, ����� ���������� X2Go Client, ���������� ���� ��������������� ����� ����������"
+LangString DESC_base ${LANG_ENGLISH} "The regular build of X2Go Client and all its required dependencies"
+LangString DESC_fonts ${LANG_ENGLISH} "Fonts are required for certain legacy/proprietary apps to run properly."
+LangString DESC_desktopshortcut ${LANG_ENGLISH} "Desktop shortcut"
+LangString DESC_debugbuild ${LANG_ENGLISH} "A build of X2Go Client with console debugging output. Install and use this if you are reporting a bug."
!Insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${base} $(DESC_base)
+ !insertmacro MUI_DESCRIPTION_TEXT ${fonts} $(DESC_fonts)
+ !insertmacro MUI_DESCRIPTION_TEXT ${fonts-misc} $(DESC_fonts)
+ !insertmacro MUI_DESCRIPTION_TEXT ${fonts-75dpi} $(DESC_fonts)
+ !insertmacro MUI_DESCRIPTION_TEXT ${fonts-100dpi} $(DESC_fonts)
+ !insertmacro MUI_DESCRIPTION_TEXT ${fonts-others} $(DESC_fonts)
+ !insertmacro MUI_DESCRIPTION_TEXT ${desktopshortcut} $(DESC_desktopshortcut)
+ !insertmacro MUI_DESCRIPTION_TEXT ${debugbuild} $(DESC_debugbuild)
!Insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list