diff options
Diffstat (limited to 'graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch')
| -rw-r--r-- | graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch b/graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch new file mode 100644 index 0000000000..1389cb7659 --- /dev/null +++ b/graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch @@ -0,0 +1,75 @@ +From 665c12145d6d236992d213c73b78e2f1846f6def Mon Sep 17 00:00:00 2001 +From: Steffen Macke <sdteffen@sdteffen.de> +Date: Fri, 16 Aug 2013 21:50:50 +0200 +Subject: [PATCH 19/24] Bug #667500 - Avoid $\r syntax for NSIS line breaks to + avoid POEdit confusion + +--- + installer/win32/Makefile.am | 2 ++ + installer/win32/gennsh.c | 24 ++++++++++++++++-------- + 2 files changed, 18 insertions(+), 8 deletions(-) + +diff --git a/installer/win32/Makefile.am b/installer/win32/Makefile.am +index f715f7e..3335fb1 100644 +--- a/installer/win32/Makefile.am ++++ b/installer/win32/Makefile.am +@@ -1,4 +1,6 @@ + ## Process this file with automake to produce Makefile.in ++## Manually build gennsh on Linux: ++## gcc `pkg-config --cflags glib-2.0` -o gennsh gennsh.c + + SUBDIRS = locale + +diff --git a/installer/win32/gennsh.c b/installer/win32/gennsh.c +index d6603b5..fa48d16 100755 +--- a/installer/win32/gennsh.c ++++ b/installer/win32/gennsh.c +@@ -2,7 +2,7 @@ + * Copyright (C) 1998 Alexander Larsson + * + * gennsh.c +- * Copyright (C) 2009,2011 Steffen Macke <sdteffen@sdteffen.de> ++ * Copyright (C) 2009,2011,2013 Steffen Macke <sdteffen@sdteffen.de> + * + * gennsh is a program that allows to generate locale file for the + * Dia for Windows installer +@@ -71,14 +71,22 @@ int main(int argc, char *argv[]) + /* Installer message: Dia uninstaller entry in Control Panel */ + printf("!define DIA_UNINSTALL_DESC \"%s\"\n", _("Dia (remove only)")); + +- /* Installer message: confirmation question. Keep $\r */ +- printf("!define DIA_PROMPT_WIPEOUT \"%s\"\n", g_strescape(_("Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."), "")); ++ /* Installer message: directory delete confirmation line 1 */ ++ printf("!define DIA_PROMPT_WIPEOUT \"%s$\\r$\\r%s$\\r%s\"\n", _("Your old Dia directory is about to be deleted. Would you like to continue?"), ++ /* Installer message: directory delete confirmation line 2 */ ++ _("Note: Any non-standard plugins that you may have installed will be deleted."), ++ /* Installer message: directory delete confirmation line 3*/ ++ _("Dia user settings will not be affected.")); + +- /* Installer message: confirmatin question. Keep $\r */ +- printf("!define DIA_PROMPT_DIR_EXISTS \"%s\"\n", g_strescape(_("The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"), "")); ++ /* Installer message: DIA_PROMPT_DIR_EXISTS line 1 */ ++ printf("!define DIA_PROMPT_DIR_EXISTS \"%s$\\r%s\"\n", _("The installation directory you specified already exists. Any contents"), ++ /* Installer message: DIA_PROMP_DIR_EXISTS line 2 */ ++ _("will be deleted. Would you like to continue?")); + +- /* Installer message: Uninstall Section Prompts. Keep $\r */ +- printf("!define un.DIA_UNINSTALL_ERROR_1 \"%s\"\n", g_strescape(_("The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."), "")); ++ /* Installer message: registry entries not found line 1 */ ++ printf("!define un.DIA_UNINSTALL_ERROR_1 \"%s$\\r%s\"\n", _("The uninstaller could not find registry entries for Dia."), ++ /* Installer message: registry entries not found line 2 */ ++ _("It is likely that another user installed this application.")); + + /* Installer message: Uninstall error message */ + printf("!define un.DIA_UNINSTALL_ERROR_2 \"%s\"\n", _("You do not have permission to uninstall this application.")); +@@ -87,6 +95,6 @@ int main(int argc, char *argv[]) + printf("!define un.DIA_UNINSTALLATION_WARNING \"%s\"\n", _("This will completely delete $INSTDIR and all subdirectories. Continue?")); + + /* Installer message: Uninstallation warning. Keep $\PROFILE\.dia */ +- printf("!define un.DIA_DOTDIA_WARNING \"%s\"\n", _("This will completely delete $PROFILE\.dia and all subdirectories. Continue?")); ++ printf("!define un.DIA_DOTDIA_WARNING \"%s\"\n", _("This will completely delete $PROFILE\\.dia and all subdirectories. Continue?")); + return 0; + } +-- +1.8.4.4 + |