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

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 230e02c88f8e2f8a587257c5bb77be7fe040fdd5..084e0fff73e2ac30f8133fade6ca445976ee350f 100644 (file)
--- 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 c90c97e71aa894fb1e14b1af15510c1bd299298e..5383907d5f0e9fe1cfbbe26850e93ffa8f156346 100644 (file)
--- 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 6f7bc583027e3c306c36b74e11f4abaa36d2f16a..5b3f4854686221d9a27693ca1ca3f18976863a64 100644 (file)
--- 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"