Merge branch 'master' into i18n

diff --combined wscript
index 2a5c549518e944ec4270192f37db4b1887031a17,7d9b65320bb83b3afef0aa5228e4327da2c46318..edf01784bd094ecba926d77208c57b8bdd568032
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
- VERSION = '0.74pre'
+ VERSION = '0.75beta1'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -198,15 -198,6 +198,15 @@@ def configure(conf)
                               define_name = 'HAVE_BUFFERSRC_H',
                               mandatory = False)
  
 +    conf.find_program('msgfmt', var='MSGFMT')
 +    
 +    datadir = conf.env.DATADIR
 +    if not datadir:
 +        datadir = os.path.join(conf.env.PREFIX, 'share')
 +    
 +    conf.define('LOCALEDIR', os.path.join(datadir, 'locale'))
 +    conf.define('DATADIR', datadir)
 +
      conf.recurse('src')
      conf.recurse('test')
  
@@@ -262,9 -253,3 +262,9 @@@ def create_version_cc(version)
  def post(ctx):
      if ctx.cmd == 'install':
          ctx.exec_command('/sbin/ldconfig')
 +
 +def pot(bld):
 +    bld.recurse('src')
 +
 +def mo(bld):
 +    bld.recurse('src')