From: Carl Hetherington <cth@carlh.net>
Date: Tue, 12 Mar 2013 22:29:20 +0000 (+0000)
Subject: Merge branch 'master' of /home/carl/git/dvdomatic
X-Git-Tag: v2.0.48~1337^2~573
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=2f7180555f2d8b727bde21613fc2474bb4f7664c;hp=7d262f9be3a4c5d8da07dce42f7e2da708f6c7f4;p=dcpomatic.git

Merge branch 'master' of /home/carl/git/dvdomatic
---

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 230e02c88..084e0fff7 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -456,9 +456,6 @@ setup_i18n ()
 #ifdef __WXGTK__
 		locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale"));
 #endif
-#ifdef __WXMSW__
-		locale->AddCatalogLookupPathPrefix (wxT ("../locale"));
-#endif		
 
 		locale->AddCatalog (wxT ("libdvdomatic-wx"));
 		locale->AddCatalog (wxT ("dvdomatic"));
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index c90c97e71..5383907d5 100644
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -93,7 +93,7 @@ File "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
-SetOutPath "$INSTDIR\locale\fr_FR"
+SetOutPath "$INSTDIR\bin\fr_FR"
 
 File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
 File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 6f7bc5830..5b3f48546 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -103,7 +103,7 @@ File "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
-SetOutPath "$INSTDIR\locale\fr_FR"
+SetOutPath "$INSTDIR\bin\fr_FR"
 
 File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
 File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"