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

diff --combined platform/osx/make_dmg.sh
index 5500c42678c048599783376aaac640eefe1070ed,722c0c39e852acbaaf7c4eb057e69d1d4dafa1ca..2e6b444b2960e6d00f760f0ba86766c8012eb471
--- 1/platform/osx/make_dmg.sh
--- 2/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@@ -15,7 -15,7 +15,7 @@@ WORK=build/platform/os
  ENV=/Users/carl/Environments/osx/10.6
  ROOT=$1
  
 -appdir="DCP-o-matic.app"
 +appdir="DCP-o-matic 2.app"
  approot="$appdir/Contents"
  libs="$approot/lib"
  macos="$approot/MacOS"
@@@ -53,16 -53,16 +53,16 @@@ function universal_copy_lib 
      relink="$relink|$2"
  }
  
 -universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic "$WORK/$macos"
 -universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli "$WORK/$macos"
 -universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli "$WORK/$macos"
 -universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_batch "$WORK/$macos"
 -universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic.dylib "$WORK/$libs"
 -universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic-wx.dylib "$WORK/$libs"
 +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$WORK/$macos"
 +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$WORK/$macos"
 +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$WORK/$macos"
 +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$WORK/$macos"
 +universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$WORK/$libs"
 +universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$WORK/$libs"
  universal_copy_lib $ROOT libcxml "$WORK/$libs"
 -universal_copy_lib $ROOT libdcp "$WORK/$libs"
 -universal_copy_lib $ROOT libasdcp-libdcp "$WORK/$libs"
 -universal_copy_lib $ROOT libkumu-libdcp "$WORK/$libs"
 +universal_copy_lib $ROOT libdcp-1.0 "$WORK/$libs"
 +universal_copy_lib $ROOT libasdcp-libdcp-1.0 "$WORK/$libs"
 +universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs"
  universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
  universal_copy_lib $ROOT libavdevice "$WORK/$libs"
  universal_copy_lib $ROOT libavformat "$WORK/$libs"
@@@ -108,11 -108,10 +108,11 @@@ universal_copy_lib $ENV libcairo "$WORK
  
  relink=`echo $relink | sed -e "s/\+//g"`
  
 -for obj in "$WORK/$macos/dcpomatic" "$WORK/$macos/dcpomatic_batch" "$WORK/$macos/dcpomatic_cli" "$WORK/$macos/dcpomatic_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
 +for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
    deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
    changes=""
    for dep in $deps; do
 +      echo "Relinking $dep into $obj"
        base=`basename $dep`
        # $dep will be a path within 64/; make a 32/ path too
        dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
@@@ -130,14 -129,13 +130,14 @@@ cp icons/defaults.png "$WORK/$resources
  cp icons/kdm_email.png "$WORK/$resources"
  cp icons/servers.png "$WORK/$resources"
  cp icons/tms.png "$WORK/$resources"
 +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
@@@ -171,7 -169,7 +171,7 @@@ echo 
             set theViewOptions to the icon view options of container window
             set arrangement of theViewOptions to not arranged
             set icon size of theViewOptions to 64
 -           set position of item "DCP-o-matic.app" of container window to {90, 80}
 +           set position of item "DCP-o-matic 2.app" of container window to {90, 80}
             set position of item "Applications" of container window to {310, 80}
             close
             open

diff --combined run/dcpomatic
index 9cf5a26194961e92fb790b8cc9d4292e14829699,d273b1a699c0aa3ebcbbbc5c3fc03cc23340aaf4..eb6f52d235aeabc61c2f16b9af567275f2fe088b
--- 1/run/dcpomatic
--- 2/run/dcpomatic
+++ b/run/dcpomatic
@@@ -64,10 -64,10 +64,10 @@@ if [ `uname -s` == "Darwin" ]; the
    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
@@@ -90,24 -90,24 +90,24 @@@ els
    export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
    if [ "$1" == "--debug" ]; then
        shift
 -      gdb --args build/src/tools/dcpomatic $*
 +      gdb --args build/src/tools/dcpomatic2 $*
    elif [ "$1" == "--valgrind" ]; then
        shift
 -      valgrind --tool="memcheck" build/src/tools/dcpomatic $*
 +      valgrind --tool="memcheck" build/src/tools/dcpomatic2 $*
    elif [ "$1" == "--callgrind" ]; then
        shift
 -      valgrind --tool="callgrind" build/src/tools/dcpomatic $*
 +      valgrind --tool="callgrind" build/src/tools/dcpomatic2 $*
    elif [ "$1" == "--massif" ]; then
        shift
 -      valgrind --tool="massif" build/src/tools/dcpomatic $*
 +      valgrind --tool="massif" build/src/tools/dcpomatic2 $*
    elif [ "$1" == "--i18n" ]; then
        shift
 -      LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic "$*"
 +      LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2 "$*"
    elif [ "$1" == "--perf" ]; then
        shift
 -      perf record build/src/tools/dcpomatic $*
 +      perf record build/src/tools/dcpomatic2 $*
    else
 -      build/src/tools/dcpomatic $*
 +      build/src/tools/dcpomatic2 $*
    fi
  fi