Merge.

17 files changed, 168 insertions, 159 deletions

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 7ede8284e..a252e4b5a 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -250,14 +250,14 @@ AudioContent::processing_description () const
 	}
 
 	if (not_resampled && resampled) {
-		return String::compose (_("Some audio will be resampled to %1kHz"), resampled_frame_rate ());
+		return String::compose (_("Some audio will be resampled to %1Hz"), resampled_frame_rate ());
 	}
 
 	if (!not_resampled && resampled) {
 		if (same) {
-			return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_frame_rate ());
+			return String::compose (_("Audio will be resampled from %1Hz to %2Hz"), common_frame_rate.get(), resampled_frame_rate ());
 		} else {
-			return String::compose (_("Audio will be resampled to %1kHz"), resampled_frame_rate ());
+			return String::compose (_("Audio will be resampled to %1Hz"), resampled_frame_rate ());
 		}
 	}
 
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 2fb1ad187..44f20f7ef 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -74,12 +74,12 @@ FilterGraph::setup (vector<Filter const *> filters)
 		throw DecodeError (N_("could not create filter graph."));
 	}
 
-	AVFilter* buffer_src = avfilter_get_by_name (src_name().c_str());
+	AVFilter const * buffer_src = avfilter_get_by_name (src_name().c_str());
 	if (!buffer_src) {
 		throw DecodeError (N_("could not find buffer src filter"));
 	}
 
-	AVFilter* buffer_sink = avfilter_get_by_name (sink_name().c_str());
+	AVFilter const * buffer_sink = avfilter_get_by_name (sink_name().c_str());
 	if (!buffer_sink) {
 		throw DecodeError (N_("Could not create buffer sink filter"));
 	}
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 7ce796a31..7fe87de00 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2018-01-11 15:23+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
@@ -222,12 +222,12 @@ msgid "Analyse audio"
 msgstr "Analyzovat zvuk"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Zvuk bude re-samplovaný z %1kHz na %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Zvuk bude re-samplovaný z %1Hz na %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Zvuk bude re-samplovaný na %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Zvuk bude re-samplovaný na %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1031,8 +1031,8 @@ msgid "Size"
 msgstr "Velikost"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Některé audio bude převzorkované na %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Některé audio bude převzorkované na %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index 8778f789b..a559acb80 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-10-04 21:45+0200\n"
 "Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n"
 "Language-Team: LANGUAGE &lt;LL@li.org&gt;\n"
@@ -222,12 +222,12 @@ msgid "Analyse audio"
 msgstr "Analyser lyd"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Lyd resamples fra %1kHz til %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Lyd resamples fra %1Hz til %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Lyd resamples til %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Lyd resamples til %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1049,8 +1049,8 @@ msgid "Size"
 msgstr "Størrelse"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Noget lyd resamples til %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Noget lyd resamples til %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index e6cf28b1c..a67843efb 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: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2018-01-13 20:21+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic translators\n"
@@ -228,12 +228,12 @@ msgid "Analyse audio"
 msgstr "Audio analysieren"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Audioabtastrate wird von %1kHz auf %2kHz angepasst."
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Audioabtastrate wird von %1Hz auf %2Hz angepasst."
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Audioabtastrate wird auf %1kHz angepasst."
+msgid "Audio will be resampled to %1Hz"
+msgstr "Audioabtastrate wird auf %1Hz angepasst."
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1062,8 +1062,8 @@ msgid "Size"
 msgstr "Größe"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Einige Audioanteile werden in der Abtastrate geändert auf %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Einige Audioanteile werden in der Abtastrate geändert auf %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index c373f6faf..3c597afad 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: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-08-25 23:10-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -220,12 +220,12 @@ msgid "Analyse audio"
 msgstr "Analizar audio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "EL audio será remuestreado de %1kHz a %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "EL audio será remuestreado de %1Hz a %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "EL audio será remuestreado a %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "EL audio será remuestreado a %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1038,8 +1038,8 @@ msgid "Size"
 msgstr "Tamaño"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "El audio será remuestreado a %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "El audio será remuestreado a %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 8b6df9ea9..725f022bb 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: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-11-07 23:35+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -222,12 +222,12 @@ msgid "Analyse audio"
 msgstr "Analyse audio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Le son sera ré-échantillonné de %1kHz à %2kHz."
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Le son sera ré-échantillonné de %1Hz à %2Hz."
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Le son sera ré-échantillonné à %1kHz."
+msgid "Audio will be resampled to %1Hz"
+msgstr "Le son sera ré-échantillonné à %1Hz."
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1047,8 +1047,8 @@ msgid "Size"
 msgstr "Taille"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Certains sons seront ré-échantillonné à %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Certains sons seront ré-échantillonné à %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 9b30c65f4..aaf37f21e 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: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2016-10-28 15:19+0200\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -215,12 +215,12 @@ msgid "Analyse audio"
 msgstr "Analizzare audio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "L'Audio sarà ricampionato da %1Hz a %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "L'Audio sarà ricampionato a %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "L'Audio sarà ricampionato a %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1033,8 +1033,8 @@ msgid "Size"
 msgstr "Dimensione"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Parte dell'audio sarà ricampionato a %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Parte dell'audio sarà ricampionato a %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 4816d19a4..0d0e0b719 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2018-01-06 01:40+0100\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -224,12 +224,12 @@ msgid "Analyse audio"
 msgstr "Analyseren audio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Audio wordt geresampled van %1kHz naar %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Audio wordt geresampled van %1Hz naar %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Audio wordt geresampled naar %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Audio wordt geresampled naar %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1056,8 +1056,8 @@ msgid "Size"
 msgstr "Grootte"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Sommige audio wordt geresampled naar %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Sommige audio wordt geresampled naar %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 7793cdc70..f66e494f8 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-07-31 21:23+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -224,12 +224,12 @@ msgid "Analyse audio"
 msgstr "Analizuj dźwięk"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Próbkowanie dźwięku zostanie zmienione z %1kHz na %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Próbkowanie dźwięku zostanie zmienione z %1Hz na %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Próbkowanie dźwięku zostanie zmienione na %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Próbkowanie dźwięku zostanie zmienione na %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1039,8 +1039,8 @@ msgid "Size"
 msgstr "Rozmiar"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Nastąpi zmiana częstotliwości niektórych ścieżek dźwiękowych do %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Nastąpi zmiana częstotliwości niektórych ścieżek dźwiękowych do %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index 66652eae0..c4cacea14 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2018-01-15 16:19-0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -223,12 +223,12 @@ msgid "Analyse audio"
 msgstr "Analisar áudio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "O áudio será convertido de %1kHz para %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "O áudio será convertido de %1Hz para %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "O áudio será convertido para %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "O áudio será convertido para %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1055,8 +1055,8 @@ msgid "Size"
 msgstr "Tamanho"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Alguns áudios serão reamostrados para %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Alguns áudios serão reamostrados para %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 54d33d5f5..ebebbc370 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2016-03-19 18:19+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -210,12 +210,12 @@ msgid "Analyse audio"
 msgstr "Analizar áudio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "A taxa de amostragem será alterada de %1kHz para %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "A taxa de amostragem será alterada de %1Hz para %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "A taxa de amostragem será alterada para %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "A taxa de amostragem será alterada para %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1039,8 +1039,8 @@ msgid "Size"
 msgstr "Tamanho"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Algum áudio vais ser alterado para %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Algum áudio vais ser alterado para %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 0793e0670..dd5cde80f 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-05-14 22:22+0300\n"
 "Last-Translator: Igor Voytovich <i.voyt@dualvfilms.com>\n"
 "Language-Team: Russian\n"
@@ -219,12 +219,12 @@ msgid "Analyse audio"
 msgstr "Анализ аудио"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Аудио будет ресэмплировано из %1kГц в %2kГц"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Аудио будет ресэмплировано из %1Гц в %2Гц"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Аудио будет ресэмплировано в %1kГц"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Аудио будет ресэмплировано в %1Гц"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1049,8 +1049,8 @@ msgid "Size"
 msgstr "Размер"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Некоторое аудио будет ресемплировано в %1kГц"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Некоторое аудио будет ресемплировано в %1Гц"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index 3a0e5b6bd..1ea5a23e4 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2016-01-06 00:23+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
@@ -210,12 +210,12 @@ msgid "Analyse audio"
 msgstr "Analyzovať zvuk"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Zvuk bude re-samplovaný z %1kHz na %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Zvuk bude re-samplovaný z %1Hz na %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Zvuk bude re-samplovaný na %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Zvuk bude re-samplovaný na %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1040,8 +1040,8 @@ msgid "Size"
 msgstr ""
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Nejaké audio bude prevzorkované na %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Nejaké audio bude prevzorkované na %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 65d277c44..fb0355d4c 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
-"PO-Revision-Date: 2016-10-25 17:57+0100\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
+"PO-Revision-Date: 2018-02-01 10:36+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
 "Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: src/lib/video_content.cc:448
 #, c-format
@@ -68,7 +68,7 @@ msgstr " (%.2f:1)"
 #. / to say what day a job will finish.
 #: src/lib/job.cc:434
 msgid " on %1"
-msgstr ""
+msgstr "på %1"
 
 #: src/lib/config.cc:795
 msgid ""
@@ -82,6 +82,15 @@ msgid ""
 "Length: $LENGTH\n"
 "Size: $SIZE\n"
 msgstr ""
+"$CPL_NAME\n"
+"\n"
+"Typ: $TYPE\n"
+"Format: $CONTAINER\n"
+"Audio: $AUDIO\n"
+"Audio språk: $AUDIO_LANGUAGE\n"
+"Underspår språk: $SUBTITLE_LANGUAGE\n"
+"Längd: $LENGTH\n"
+"Size: $SIZE\n"
 
 #: src/lib/atmos_mxf_content.cc:78
 msgid "%1 [Atmos]"
@@ -114,16 +123,15 @@ msgstr "1,19"
 
 #: src/lib/ratio.cc:38
 msgid "1.33 (4:3)"
-msgstr ""
+msgstr "1.33 (4:3)"
 
 #: src/lib/ratio.cc:39
-#, fuzzy
 msgid "1.38 (Academy)"
-msgstr "Academy"
+msgstr "1.38 (Academy)"
 
 #: src/lib/ratio.cc:40
 msgid "1.43 (IMAX)"
-msgstr ""
+msgstr "1.43 (IMAX)"
 
 #: src/lib/ratio.cc:41
 msgid "1.66"
@@ -131,24 +139,23 @@ msgstr "1,66"
 
 #: src/lib/ratio.cc:42
 msgid "1.78 (16:9 or HD)"
-msgstr ""
+msgstr "1.78 (16:9 eller HD)"
 
 #: src/lib/ratio.cc:43
 msgid "1.85 (Flat)"
-msgstr ""
+msgstr "1.85 (Flat)"
 
 #: src/lib/ratio.cc:46
-#, fuzzy
 msgid "1.90 (Full frame)"
-msgstr "Full frame"
+msgstr "1.90 (Full frame)"
 
 #: src/lib/ratio.cc:44
 msgid "2.35 (35mm Scope)"
-msgstr ""
+msgstr "2.35 (35mm Scope)"
 
 #: src/lib/ratio.cc:45
 msgid "2.39 (Scope)"
-msgstr ""
+msgstr "2.39 (Scope)"
 
 #: src/lib/filter.cc:71
 msgid "3D denoiser"
@@ -162,7 +169,7 @@ msgstr "; %.1f bps"
 
 #: src/lib/job.cc:439
 msgid "; %1 remaining; finishing at %2%3"
-msgstr ""
+msgstr ";%1 kvarstående; klar vid %2%3"
 
 #: src/lib/hints.cc:107
 msgid ""
@@ -215,12 +222,12 @@ msgid "Analyse audio"
 msgstr "Analysera audio"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Audio kommer att samplas om från %1kHz till %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Audio kommer att samplas om från %1Hz till %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Audio kommer att samplas om till %1kHz"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Audio kommer att samplas om till %1Hz"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -528,14 +535,12 @@ msgid "DBS"
 msgstr "DBS"
 
 #: src/lib/ratio.cc:43
-#, fuzzy
 msgid "DCI Flat"
-msgstr "Flat"
+msgstr "DCI Flat"
 
 #: src/lib/ratio.cc:45
-#, fuzzy
 msgid "DCI Scope"
-msgstr "Scope"
+msgstr "DCI Scope"
 
 #: src/lib/dcp_subtitle_content.cc:100
 msgid "DCP XML subtitles"
@@ -554,12 +559,11 @@ msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
 #: src/lib/job.cc:123 src/lib/job.cc:138
-#, fuzzy
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
 msgstr ""
-"DCP-o-matic kunde inte öppna filen %1. Saknas den, eller har den ett "
+"DCP-o-matic kunde inte öppna filen %1 (%2). Saknas den, eller har den ett "
 "oförväntat format?"
 
 #: src/lib/ffmpeg_content.cc:103
@@ -632,7 +636,7 @@ msgstr "E-posta problemrapport för %1"
 
 #: src/lib/dcp_encoder.cc:95 src/lib/ffmpeg_encoder.cc:201
 msgid "Encoding"
-msgstr ""
+msgstr "Kodar"
 
 #: src/lib/exceptions.cc:67
 msgid "Error in subtitle file: saw %1 while expecting %2"
@@ -738,12 +742,18 @@ msgid ""
 "However, setting your DCP frame rate to 24 or 48 will cause a significant "
 "slowdown of your content, and SMPTE DCPs are not supported by all projectors."
 msgstr ""
+"Att sätta DCP bildhastigheten till 24 eller 48 kommer att medföra en "
+"betydlig hastighetssänkning av innehållet, och SMPTE DCP:er stöds inte av "
+"alla projektorer."
 
 #: src/lib/hints.cc:119
 msgid ""
 "However, setting your DCP frame rate to 24 or 48 will cause a significant "
 "speed-up of your content, and SMPTE DCPs are not supported by all projectors."
 msgstr ""
+"Att sätta DCP bildhastigheten till 24 eller 48 kommer att medföra en "
+"betydlig hastighetsökning av innehållet, och SMPTE DCP:er stöds inte av alla "
+"projektorer."
 
 #: src/lib/audio_content.cc:307 src/lib/audio_content.cc:327
 msgid "Hz"
@@ -855,7 +865,7 @@ msgstr "Icke-passande videostorlekar i DCP:n"
 
 #: src/lib/writer.cc:608
 msgid "Mono"
-msgstr ""
+msgstr "Mono"
 
 #: src/lib/filter.cc:66
 msgid "Motion compensating deinterlacer"
@@ -883,7 +893,7 @@ msgstr "Brusreducering"
 
 #: src/lib/writer.cc:606
 msgid "None"
-msgstr ""
+msgstr "Inget"
 
 #: src/lib/job.cc:444
 msgid "OK (ran for %1)"
@@ -919,9 +929,8 @@ msgid "Prepared for video frame rate"
 msgstr "Förberedd för videobildshastighet"
 
 #: src/lib/exceptions.cc:85
-#, fuzzy
 msgid "Programming error at %1:%2 %3"
-msgstr "Programmeringsfel vid %1:%2"
+msgstr "Programmeringsfel vid %1:%2 %3"
 
 #: src/lib/dcp_content_type.cc:54
 msgid "Public Service Announcement"
@@ -981,7 +990,7 @@ msgstr "Hs"
 
 #: src/lib/colour_conversion.cc:287
 msgid "S-Gamut3/S-Log3"
-msgstr ""
+msgstr "S-Gamut3/S-Log3"
 
 #: src/lib/ffmpeg_content.cc:516 src/lib/ffmpeg_content.cc:535
 msgid "SMPTE 170M (BT601)"
@@ -993,7 +1002,7 @@ msgstr "SMPTE 170M (BT601-6)"
 
 #: src/lib/ffmpeg_content.cc:565
 msgid "SMPTE 2085, Y'D'zD'x"
-msgstr ""
+msgstr "SMPTE 2085, Y'D'zD'x"
 
 #: src/lib/ffmpeg_content.cc:517 src/lib/ffmpeg_content.cc:536
 #: src/lib/ffmpeg_content.cc:561
@@ -1013,23 +1022,20 @@ msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
 #: src/lib/ffmpeg_content.cc:521
-#, fuzzy
 msgid "SMPTE ST 431-2 (2011)"
-msgstr "SMPTE ST 428-1"
+msgstr "SMPTE ST 431-2 (2011)"
 
 #: src/lib/ffmpeg_content.cc:522
-#, fuzzy
 msgid "SMPTE ST 432-1 D65 (2010)"
-msgstr "SMPTE ST 428-1"
+msgstr "SMPTE ST 432-1 D65 (2010)"
 
 #: src/lib/scp_uploader.cc:56
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
 #: src/lib/image_content.cc:107
-#, fuzzy
 msgid "Scanning image files"
-msgstr "Beräknar bildsammanfattning"
+msgstr "Går igenom bildfiler"
 
 #: src/lib/send_problem_report_job.cc:74
 msgid "Sending email"
@@ -1044,12 +1050,12 @@ msgid "Size"
 msgstr "Storlek"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "En del av audio kommer att samplas om till %1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "En del av audio kommer att samplas om till %1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
-msgstr ""
+msgstr "Stereo"
 
 #: src/lib/upmixer_a.cc:46
 msgid "Stereo to 5.1 up-mixer A"
@@ -1088,9 +1094,8 @@ msgid "The certificate chain for signing is invalid"
 msgstr "Certifikatkedjan för att signera är ogiltigt"
 
 #: src/lib/exceptions.cc:79
-#, fuzzy
 msgid "The certificate chain for signing is invalid (%1)"
-msgstr "Certifikatkedjan för att signera är ogiltigt"
+msgstr "Certifikatkedjan för att signera är ogiltig (%1)"
 
 #: src/lib/job.cc:108
 msgid ""
@@ -1102,19 +1107,19 @@ msgstr ""
 
 #: src/lib/content_factory.cc:115
 msgid "The file %1 has been moved %2 milliseconds earlier."
-msgstr ""
+msgstr "Filen %1 har flyttats %2 millisekunder tidigare."
 
 #: src/lib/content_factory.cc:110
 msgid "The file %1 has been moved %2 milliseconds later."
-msgstr ""
+msgstr "Filen %1 har flyttats %2 millisekunder senare."
 
 #: src/lib/content_factory.cc:135
 msgid "The file %1 has been trimmed by %2 milliseconds less."
-msgstr ""
+msgstr "Filen %1 har trimmats med %2 millisekunder mindre."
 
 #: src/lib/content_factory.cc:130
 msgid "The file %1 has been trimmed by %2 milliseconds more."
-msgstr ""
+msgstr "Filen %1 har trimmats med %2 millisekunder mer."
 
 #: src/lib/dcp_content.cc:447
 msgid "The film has a different frame rate to this DCP."
@@ -1167,6 +1172,8 @@ msgid ""
 "This file is a KDM.  KDMs should be added to DCP content by right-clicking "
 "the content and choosing \"Add KDM\"."
 msgstr ""
+"Detta är en KDM-fil. KDM:er ska läggas till i DCP:er genom att högerklicka "
+"på innehållet och välja \"Lägg till KDM\"."
 
 #: src/lib/film.cc:439
 msgid ""
@@ -1265,7 +1272,6 @@ msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
 #: src/lib/hints.cc:124
-#, fuzzy
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised either to change the frame rate of your DCP or "
@@ -1273,17 +1279,18 @@ msgid ""
 "projectors)."
 msgstr ""
 "Du har valt Interop DCP med en bildhastighet som inte har officiellt stöd. "
-"Du uppmanas att skapa en SMPTE DCP istället."
+"Du uppmanas att skapa en SMPTE DCP istället (men SMPTE DCP:er stöds inte av "
+"alla projektorer)."
 
 #: src/lib/hints.cc:111
-#, fuzzy
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised either to change the frame rate of your DCP or "
 "to make a SMPTE DCP instead."
 msgstr ""
 "Du har valt Interop DCP med en bildhastighet som inte har officiellt stöd. "
-"Du uppmanas att skapa en SMPTE DCP istället."
+"Du uppmanas att antingen ändra bildhastigheten eller skapa en SMPTE DCP "
+"istället."
 
 #: src/lib/hints.cc:149
 msgid ""
@@ -1337,17 +1344,20 @@ msgstr ""
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr ""
+"Din förvalda container är inte korrekt och har ändrats till Flat (1.85:1)"
 
 #: src/lib/content_factory.cc:106
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
-msgstr ""
+msgstr "Ditt  projekt innehåller video som inte passar mot en helbildsgräns."
 
 #: src/lib/content_factory.cc:126
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
 msgstr ""
+"Ditt  projekt innehåller video som är trimmat så att det inte passar mot en "
+"helbildsgräns."
 
 #: src/lib/image_content.cc:71
 msgid "[moving images]"
@@ -1467,15 +1477,15 @@ msgstr "sRGB"
 
 #: src/lib/film.cc:317
 msgid "some of your content is missing"
-msgstr ""
+msgstr "en del av ditt innehåll saknas"
 
 #: src/lib/film.cc:321
 msgid "some of your content needs a KDM"
-msgstr ""
+msgstr "en del av ditt innehåll behöver en KDM"
 
 #: src/lib/film.cc:324
 msgid "some of your content needs an OV"
-msgstr ""
+msgstr "en del av ditt innehåll behöver en OV"
 
 #: src/lib/image_content.cc:84
 msgid "still"
@@ -1490,7 +1500,6 @@ msgid "video frames"
 msgstr "bildrutor"
 
 #: src/lib/film.cc:304
-#, fuzzy
 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"
 
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 964d74714..adc6d5d32 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-01-18 12:15+0200\n"
 "Last-Translator: Igor Voytovich <i.voyt@dualvfilms.com>\n"
 "Language-Team: Українська\n"
@@ -212,12 +212,12 @@ msgid "Analyse audio"
 msgstr "Аналіз аудіо"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "Аудіо буде ресемпловано з %1kГц в %2kГц"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "Аудіо буде ресемпловано з %1Гц в %2Гц"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "Аудіо будет ресемпловано в %1kГц"
+msgid "Audio will be resampled to %1Hz"
+msgstr "Аудіо будет ресемпловано в %1Гц"
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1034,8 +1034,8 @@ msgid "Size"
 msgstr "Розмір"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "Деяке аудіо будет ресемпловано в %1kГц"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "Деяке аудіо будет ресемпловано в %1Гц"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 5852ee1c7..58a3af8c4 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 00:02+0000\n"
+"POT-Creation-Date: 2018-02-01 16:50+0000\n"
 "PO-Revision-Date: 2017-07-23 09:54+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
@@ -215,12 +215,12 @@ msgid "Analyse audio"
 msgstr "分析音频"
 
 #: src/lib/audio_content.cc:258
-msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "音频重新采样频率设置为 %1kHz 到 %2kHz"
+msgid "Audio will be resampled from %1Hz to %2Hz"
+msgstr "音频重新采样频率设置为 %1Hz 到 %2Hz"
 
 #: src/lib/audio_content.cc:260
-msgid "Audio will be resampled to %1kHz"
-msgstr "音频将被重新采样至 %1kHz."
+msgid "Audio will be resampled to %1Hz"
+msgstr "音频将被重新采样至 %1Hz."
 
 #: src/lib/audio_content.cc:249
 msgid "Audio will not be resampled"
@@ -1023,8 +1023,8 @@ msgid "Size"
 msgstr "大小"
 
 #: src/lib/audio_content.cc:253
-msgid "Some audio will be resampled to %1kHz"
-msgstr "部分音频将被重新采样到%1kHz"
+msgid "Some audio will be resampled to %1Hz"
+msgstr "部分音频将被重新采样到%1Hz"
 
 #: src/lib/writer.cc:610
 msgid "Stereo"