Merge remote-tracking branch 'origin/master' into 2.0

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 5500c42678c048599783376aaac640eefe1070ed..2e6b444b2960e6d00f760f0ba86766c8012eb471 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -134,10 +134,10 @@ cp icons/keys.png "$WORK/$resources"
 
 # i18n: DCP-o-matic .mo files
 for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
-  mkdir "$WORK/$resources/$lang"
-  cp build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang"
-  cp build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang"
-  cp build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang"
+  mkdir "$WORK/$resources/$lang/LC_MESSAGES"
+  cp build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
 done
 
 # i18n: wxWidgets .mo files

diff --git a/run/dcpomatic b/run/dcpomatic
index 9cf5a26194961e92fb790b8cc9d4292e14829699..eb6f52d235aeabc61c2f16b9af567275f2fe088b 100755 (executable)
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -64,10 +64,10 @@ if [ `uname -s` == "Darwin" ]; then
   cp icons/kdm_email.png $resources
 
   for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
-    mkdir "$resources/$lang"
-    cp build/src/lib/mo/$lang/*.mo "$resources/$lang"
-    cp build/src/wx/mo/$lang/*.mo "$resources/$lang"
-    cp build/src/tools/mo/$lang/*.mo "$resources/$lang"
+    mkdir "$resources/$lang/LC_MESSAGES"
+    cp build/src/lib/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES"
+    cp build/src/wx/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES"
+    cp build/src/tools/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES"
   done
  
   sed -e "s/@VERSION@/test/g" platform/osx/Info.plist.in > $app/Contents/Info.plist