From cc0051cb402f9a76c883809d41688caddd2d5afb Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Mon, 12 Nov 2012 00:17:24 +0100 Subject: Move HexChat L10n to share\locale where it should've been in the first place --- config-win32.h | 2 +- win32/hexchat-xp.props | 2 +- win32/hexchat.props | 2 +- win32/installer/hexchat-x64.skel.iss | 1 - win32/installer/hexchat-x86.skel.iss | 1 - win32/installer/hexchat-xp-x64.skel.iss | 1 - win32/installer/hexchat-xp-x86.skel.iss | 1 - 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config-win32.h b/config-win32.h index e15b8ca4..cc80b37a 100644 --- a/config-win32.h +++ b/config-win32.h @@ -1,4 +1,4 @@ -#define LOCALEDIR "./locale" +#define LOCALEDIR ".\\share\\locale" #define ENABLE_NLS #define USE_GMODULE #define USE_PLUGIN diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props index 68a5d827..dcb56d7f 100644 --- a/win32/hexchat-xp.props +++ b/win32/hexchat-xp.props @@ -104,7 +104,7 @@ copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins" copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)" -xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\locale" +xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\share\locale" xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale" copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)" diff --git a/win32/hexchat.props b/win32/hexchat.props index a61c5b57..070019d3 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -101,7 +101,7 @@ copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins" -xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\locale" +xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\share\locale" xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale" copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)" diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index d318b45c..385ccaf2 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -95,7 +95,6 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "locale\*"; DestDir: "{app}\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index ea25c3f2..ec6a8e7a 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -94,7 +94,6 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "locale\*"; DestDir: "{app}\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss index 7661ef27..69f3cce8 100644 --- a/win32/installer/hexchat-xp-x64.skel.iss +++ b/win32/installer/hexchat-xp-x64.skel.iss @@ -105,7 +105,6 @@ Source: "LICENSE.LIBXML"; DestDir: "{app}"; Flags: ignoreversion; Components: li Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "locale\*"; DestDir: "{app}\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations ;Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: spelling diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss index 0c27aeac..4bffaa04 100644 --- a/win32/installer/hexchat-xp-x86.skel.iss +++ b/win32/installer/hexchat-xp-x86.skel.iss @@ -104,7 +104,6 @@ Source: "LICENSE.LIBXML"; DestDir: "{app}"; Flags: ignoreversion; Components: li Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "locale\*"; DestDir: "{app}\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations ;Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: spelling -- cgit 1.4.1