Target pot_merge to merge new .pot files with existing .po; update translations accordingly.

3 files changed, 15 insertions, 12 deletions

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index f38f07d6e..273c1fc32 100644
--- 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-03-05 13:49+0000\n"
+"POT-Creation-Date: 2013-03-20 10:29+0000\n"
 "PO-Revision-Date: 2013-03-13 22:33+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -65,14 +65,16 @@ msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
 #: src/tools/dvdomatic.cc:409
-msgid "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgid ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
 #: src/tools/dvdomatic.cc:180
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dvdomatic.cc:482
+#: src/tools/dvdomatic.cc:500
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
@@ -81,9 +83,8 @@ msgstr "Impossible de charger le film %1 (%2)"
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film ?? %s (%s)"
 
-#: src/tools/dvdomatic.cc:287
-#: src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:486
+#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
+#: src/tools/dvdomatic.cc:504
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
@@ -111,4 +112,3 @@ msgstr "S??lectionner le film ?? ouvrir"
 #, c-format
 msgid "The directory %s already exists."
 msgstr "Le dossier %s existe d??j??."
-
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 0886f3cb3..c22a536fe 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-15 08:39+0000\n"
+"POT-Creation-Date: 2013-03-20 10:29+0000\n"
 "PO-Revision-Date: 2013-03-18 15:20+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
+"Language: Italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
-"Language: Italiano\n"
 
 #: src/tools/dvdomatic.cc:177
 msgid "&Analyse audio"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dvdomatic.cc:497
+#: src/tools/dvdomatic.cc:500
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %1 (%2)"
 
@@ -85,7 +85,7 @@ msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film a %s (%s)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:501
+#: src/tools/dvdomatic.cc:504
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
diff --git a/src/tools/wscript b/src/tools/wscript
index 64d5efe56..9f0f52152 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -27,3 +27,6 @@ def build(bld):
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'tools'), 'dvdomatic.cc', 'dvdomatic')
+
+def pot_merge(bld):
+    i18n.pot_merge(os.path.join('src', 'tools'), 'dvdomatic')