Merge master.

diff --git a/ChangeLog b/ChangeLog
index cf9eef43efbb61d34281ef45b14b682c237d5c40..a82e58eb3243daaa9b043086bb195ec5eaba1769 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2013-04-09  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.81 released.
+
+2013-04-09  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.81beta1 released.
+
+2013-04-08  Carl Hetherington  <cth@carlh.net>
+
+       * Add 16:9-within-Scope format.
+
+2013-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.80 released.
+
+2013-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.80beta4 released.
+
+2013-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.80beta3 released.
+
+2013-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.80beta2 released.
+
+2013-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.80beta1 released.
+
 2013-04-07  Carl Hetherington  <cth@carlh.net>
 
        * Make the audio plot expand in height when its

diff --git a/cscript b/cscript
new file mode 100644 (file)
index 0000000..4873df6
--- /dev/null
+++ b/cscript
@@ -0,0 +1,49 @@
+import glob
+
+builds = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64']
+
+def build(environment, variant, version):
+    if environment == 'windows':
+        command('./waf configure --target-windows')
+        command('./waf clean')
+        command('./waf')
+        shutil.copyfile('build/windows/installer.%s.nsi' % variant, 'build/windows/installer2.%s.nsi' % variant)
+        command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant))
+        command('sed -i "s~%%deps%%~$WINDOWS_PREFIX~g" build/windows/installer2.%s.nsi' % variant)
+        command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant))
+        command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % variant)
+        command('makensis build/windows/installer2.%s.nsi' % variant)
+        return glob.glob('build/windows/*%s*.exe' % variant)[0]
+    elif environment == 'ubuntu':
+        v = variant.split('-')
+        bits = v[1]
+        if bits == '32':
+            cpu = 'i386'
+        else:
+            cpu = 'amd64'
+
+        shutil.copyfile(os.path.join('builds', 'control-%s' % variant), os.path.join('debian', 'control'))
+        command('./waf dist')
+        f = open(os.path.join('debian', 'files'), 'w')
+        print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu)
+        shutil.rmtree('build/deb', ignore_errors=True)
+        os.makedirs('build/deb')
+        os.chdir('build/deb')
+        shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version)
+        command('tar xjf dvdomatic_%s.orig.tar.bz2' % version)
+        os.chdir('dvdomatic-%s' % version)
+        command('dch -b -v %s-1 "New upstream release."' % version)
+        command('dpkg-source -b .')
+        command('dpkg-buildpackage')
+        return os.path.abspath(glob.glob('../*.deb')[0])
+
+def make_pot():
+    command('./waf pot')
+    return [os.path.abspath('build/src/lib/libdvdomatic.pot'),
+            os.path.abspath('build/src/wx/libdvdomatic-wx.pot'),
+           os.path.abspath('build/src/tools/dvdomatic.pot')]
+
+def make_manual():
+    os.chdir('doc/manual')
+    command('make')
+    return [os.path.abspath('pdf'), os.path.abspath('html')]

diff --git a/cscript.py b/cscript.py
new file mode 100644 (file)
index 0000000..9b8fa46
--- /dev/null
+++ b/cscript.py
@@ -0,0 +1,8 @@
+import cdist
+
+def builds():
+       return ['source']
+
+def build_source():
+       cdist.build_source_waf()
+

diff --git a/debian/changelog b/debian/changelog
index 5e056126fa72579705c97b4633c36f662db59789..06bc76ce80d9e6c7ffe1e448e5e9a52e24e0a904 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+dvdomatic (0.81-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Tue, 09 Apr 2013 19:48:04 +0100
+
+dvdomatic (0.81beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Tue, 09 Apr 2013 15:37:32 +0100
+
+dvdomatic (0.80-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 23:48:12 +0100
+
+dvdomatic (0.80beta4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 23:08:49 +0100
+
+dvdomatic (0.80beta3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 22:44:29 +0100
+
+dvdomatic (0.80beta2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 22:19:34 +0100
+
+dvdomatic (0.80beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 18:21:33 +0100
+
 dvdomatic (0.79-1) UNRELEASED; urgency=low
 
   * New upstream release.

diff --git a/src/lib/format.cc b/src/lib/format.cc
index addab2b600f35c0984536147c27d640488431856..5eda9eb889ef1896b9a86613259b12424a58c49f 100644 (file)
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -112,6 +112,10 @@ Format::setup_formats ()
                new FixedFormat (185, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F")
                        ));
        
+       _formats.push_back (
+               new FixedFormat (178, libdcp::Size (2048, 858), N_("178-in-scope"), _("16:9 within Scope"), N_("S")
+                       ));
+       
        _formats.push_back (
                new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S")
                        ));

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 8f6a065635315776133a5060efa8c8e4a09f12e4..17051bd9858c5fc5d55d061d1f1eb632da5d6e68 100644 (file)
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDVDOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:10-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -49,6 +49,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 en Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 en Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "reducción de ruido 3D"
@@ -214,7 +219,7 @@ msgstr "Película"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat sin deformación"
 
@@ -332,11 +337,11 @@ msgstr ""
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope sin deformación"
 

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index ccdad3fe2b0603b6571c5ed19bd504078435f1df..d9d945b52166e48174a12aebbeaf4f975c7d1f3e 100644 (file)
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
@@ -48,6 +48,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 dans Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 dans Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "Débruitage 3D"
@@ -139,7 +144,7 @@ msgstr "Le DCP et la source ont les mêmes cadences.\n"
 #: src/lib/util.cc:1017
 #, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
-msgstr "La cadence du DCP sera %1%% par rapport à la source\n"
+msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
 #: src/lib/util.cc:1010
 msgid "DCP will use every other frame of the source.\n"
@@ -212,7 +217,7 @@ msgstr "Feature"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat sans déformation"
 
@@ -330,11 +335,11 @@ msgstr "Arrière droite"
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope sans déformation"
 

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 8e9b7166bb190cee457ae7cf252be0222c8b6955..992eda1075028a39e183706435db42cfd4654505 100644 (file)
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-03-20 11:45+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-03 15:04+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
 "Language: Italiano\n"
@@ -49,6 +49,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 all'interno di Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 all'interno di Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "Riduttore di rumore 3D"
@@ -91,11 +96,11 @@ msgstr "Bilineare"
 
 #: src/lib/job.cc:302
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancellato"
 
 #: src/lib/exceptions.cc:60
 msgid "Cannot handle pixel format %1 during %2"
-msgstr ""
+msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
 #: src/lib/encoder.cc:101
 msgid "Cannot resample audio as libswresample is not present"
@@ -103,7 +108,7 @@ msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
 
 #: src/lib/util.cc:932
 msgid "Centre"
-msgstr ""
+msgstr "Centro"
 
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
@@ -138,7 +143,6 @@ msgid "DCP and source have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
 #: src/lib/util.cc:1017
-#, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
@@ -213,7 +217,7 @@ msgstr "Caratteristica"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat senza stiramento"
 
@@ -259,15 +263,15 @@ msgstr "Lanczos"
 
 #: src/lib/util.cc:930
 msgid "Left"
-msgstr ""
+msgstr "Sinistro"
 
 #: src/lib/util.cc:934
 msgid "Left surround"
-msgstr ""
+msgstr "Surround sinistro"
 
 #: src/lib/util.cc:933
 msgid "Lfe (sub)"
-msgstr ""
+msgstr "Lfe(sub)"
 
 #: src/lib/filter.cc:75
 msgid "Linear blend deinterlacer"
@@ -321,21 +325,21 @@ msgstr "Rec 709"
 
 #: src/lib/util.cc:931
 msgid "Right"
-msgstr ""
+msgstr "Destro"
 
 #: src/lib/util.cc:935
 msgid "Right surround"
-msgstr ""
+msgstr "Surround destro"
 
 #: src/lib/scp_dcp_job.cc:133
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope senza stiramento"
 
@@ -417,7 +421,7 @@ msgstr "X"
 
 #: src/lib/filter.cc:83
 msgid "Yet Another Deinterlacing Filter"
-msgstr "Ancora un altro filtro di deinterlacciamento"
+msgstr "Altro filtro di deinterlacciamento"
 
 #: src/lib/film.cc:263
 msgid "cannot contain slashes"
@@ -444,7 +448,6 @@ msgid "copying %1"
 msgstr "copia %1"
 
 #: src/lib/exceptions.cc:36
-#, fuzzy
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -469,7 +472,6 @@ msgid "could not open external audio file for reading"
 msgstr "non riesco ad aprire il file dell'audio esterno per leggerlo"
 
 #: src/lib/exceptions.cc:29
-#, fuzzy
 msgid "could not open file %1"
 msgstr "non riesco ad aprire il file per leggerlo"
 
@@ -478,7 +480,6 @@ msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
 #: src/lib/exceptions.cc:44
-#, fuzzy
 msgid "could not read from file %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
@@ -495,7 +496,6 @@ msgid "could not start SSH session"
 msgstr "non posso avviare la sessione SSH"
 
 #: src/lib/exceptions.cc:50
-#, fuzzy
 msgid "could not write to file %1 (%2)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -537,7 +537,7 @@ msgstr "persa la chiave %1 tra i valori chiave"
 
 #: src/lib/exceptions.cc:54
 msgid "missing required setting %1"
-msgstr ""
+msgstr "persa la regolazione richiesta %1"
 
 #: src/lib/subtitle.cc:52
 msgid "multi-part subtitles not yet supported"

diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index a155771a78c36eac85e51409a6941c59f111539a..d574261c81757a6bc35b62becdd4363984dfe307 100644 (file)
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-04-04 10:22+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -49,6 +49,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 innanför Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 innanför Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "3D brusreducering"
@@ -139,7 +144,6 @@ msgid "DCP and source have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
 
 #: src/lib/util.cc:1017
-#, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
@@ -214,7 +218,7 @@ msgstr "Långfilm"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat utan utsträckning"
 
@@ -332,11 +336,11 @@ msgstr "Höger surround"
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope utan utsträckning"
 

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 4a3710eb832d253c4b32205ddcd6ea7995936c73..1ab1a84899c8a8dac100a32984de8921109b7ae3 100644 (file)
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVDOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-23 21:08-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 3c4cc79c544ceb7e1eacb8953cbd52fe4c710bb7..35e686f67514093f5d307d7bcd1bcd714792be77 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-13 22:33+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 850fd9b1fcb335cfc6b5fc629761a14eedba871c..09e3f5f3463ed9557e4116ae5a4d4e8f12864cdf 100644 (file)
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-03-22 18:03+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-03 13:00+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
 "Language: Italiano\n"
@@ -76,7 +76,6 @@ msgid "About"
 msgstr "Informazioni"
 
 #: src/tools/dvdomatic.cc:527
-#, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
@@ -108,14 +107,13 @@ msgstr "&Mostra DCP"
 
 #: src/tools/dvdomatic.cc:74
 msgid "Save changes to film \"%1\" before closing?"
-msgstr ""
+msgstr "Salvare i cambiamenti del film \"%1\" prima di chiudere?"
 
 #: src/tools/dvdomatic.cc:319
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
 #: src/tools/dvdomatic.cc:303
-#, fuzzy
 msgid "The directory %1 already exists."
 msgstr "La directory %s esiste gia'."
 

diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index dd45c3baafda600678a43cead0f2473c8bde09dc..28566d87626f0b008fe014055a22d73ad9daca1b 100644 (file)
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-04-04 10:11+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-09 10:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -123,3 +123,5 @@ msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
+"Du har inte valt en folder. Se till att välja en folder innan du klickar på "
+"Öppna."

diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc
index 52ec0a3a326339d7bb02bda0103f365834407099..5e36660eb798b861372db178c5010f4c97a8d271 100644 (file)
--- a/src/tools/servomatic_gui.cc
+++ b/src/tools/servomatic_gui.cc
@@ -99,7 +99,7 @@ public:
 #endif
 #ifdef __WXGTK__
                wxInitAllImageHandlers();
-               wxBitmap bitmap (wxString::Format ("%s/taskbar_icon.png", POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif         

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index feb49ed78a394b392f93e118ae604fe3e2948ce9..a197a7490b4b2b7f7f36d5fa8be29fc04c36d99a 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -795,10 +795,10 @@ FilmEditor::setup_frame_rate_description ()
                                _film->target_audio_sample_rate()
                                );
                } else {
-                       d << "\n";
+                       d << wxT ("\n");
                }
 #else
-               d << "\n";
+               d << wxT ("\n");
 #endif         
        }
 
@@ -1182,9 +1182,9 @@ FilmEditor::setup_audio_details ()
                if (_film->audio_channels() == 1) {
                        s << _("1 channel");
                } else {
-                       s << _film->audio_channels() << " " << _("channels");
+                       s << _film->audio_channels() << wxT (" ") << _("channels");
                }
-               s << ", " << _film->audio_frame_rate() << _("Hz");
+               s << wxT (", ") << _film->audio_frame_rate() << _("Hz");
                _audio->SetLabel (s);
        }
 
@@ -1444,7 +1444,7 @@ FilmEditor::setup_scaling_description ()
        }
 
        for (int i = lines; i < 4; ++i) {
-               d << " \n";
+               d << wxT (" \n");
        }
 
        _scaling_description->SetLabel (d);

diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 9f96fceff6aed57f88e2c1efdd573a2181b05464..20770858919afd66ec84fa9a683609bd8448144a 100644 (file)
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdvdomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:08-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 37cd6d8abd95456a6524d69d5cd2e1c44146d3ca..80ee5dbfd663fe30fba96cf1531d715508cfae2d 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:34+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 9a0f13d2ece027c748424d3e604270a1b2a36baf..78fd0dee9fda80c893ae3d7b14d17003547956b8 100644 (file)
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-03-22 18:10+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-03 12:37+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
 "Language: Italiano\n"
@@ -23,7 +23,7 @@ msgstr "%"
 
 #: src/wx/config_dialog.cc:61
 msgid "(restart DVD-o-matic to see language changes)"
-msgstr ""
+msgstr "(riavviare DVD-o-matic per vedere i cambiamenti di lingua)"
 
 #: src/wx/film_editor.cc:1269
 msgid "1 channel"
@@ -81,7 +81,7 @@ msgstr "Calcola..."
 
 #: src/wx/job_manager_view.cc:88
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #: src/wx/audio_dialog.cc:43
 msgid "Channels"
@@ -363,7 +363,7 @@ msgstr "Server"
 
 #: src/wx/config_dialog.cc:49
 msgid "Set language"
-msgstr ""
+msgstr "Seleziona la lingua"
 
 #: src/wx/film_editor.cc:364
 msgid "Show Audio..."

diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index ab9873877f03bc4c6b37a3fcc1a01939cc0d71c7..e52589ff05bf75bccc06ec9ba3272c9aab8e45f2 100644 (file)
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-04-04 10:18+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -56,7 +56,7 @@ msgstr "Audio Språk (ex. SV)"
 #: src/wx/film_editor.cc:820
 #, c-format
 msgid "Audio will be resampled from %dHz to %dHz\n"
-msgstr ""
+msgstr "Audio kommer att samplas om från %dHz till %dHz\n"
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
@@ -126,7 +126,7 @@ msgstr "Skapa i katalog"
 #: src/wx/film_editor.cc:1363
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
 #: src/wx/dci_metadata_dialog.cc:28
 msgid "DCI name"
@@ -289,7 +289,7 @@ msgstr "Ursprunglig Storlek"
 #: src/wx/film_editor.cc:1352
 #, c-format
 msgid "Original video is %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Original-videon är %dx%d (%.2f:1)\n"
 
 #: src/wx/dci_metadata_dialog.cc:57
 msgid "Package Type (e.g. OV)"
@@ -298,7 +298,7 @@ msgstr "Förpackningstyp (ex. OV)"
 #: src/wx/film_editor.cc:1384
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
 
 #: src/wx/audio_dialog.cc:60
 msgid "Peak"
@@ -343,7 +343,7 @@ msgstr "Körs"
 #: src/wx/film_editor.cc:1376
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
-msgstr ""
+msgstr "Skalad till %dx%d (%.2f:1)\n"
 
 #: src/wx/film_editor.cc:315
 msgid "Scaler"
@@ -496,7 +496,7 @@ msgstr "ms"
 
 #: src/wx/film_editor.cc:436
 msgid "pixels"
-msgstr ""
+msgstr "pixlar"
 
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 #: src/wx/film_editor.cc:197

diff --git a/wscript b/wscript
index 829a9e8341a7fb86a29de9fbb1daf1ebaf61bcc5..60b53a199f324d72fa4237ebaf3ef583f2bc041f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.80pre'
+VERSION = '0.82pre'
 
 def options(opt):
     opt.load('compiler_cxx')