Make po and merge.

5 files changed, 94 insertions, 63 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index f612dc028..e0d48dab0 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2014-01-14 19:45+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,11 +146,17 @@ msgstr "Zusammengesetzter Inhalt muss die gleiche Bildgröße haben."
 msgid "Content to be joined must have the same ratio."
 msgstr "Zusammengesetzter Inhalt muss das geliche Verhältnis haben"
 
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
 msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
 
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
+
+#: src/lib/subtitle_content.cc:82
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelgröße haben."
 
@@ -190,7 +196,7 @@ msgstr "%1 konnte nicht geöffnet werden."
 msgid "Could not open %1 to send"
 msgstr "%1 konnte nicht zum senden geöffnet werden"
 
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
 msgid "Could not read DCP to make KDM for"
 msgstr "DCP konnte nicht zur Schlüsselerstellung geöffnet werden"
 
@@ -483,7 +489,7 @@ msgstr ""
 "Das Laufwer auf dem der Film gespeichert werden soll hat zu wenig Freien "
 "Speicher. Bitte Speicher freigeben und nochmals versuchen."
 
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -541,7 +547,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Noch ein anderer De-Interlacer"
 
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
 msgid "You must add some content to the DCP before creating it"
 msgstr "Sie müssen einen Inhalt hinzufügen bevor Sie ein DCP erstellen können."
 
@@ -553,7 +559,7 @@ msgstr "[Bewegte Bilder]"
 msgid "[still]"
 msgstr "[Standbild]"
 
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
@@ -565,11 +571,11 @@ msgstr "Zeit zur Verbindung abgelaufen"
 msgid "connecting"
 msgstr "verbinde..."
 
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
 msgid "container"
 msgstr "Container"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
 msgid "content type"
 msgstr "Inhalt Typ"
 
@@ -657,7 +663,7 @@ msgstr "error during async_read (%1)"
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
@@ -693,7 +699,7 @@ msgstr "wird verschoben"
 msgid "multi-part subtitles not yet supported"
 msgstr "Multi-Part Untertitel noch nicht unterstützt"
 
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
 msgid "name"
 msgstr "Name"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index e92f81bb6..96cd3c2b1 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2013-11-09 03:09-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -148,11 +148,17 @@ msgstr ""
 msgid "Content to be joined must have the same ratio."
 msgstr ""
 
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
-msgstr ""
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "La fuente y el DCP tienen la misma velocidad.\n"
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
@@ -193,7 +199,7 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
 msgid "Could not read DCP to make KDM for"
 msgstr "No se pudo leer el DCP para hacer el KDM"
 
@@ -484,7 +490,7 @@ msgstr ""
 "En el dispositivo donde se encuentra la película queda poco espacio. Libere "
 "espacio en el disco y pruebe de nuevo."
 
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -542,7 +548,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
@@ -555,7 +561,7 @@ msgstr ""
 msgid "[still]"
 msgstr "imagen fija"
 
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
@@ -567,12 +573,12 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
 #, fuzzy
 msgid "container"
 msgstr "contenido"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -667,7 +673,7 @@ msgstr ""
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
@@ -703,7 +709,7 @@ msgstr ""
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
 msgid "name"
 msgstr "nombre"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 89fe6d54e..438084247 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2014-01-25 16:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -147,11 +147,17 @@ msgstr ""
 msgid "Content to be joined must have the same ratio."
 msgstr ""
 
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
-msgstr ""
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "Le DCP et la source ont les mêmes cadences.\n"
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Le DCP et la source ont les mêmes cadences.\n"
 
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
@@ -191,7 +197,7 @@ msgstr "lecture du fichier %1 impossible"
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
 msgid "Could not read DCP to make KDM for"
 msgstr "DCP illisible pour fabrication de KDM"
 
@@ -479,7 +485,7 @@ msgstr ""
 "Le disque contenant le film est plein. Libérez de l'espace et essayez à "
 "nouveau."
 
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -537,7 +543,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
@@ -551,7 +557,7 @@ msgstr "%1 [diaporama]"
 msgid "[still]"
 msgstr "%1 [fixe]"
 
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
@@ -563,11 +569,11 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
 msgid "content type"
 msgstr "type de contenu"
 
@@ -656,7 +662,7 @@ msgstr ""
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "images par seconde"
 
@@ -692,7 +698,7 @@ msgstr ""
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
 msgid "name"
 msgstr "nom"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 4ca75a942..5118905f9 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2013-04-28 10:26+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -148,11 +148,17 @@ msgstr ""
 msgid "Content to be joined must have the same ratio."
 msgstr ""
 
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
-msgstr ""
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
@@ -193,7 +199,7 @@ msgstr "non riesco ad aprire %1"
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
 msgid "Could not read DCP to make KDM for"
 msgstr ""
 
@@ -482,7 +488,7 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -537,7 +543,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
@@ -550,7 +556,7 @@ msgstr ""
 msgid "[still]"
 msgstr "ancora"
 
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
@@ -562,12 +568,12 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
 #, fuzzy
 msgid "container"
 msgstr "contenuto"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -658,7 +664,7 @@ msgstr ""
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
@@ -694,7 +700,7 @@ msgstr ""
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
 msgid "name"
 msgstr "nome"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index fbdb484ab..cd87e3258 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -145,12 +145,19 @@ msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
 msgid "Content to be joined must have the same ratio."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
 
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr ""
+"Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
 
@@ -190,7 +197,7 @@ msgstr "Kunde inte öppna %1"
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
 msgid "Could not read DCP to make KDM for"
 msgstr "Kunde inte läsa DCP för att skapa KDM"
 
@@ -484,7 +491,7 @@ msgstr ""
 "Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
 "försök igen."
 
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -544,7 +551,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
@@ -556,7 +563,7 @@ msgstr "[rörliga bilder]"
 msgid "[still]"
 msgstr "[stillbild]"
 
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
@@ -569,11 +576,11 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
 msgid "container"
 msgstr "behållare"
 
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -662,7 +669,7 @@ msgstr "fel vid async_read (%1)"
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "bilder per sekund"
 
@@ -699,7 +706,7 @@ msgstr "rörlig"
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
 msgid "name"
 msgstr "namn"