Merge pull request #573 from andreasb242/windows-build

Windows build

src/util/i18n.h

@@ -17,7 +17,7 @@
 #undef snprintf
 
 #define _(msg) gettext(msg)
-#define C_(context, msg) g_dpgettext (NULL, context "\004" msg, strlen(msg) + 1)
+#define C_(context, msg) g_dpgettext2 (NULL, context, msg)
 
 // Formatted Translation
 #define _F(msg) PlaceholderString(_(msg))

windows-setup/build-setup.sh

@@ -44,7 +44,7 @@ mkdir -p setup/share/po/zh/LC_MESSAGES
 cp -r ../po/cs.mo setup/share/po/cs/LC_MESSAGES/xournalpp.mo
 cp -r ../po/zh_HK.mo setup/share/po/zh_HK/LC_MESSAGES/xournalpp.mo
 cp -r ../po/de.mo setup/share/po/de/LC_MESSAGES/xournalpp.mo
-cp -r ../po/ps.mo setup/share/po/pl/LC_MESSAGES/xournalpp.mo
+cp -r ../po/pl.mo setup/share/po/pl/LC_MESSAGES/xournalpp.mo
 cp -r ../po/zh_TW.mo setup/share/po/zh_TW/LC_MESSAGES/xournalpp.mo
 cp -r ../po/zh.mo setup/share/po/zh/LC_MESSAGES/xournalpp.mo
 

windows-setup/xournalpp.nsi

@@ -61,26 +61,26 @@ Var StartMenuFolder
 ;Installer Sections
 
 Section "Xournal++" SecFeatures
+	; Required
+	SectionIn RO
 
-  SetOutPath "$INSTDIR"
-  
-  ; Files to put into the setup
-  File /r "setup\*"
-  
-  ;Store installation folder
-  WriteRegStr HKCU "Software\Xournalpp" "" $INSTDIR
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    
-    ;Create shortcuts
-    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Xournal++.lnk" "$INSTDIR\Bin\xournalpp.exe"
-    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_END
+	SetOutPath "$INSTDIR"
+
+	; Files to put into the setup
+	File /r "setup\*"
+
+	;Store installation folder
+	WriteRegStr HKCU "Software\Xournalpp" "" $INSTDIR
+
+	;Create uninstaller
+	WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+		;Create shortcuts
+		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+		CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Xournal++.lnk" "$INSTDIR\Bin\xournalpp.exe"
+		CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+	!insertmacro MUI_STARTMENU_WRITE_END
 
 SectionEnd