summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/config.cc4
-rw-r--r--src/lib/config.h14
-rw-r--r--src/lib/dcp_examiner.cc2
-rw-r--r--src/lib/encoder.cc13
-rw-r--r--src/lib/encoder.h2
-rw-r--r--src/lib/ffmpeg_content.cc2
-rw-r--r--src/lib/kdm.cc2
-rw-r--r--src/lib/po/de_DE.po228
-rw-r--r--src/lib/po/es_ES.po213
-rw-r--r--src/lib/po/fr_FR.po224
-rw-r--r--src/lib/po/it_IT.po260
-rw-r--r--src/lib/po/nl_NL.po212
-rw-r--r--src/lib/po/pl_PL.po1116
-rw-r--r--src/lib/po/ru_RU.po164
-rw-r--r--src/lib/po/sv_SE.po163
-rw-r--r--src/lib/quickmail.cc2
-rw-r--r--src/lib/server_finder.cc59
-rw-r--r--src/lib/server_finder.h20
18 files changed, 1863 insertions, 837 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 657d79b71..b5e87267a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -410,9 +410,9 @@ Config::drop ()
}
void
-Config::changed ()
+Config::changed (Property what)
{
- Changed ();
+ Changed (what);
}
void
diff --git a/src/lib/config.h b/src/lib/config.h
index a5fdc17c0..312118a55 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -59,6 +59,12 @@ public:
boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
+ enum Property {
+ USE_ANY_SERVERS,
+ SERVERS,
+ OTHER
+ };
+
/** @return base port number to use for J2K encoding servers */
int server_port_base () const {
return _server_port_base;
@@ -66,7 +72,7 @@ public:
void set_use_any_servers (bool u) {
_use_any_servers = u;
- changed ();
+ changed (USE_ANY_SERVERS);
}
bool use_any_servers () const {
@@ -76,7 +82,7 @@ public:
/** @param s New list of servers */
void set_servers (std::vector<std::string> s) {
_servers = s;
- changed ();
+ changed (SERVERS);
}
/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
@@ -403,8 +409,8 @@ public:
void add_to_history (boost::filesystem::path p);
- void changed ();
- boost::signals2::signal<void ()> Changed;
+ void changed (Property p = OTHER);
+ boost::signals2::signal<void (Property)> Changed;
void write () const;
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1dd469206..633e8e9d7 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -128,7 +128,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
_kdm_valid = false;
if (_encrypted && content->kdm ()) {
/* XXX: maybe don't use an exception for this */
- throw StringError (_("The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"));
+ throw StringError (_("The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."));
}
}
}
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c3ad08441..07c97c674 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -36,6 +36,7 @@
#include "data.h"
#include <libcxml/cxml.h>
#include <boost/lambda/lambda.hpp>
+#include <boost/foreach.hpp>
#include <iostream>
#include "i18n.h"
@@ -66,7 +67,7 @@ Encoder::Encoder (shared_ptr<const Film> film, weak_ptr<Job> j, shared_ptr<Write
, _terminate (false)
, _writer (writer)
{
-
+ servers_list_changed ();
}
Encoder::~Encoder ()
@@ -99,7 +100,7 @@ Encoder::begin ()
_writer->set_encoder_threads (_threads.size ());
if (!ServerFinder::instance()->disabled ()) {
- _server_found_connection = ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
+ _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this));
}
}
@@ -271,6 +272,7 @@ Encoder::terminate_threads ()
}
_threads.clear ();
+ _terminate = false;
}
void
@@ -362,7 +364,10 @@ catch (...)
}
void
-Encoder::server_found (ServerDescription s)
+Encoder::servers_list_changed ()
{
- add_worker_threads (s);
+ terminate_threads ();
+ BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) {
+ add_worker_threads (i);
+ }
}
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6bbdda4c5..85bc6ae99 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -83,7 +83,7 @@ private:
void encoder_thread (boost::optional<ServerDescription>);
void terminate_threads ();
void add_worker_threads (ServerDescription);
- void server_found (ServerDescription);
+ void servers_list_changed ();
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 384b10233..cb887b3bb 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -393,7 +393,7 @@ FFmpegContent::add_properties (list<pair<string, string> >& p) const
};
DCPOMATIC_ASSERT (AVCOL_PRI_NB == 10);
- p.push_back (make_pair (_("Color primaries"), primaries[_color_primaries]));
+ p.push_back (make_pair (_("Colour primaries"), primaries[_color_primaries]));
char const * transfers[] = {
_("Unspecified"),
diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index f9b21c525..0ded8f2c1 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -254,8 +254,6 @@ email_kdms (
quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ());
}
- quickmail_add_header (mail, "Content-Type: text/plain; charset=UTF-8");
-
string body = Config::instance()->kdm_email().c_str();
boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());
boost::algorithm::replace_all (body, "$START_TIME", start.str ());
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 633f7863a..8c1c25eb4 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
-"PO-Revision-Date: 2014-07-13 02:32+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
+"PO-Revision-Date: 2015-07-06 15:29+0100\n"
"Last-Translator: Carsten Kurz\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 1.5.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/lib/dcp_content.cc:112
@@ -26,7 +26,7 @@ msgstr ""
msgid "%1 [audio]"
msgstr "%1 [Ton]"
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr "%1 [Film]"
@@ -62,7 +62,7 @@ msgstr "Werbung"
msgid "An error occurred whilst handling the file %1."
msgstr "Beim Bearbeiten der Datei %1 trat ein Fehler auf."
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
msgstr "Audio analysieren"
@@ -72,66 +72,70 @@ msgstr ""
#: src/lib/audio_content.cc:257
msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr ""
+msgstr "Audioabtastrate wird von %1kHz auf %2kHz angepasst."
#: src/lib/audio_content.cc:259
msgid "Audio will be resampled to %1kHz"
-msgstr ""
+msgstr "Audioabtastrate wird auf %1kHz angepasst."
#: src/lib/audio_content.cc:248
msgid "Audio will not be resampled"
-msgstr ""
+msgstr "Audioabtastrate wird nicht verändert werden."
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr ""
@@ -143,7 +147,7 @@ msgstr "Abgebrochen"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Center"
@@ -151,19 +155,20 @@ msgstr "Center"
msgid "Checking existing image data"
msgstr "Überprüfe bestehende Bilddateien"
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -188,14 +193,12 @@ msgid "Content frame rate"
msgstr "Inhalt Bildrate"
#: src/lib/subtitle_content.cc:124
-#, fuzzy
msgid "Content to be joined must have the same 'burn subtitles' setting."
-msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
+msgstr ""
#: src/lib/subtitle_content.cc:120
-#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
-msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
+msgstr ""
#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
@@ -215,9 +218,8 @@ msgid "Content to be joined must have the same crop."
msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
#: src/lib/video_content.cc:171
-#, fuzzy
msgid "Content to be joined must have the same fades."
-msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
+msgstr ""
#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same picture size."
@@ -234,9 +236,8 @@ msgstr ""
"verwenden."
#: src/lib/subtitle_content.cc:136
-#, fuzzy
msgid "Content to be joined must have the same subtitle X scale."
-msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
+msgstr ""
#: src/lib/subtitle_content.cc:132
msgid "Content to be joined must have the same subtitle Y offset."
@@ -245,9 +246,8 @@ msgstr ""
"verwenden."
#: src/lib/subtitle_content.cc:140
-#, fuzzy
msgid "Content to be joined must have the same subtitle Y scale."
-msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
+msgstr ""
#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same video frame rate."
@@ -258,9 +258,8 @@ msgid "Content to be joined must have the same video frame type."
msgstr "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben."
#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
-#, fuzzy
msgid "Content to be joined must use the same fonts."
-msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
+msgstr ""
#: src/lib/ffmpeg_content.cc:124
msgid "Content to be joined must use the same subtitle stream."
@@ -283,20 +282,20 @@ msgid "Could not create remote directory %1 (%2)"
msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
#: src/lib/image_examiner.cc:61
-#, fuzzy
msgid "Could not decode JPEG2000 file %1 (%2)"
-msgstr "Bilddatei konnte nicht dekodiert werden"
+msgstr ""
#: src/lib/magick_image_proxy.cc:99
-#, fuzzy
msgid "Could not decode image file (%1)"
-msgstr "Bilddatei konnte nicht dekodiert werden"
+msgstr ""
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
msgstr ""
+"Konnte keine Encoding Server finden. Ist das Programm vielleicht zweimal "
+"gestartet worden?"
#: src/lib/job.cc:93
msgid "Could not open %1"
@@ -311,9 +310,8 @@ msgid "Could not open downloaded ZIP file"
msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden."
#: src/lib/dcp_subtitle.cc:49
-#, fuzzy
msgid "Could not read subtitles"
-msgstr "Untertitel-Decoder nicht gefunden"
+msgstr ""
#: src/lib/scp_dcp_job.cc:153
msgid "Could not start SCP session (%1)"
@@ -385,7 +383,7 @@ msgstr ""
#: src/lib/video_content.cc:528
msgid "Display aspect ratio"
-msgstr ""
+msgstr "Anzeigeseitenverhältnis (DAR):"
#: src/lib/dolby_cp750.cc:27
msgid "Dolby CP650 and CP750"
@@ -427,7 +425,7 @@ msgstr ""
msgid "Examine content"
msgstr "Inhalt wird überprüft"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -439,15 +437,15 @@ msgstr "Authentifizierung mit Server (%1) fehlgeschlagen"
msgid "Feature"
msgstr "Hauptfilm"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
-msgstr ""
+msgstr "Suche Länge"
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
msgid "Finding subtitles"
msgstr ""
@@ -459,11 +457,11 @@ msgstr "Flat"
msgid "Full frame"
msgstr "Ganzes Bild"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -471,11 +469,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Gradient Glätter"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr ""
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr "HI"
@@ -483,21 +481,17 @@ msgstr "HI"
msgid "High quality 3D denoiser"
msgstr "3D Rauschunterdrückung hoher Qualität"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
#: src/lib/job.cc:114 src/lib/job.cc:124
msgid "It is not known what caused this error."
-msgstr ""
-
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
+msgstr "Ein unbekannter Fehler ist aufgetreten."
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
@@ -507,59 +501,54 @@ msgstr "KDM Zustellung: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel De-Interlacer"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr ""
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr ""
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Links"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr "Center links"
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
msgid "Left rear surround"
msgstr "Surround hinten links"
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "Surround links"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr ""
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "LFE (Subwoofer)"
-#: src/lib/ffmpeg_content.cc:401
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:407
msgid "Linear"
-msgstr "Bi-Linear"
+msgstr ""
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr ""
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr ""
@@ -633,9 +622,8 @@ msgid "P3"
msgstr ""
#: src/lib/video_content.cc:558
-#, fuzzy
msgid "Padded with black to fit container %1 (%2x%3)"
-msgstr "Mit Schwarz gefüllt auf %1x%2"
+msgstr ""
#: src/lib/dcp_content_type.cc:52
msgid "Policy"
@@ -643,17 +631,17 @@ msgstr "Vorschrift"
#: src/lib/exceptions.cc:78
msgid "Programming error at %1:%2"
-msgstr ""
+msgstr "Programmfehler bei %1:%2"
#: src/lib/dcp_content_type.cc:53
msgid "Public Service Announcement"
msgstr "Hinweis"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -661,49 +649,48 @@ msgstr ""
msgid "Rating"
msgstr "Freigabehinweis"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr ""
#: src/lib/colour_conversion.cc:263
-#, fuzzy
msgid "Rec. 601"
-msgstr "Rec. 709"
+msgstr "Rec. 601"
#: src/lib/colour_conversion.cc:264
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Rechts"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr "Center rechts"
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
msgid "Right rear surround"
msgstr "Surround hinten rechts"
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Surround rechts"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -753,7 +740,7 @@ msgstr "Test"
#: src/lib/dcp_examiner.cc:131
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
#: src/lib/exceptions.cc:72
@@ -772,7 +759,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr "Zu wenig Speicher für diese Operation."
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -781,7 +768,7 @@ msgstr ""
"kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den "
"Film neu erstellen. Sorry!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -823,11 +810,11 @@ msgstr "Ton Sample Format (%1) nicht erkannt."
msgid "Unsharp mask and Gaussian blur"
msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -843,14 +830,13 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr ""
#: src/lib/video_content.cc:580
-#, fuzzy
msgid "Video frame rate"
-msgstr "Inhalt Bildrate"
+msgstr ""
#: src/lib/video_content.cc:578
msgid "Video length"
@@ -860,7 +846,7 @@ msgstr ""
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr "VI"
@@ -868,7 +854,7 @@ msgstr "VI"
msgid "Waiting"
msgstr "Warte..."
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -876,7 +862,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Und ein weiterer De-Interlacer..."
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
msgid "You must add some content to the DCP before creating it"
msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!"
@@ -892,7 +878,7 @@ msgstr "[Standbild]"
msgid "[subtitles]"
msgstr ""
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "Darf keine Schrägstriche enthalten"
@@ -904,11 +890,11 @@ msgstr "Zeit für Verbindung abgelaufen"
msgid "connecting"
msgstr "verbinde..."
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "Containerformat"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "Inhaltsbeschreibung"
@@ -925,9 +911,8 @@ msgid "could not find stream information"
msgstr "Keine Spur-Information gefunden"
#: src/lib/writer.cc:520
-#, fuzzy
msgid "could not move audio asset into the DCP (%1)"
-msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
+msgstr ""
#: src/lib/sndfile_base.cc:47
msgid "could not open audio file for reading"
@@ -942,9 +927,8 @@ msgid "could not open file for reading"
msgstr "Datei konnte nicht zum Lesen geöffnet werden."
#: src/lib/data.cc:61
-#, fuzzy
msgid "could not read from file"
-msgstr "Datei %1 konnte nicht gelesen werden (%2)"
+msgstr ""
#: src/lib/exceptions.cc:42
msgid "could not read from file %1 (%2)"
@@ -1013,7 +997,7 @@ msgstr "wird verschoben"
msgid "multi-part subtitles not yet supported"
msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt"
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "Name"
@@ -1040,7 +1024,7 @@ msgstr "sRGB"
msgid "still"
msgstr "Standbild"
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
msgstr "unbekannt"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 635105a24..bad92fe98 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: LIBDCPOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
-"PO-Revision-Date: 2014-10-24 16:11-0500\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
+"PO-Revision-Date: 2015-07-06 15:44+0100\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.5.4\n"
#: src/lib/dcp_content.cc:112
msgid "%1 [DCP]"
@@ -25,7 +25,7 @@ msgstr "%1 [DCP]"
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr "%1 [película]"
@@ -61,7 +61,7 @@ msgstr "Publicidad"
msgid "An error occurred whilst handling the file %1."
msgstr "Ha ocurrido un error con el fichero %1."
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
msgstr "Analizar audio"
@@ -71,66 +71,70 @@ msgstr ""
#: src/lib/audio_content.cc:257
msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr ""
+msgstr "EL audio será remuestreado de %1kHz a %2kHz."
#: src/lib/audio_content.cc:259
msgid "Audio will be resampled to %1kHz"
-msgstr ""
+msgstr "EL audio será remuestreado a %1kHz."
#: src/lib/audio_content.cc:248
msgid "Audio will not be resampled"
-msgstr ""
+msgstr "El audio no será remuestreado."
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr ""
@@ -142,7 +146,7 @@ msgstr "Cancelado"
msgid "Cannot handle pixel format %1 during %2"
msgstr "No se puede usar el formato de pixel %1 para %2"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Centro"
@@ -150,19 +154,20 @@ msgstr "Centro"
msgid "Checking existing image data"
msgstr "Comprobando las imágenes existentes"
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -187,9 +192,8 @@ msgid "Content frame rate"
msgstr "Velocidad del contenido"
#: src/lib/subtitle_content.cc:124
-#, fuzzy
msgid "Content to be joined must have the same 'burn subtitles' setting."
-msgstr "Para unir contenido debe tener la misma opción 'usar subtítulos'."
+msgstr ""
#: src/lib/subtitle_content.cc:120
msgid "Content to be joined must have the same 'use subtitles' setting."
@@ -251,9 +255,8 @@ msgid "Content to be joined must have the same video frame type."
msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
-#, fuzzy
msgid "Content to be joined must use the same fonts."
-msgstr "Para unir contenido debe tener los mismos fundidos."
+msgstr ""
#: src/lib/ffmpeg_content.cc:124
msgid "Content to be joined must use the same subtitle stream."
@@ -276,19 +279,20 @@ msgid "Could not create remote directory %1 (%2)"
msgstr "No se pudo crear la carpeta remota %1 (%2)"
#: src/lib/image_examiner.cc:61
-#, fuzzy
msgid "Could not decode JPEG2000 file %1 (%2)"
-msgstr "No se pudo descodificar el fichero de imagen (%1)"
+msgstr ""
#: src/lib/magick_image_proxy.cc:99
msgid "Could not decode image file (%1)"
msgstr "No se pudo descodificar el fichero de imagen (%1)"
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
msgstr ""
+"No se pueden buscar servidores de codificación externos. Quizás haya otro "
+"DCP-o-matic ejecutándose."
#: src/lib/job.cc:93
msgid "Could not open %1"
@@ -303,9 +307,8 @@ msgid "Could not open downloaded ZIP file"
msgstr "No se puedo abrir el fichero ZIP descargado"
#: src/lib/dcp_subtitle.cc:49
-#, fuzzy
msgid "Could not read subtitles"
-msgstr "no se pudo encontrar decodificador de subtítutlos"
+msgstr ""
#: src/lib/scp_dcp_job.cc:153
msgid "Could not start SCP session (%1)"
@@ -376,7 +379,7 @@ msgstr ""
#: src/lib/video_content.cc:528
msgid "Display aspect ratio"
-msgstr ""
+msgstr "Proporción de aspecto mostrada"
#: src/lib/dolby_cp750.cc:27
msgid "Dolby CP650 and CP750"
@@ -418,7 +421,7 @@ msgstr "Error en el fichero SubRip: encontrado %1 cuando se esperaba %2"
msgid "Examine content"
msgstr "Examinar contenido"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -430,18 +433,17 @@ msgstr "Fallo al identificarse con el servidor (%1)"
msgid "Feature"
msgstr "Película"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:81
-#, fuzzy
+#: src/lib/ffmpeg_examiner.cc:83
msgid "Finding subtitles"
-msgstr "Subtítulos SubRip"
+msgstr ""
#: src/lib/ratio.cc:40
msgid "Flat"
@@ -451,11 +453,11 @@ msgstr "Flat"
msgid "Full frame"
msgstr "Frame completo"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -463,11 +465,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Gradient debander"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr ""
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr "Sordos"
@@ -475,11 +477,11 @@ msgstr "Sordos"
msgid "High quality 3D denoiser"
msgstr "Reductor de ruido 3D de alta calidad"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
@@ -487,10 +489,6 @@ msgstr ""
msgid "It is not known what caused this error."
msgstr ""
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
msgstr "Envío de KDM: $CPL_NAME"
@@ -499,59 +497,54 @@ msgstr "Envío de KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel deinterlacer"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr ""
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr ""
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Izquierda"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr "Centro izquierda"
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
msgid "Left rear surround"
msgstr "Surround trasero izquierda"
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "Surround izquierda"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr ""
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "Lfe (bajos)"
-#: src/lib/ffmpeg_content.cc:401
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:407
msgid "Linear"
-msgstr "Bilineal"
+msgstr ""
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr ""
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr "Decodificación medio-lateral"
@@ -622,9 +615,8 @@ msgid "P3"
msgstr ""
#: src/lib/video_content.cc:558
-#, fuzzy
msgid "Padded with black to fit container %1 (%2x%3)"
-msgstr "Completado con negro hasta %1x%2"
+msgstr ""
#: src/lib/dcp_content_type.cc:52
msgid "Policy"
@@ -632,17 +624,17 @@ msgstr "Policy"
#: src/lib/exceptions.cc:78
msgid "Programming error at %1:%2"
-msgstr ""
+msgstr "Error de programación en %1:%2"
#: src/lib/dcp_content_type.cc:53
msgid "Public Service Announcement"
msgstr "Anuncio de servicio público"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -650,49 +642,48 @@ msgstr ""
msgid "Rating"
msgstr "Clasificación"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr ""
#: src/lib/colour_conversion.cc:263
-#, fuzzy
msgid "Rec. 601"
-msgstr "Rec. 709"
+msgstr ""
#: src/lib/colour_conversion.cc:264
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Derecha"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr "Centro derecha"
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
msgid "Right rear surround"
msgstr "Surround trasero derecha"
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Surround derecha"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -741,8 +732,9 @@ msgid "Test"
msgstr "Test"
#: src/lib/dcp_examiner.cc:131
+#, fuzzy
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
"La KDM no puede desencriptar el DCP. Puede que corresponda a un CPL "
"incorrecto"
@@ -763,7 +755,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr "No hubo suficiente memoria para hacer esto."
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -772,7 +764,7 @@ msgstr ""
"desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
"volver a añadir y configurar ton contenido. ¡Lo siento!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -814,11 +806,11 @@ msgstr "Formato de audio desconocido (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Máscara de desenfoque Gaussiano"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -834,14 +826,13 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr ""
#: src/lib/video_content.cc:580
-#, fuzzy
msgid "Video frame rate"
-msgstr "Velocidad del contenido"
+msgstr ""
#: src/lib/video_content.cc:578
msgid "Video length"
@@ -851,7 +842,7 @@ msgstr ""
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr "Ciegos"
@@ -859,7 +850,7 @@ msgstr "Ciegos"
msgid "Waiting"
msgstr "Esperando"
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -867,7 +858,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
msgid "You must add some content to the DCP before creating it"
msgstr "Tienes que añadir contenido al DCP antes de crearlo."
@@ -883,7 +874,7 @@ msgstr "[imagen fija]"
msgid "[subtitles]"
msgstr "[subtítulos]"
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "no puede contener barras"
@@ -895,11 +886,11 @@ msgstr "tiempo de conexión agotado"
msgid "connecting"
msgstr "conectando"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "continente"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "tipo de contenido"
@@ -916,9 +907,8 @@ msgid "could not find stream information"
msgstr "no se pudo encontrar información del flujo"
#: src/lib/writer.cc:520
-#, fuzzy
msgid "could not move audio asset into the DCP (%1)"
-msgstr "no s puedo mover el audio MXF en el DCP (%1)"
+msgstr ""
#: src/lib/sndfile_base.cc:47
msgid "could not open audio file for reading"
@@ -933,9 +923,8 @@ msgid "could not open file for reading"
msgstr "no se pudo abrir el fichero para lectura"
#: src/lib/data.cc:61
-#, fuzzy
msgid "could not read from file"
-msgstr "No se pudo leer del fichero %1 (%2)"
+msgstr ""
#: src/lib/exceptions.cc:42
msgid "could not read from file %1 (%2)"
@@ -1004,7 +993,7 @@ msgstr "moviendo"
msgid "multi-part subtitles not yet supported"
msgstr "todavía no se soportan subtítulos en múltiples partes"
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "nombre"
@@ -1031,7 +1020,7 @@ msgstr "sRGB"
msgid "still"
msgstr "imagen fija"
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
msgstr "desconocido"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index c10d3158c..6a1c245dc 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
-"PO-Revision-Date: 2014-07-14 12:04+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
+"PO-Revision-Date: 2015-07-06 14:41+0100\n"
"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
"Language-Team: \n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.6\n"
+"X-Generator: Poedit 1.5.4\n"
#: src/lib/dcp_content.cc:112
msgid "%1 [DCP]"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr "%1 [vidéo]"
@@ -61,7 +61,7 @@ msgstr "Advertisement"
msgid "An error occurred whilst handling the file %1."
msgstr "Une erreur s'est produite lors du traitement du fichier %1."
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
msgstr "Analyse audio"
@@ -70,70 +70,71 @@ msgid "Audio channels"
msgstr ""
#: src/lib/audio_content.cc:257
-#, fuzzy
msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
+msgstr "Le son sera ré-échantillonné de %1kHz à %2kHz."
#: src/lib/audio_content.cc:259
-#, fuzzy
msgid "Audio will be resampled to %1kHz"
-msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
+msgstr "Le son sera ré-échantillonné à %1kHz."
#: src/lib/audio_content.cc:248
-#, fuzzy
msgid "Audio will not be resampled"
-msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
+msgstr "Le son ne sera pas ré-échantillonné."
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr ""
@@ -145,7 +146,7 @@ msgstr "Annulé"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Format du pixel %1 non géré par %2"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Centre"
@@ -153,19 +154,20 @@ msgstr "Centre"
msgid "Checking existing image data"
msgstr "Recherche de données images existantes"
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -190,16 +192,12 @@ msgid "Content frame rate"
msgstr "Cadence du contenu"
#: src/lib/subtitle_content.cc:124
-#, fuzzy
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
-"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
#: src/lib/subtitle_content.cc:120
-#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
-"Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
@@ -218,9 +216,8 @@ msgid "Content to be joined must have the same crop."
msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
#: src/lib/video_content.cc:171
-#, fuzzy
msgid "Content to be joined must have the same fades."
-msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
+msgstr ""
#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same picture size."
@@ -238,9 +235,8 @@ msgstr ""
"titres"
#: src/lib/subtitle_content.cc:136
-#, fuzzy
msgid "Content to be joined must have the same subtitle X scale."
-msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
+msgstr ""
#: src/lib/subtitle_content.cc:132
msgid "Content to be joined must have the same subtitle Y offset."
@@ -249,9 +245,8 @@ msgstr ""
"titres"
#: src/lib/subtitle_content.cc:140
-#, fuzzy
msgid "Content to be joined must have the same subtitle Y scale."
-msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
+msgstr ""
#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same video frame rate."
@@ -262,9 +257,8 @@ msgid "Content to be joined must have the same video frame type."
msgstr "Le contenu à ajouter doit avoir le même type de trame vidéo"
#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
-#, fuzzy
msgid "Content to be joined must use the same fonts."
-msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
+msgstr ""
#: src/lib/ffmpeg_content.cc:124
msgid "Content to be joined must use the same subtitle stream."
@@ -287,16 +281,14 @@ msgid "Could not create remote directory %1 (%2)"
msgstr "Création du dossier distant %1 (%2) impossible"
#: src/lib/image_examiner.cc:61
-#, fuzzy
msgid "Could not decode JPEG2000 file %1 (%2)"
-msgstr "Impossible de décoder le ficher image"
+msgstr ""
#: src/lib/magick_image_proxy.cc:99
-#, fuzzy
msgid "Could not decode image file (%1)"
-msgstr "Impossible de décoder le ficher image"
+msgstr ""
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
@@ -315,9 +307,8 @@ msgid "Could not open downloaded ZIP file"
msgstr "Ouverture du fichier Zip téléchargé impossible"
#: src/lib/dcp_subtitle.cc:49
-#, fuzzy
msgid "Could not read subtitles"
-msgstr "décodeur de sous-titre introuvable"
+msgstr ""
#: src/lib/scp_dcp_job.cc:153
msgid "Could not start SCP session (%1)"
@@ -430,7 +421,7 @@ msgstr ""
msgid "Examine content"
msgstr "Examen du contenu"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -442,15 +433,15 @@ msgstr "L'authentification du serveur (%1) a échouée"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
msgid "Finding subtitles"
msgstr ""
@@ -462,11 +453,11 @@ msgstr "Flat"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -474,11 +465,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Corrections des bandes par dégradé"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr ""
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr "Déficients Auditifs"
@@ -486,21 +477,17 @@ msgstr "Déficients Auditifs"
msgid "High quality 3D denoiser"
msgstr "Débruiteur 3D haute qualité"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
#: src/lib/job.cc:114 src/lib/job.cc:124
msgid "It is not known what caused this error."
-msgstr ""
-
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
+msgstr "Erreur indéterminée."
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
@@ -510,59 +497,54 @@ msgstr ""
msgid "Kernel deinterlacer"
msgstr "Désentrelaceur noyau"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr ""
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr ""
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Gauche"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr "Centre Gauche"
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
msgid "Left rear surround"
msgstr "Surround arrière gauche"
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "Arrière gauche"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr ""
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "Basses fréquences"
-#: src/lib/ffmpeg_content.cc:401
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:407
msgid "Linear"
-msgstr "Bilinéaire"
+msgstr ""
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr ""
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr ""
@@ -632,9 +614,8 @@ msgid "P3"
msgstr ""
#: src/lib/video_content.cc:558
-#, fuzzy
msgid "Padded with black to fit container %1 (%2x%3)"
-msgstr "Enveloppe noire de %1x%2"
+msgstr ""
#: src/lib/dcp_content_type.cc:52
msgid "Policy"
@@ -648,11 +629,11 @@ msgstr ""
msgid "Public Service Announcement"
msgstr "Public Service Announcement"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -660,49 +641,48 @@ msgstr ""
msgid "Rating"
msgstr "Classification"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr ""
#: src/lib/colour_conversion.cc:263
-#, fuzzy
msgid "Rec. 601"
-msgstr "Rec. 709"
+msgstr ""
#: src/lib/colour_conversion.cc:264
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Droite"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr "Centre Droit"
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
msgid "Right rear surround"
msgstr "Surround arrière droite"
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Arrière droite"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -727,9 +707,8 @@ msgid "Short"
msgstr "Short"
#: src/lib/audio_content.cc:252
-#, fuzzy
msgid "Some audio will be resampled to %1kHz"
-msgstr "L'audio sera rééchantillonné de %1kHz à %2kHz."
+msgstr ""
#: src/lib/upmixer_a.cc:45
msgid "Stereo to 5.1 up-mixer A"
@@ -753,7 +732,7 @@ msgstr "Test"
#: src/lib/dcp_examiner.cc:131
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
#: src/lib/exceptions.cc:72
@@ -772,7 +751,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr "Il n'y avait pas assez de mémoire pour faire cela."
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -780,7 +759,7 @@ msgstr ""
"Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut "
"être ouvert dans cette version du programme. Désolé!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -822,11 +801,11 @@ msgstr "Échantillonnage audio (%1) inconnu"
msgid "Unsharp mask and Gaussian blur"
msgstr "Adoucissement et flou Gaussien"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -842,14 +821,13 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr ""
#: src/lib/video_content.cc:580
-#, fuzzy
msgid "Video frame rate"
-msgstr "Cadence du contenu"
+msgstr "Cadence d'images"
#: src/lib/video_content.cc:578
msgid "Video length"
@@ -859,7 +837,7 @@ msgstr ""
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr "Déficients Visuels"
@@ -867,7 +845,7 @@ msgstr "Déficients Visuels"
msgid "Waiting"
msgstr "En cours"
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -875,7 +853,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Un autre filtre de désentrelacement"
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
msgid "You must add some content to the DCP before creating it"
msgstr "Ajoutez un contenu pour créer le DCP"
@@ -891,7 +869,7 @@ msgstr "[restant]"
msgid "[subtitles]"
msgstr ""
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "slash interdit"
@@ -903,11 +881,11 @@ msgstr "temps de connexion expiré"
msgid "connecting"
msgstr "connexion"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "conteneur"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "type de contenu"
@@ -924,9 +902,8 @@ msgid "could not find stream information"
msgstr "information du flux introuvable"
#: src/lib/writer.cc:520
-#, fuzzy
msgid "could not move audio asset into the DCP (%1)"
-msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
+msgstr ""
#: src/lib/sndfile_base.cc:47
msgid "could not open audio file for reading"
@@ -941,9 +918,8 @@ msgid "could not open file for reading"
msgstr "lecture du fichier impossible"
#: src/lib/data.cc:61
-#, fuzzy
msgid "could not read from file"
-msgstr "lecture du fichier impossible %1 (%2)"
+msgstr "lecture du fichier impossible"
#: src/lib/exceptions.cc:42
msgid "could not read from file %1 (%2)"
@@ -1014,7 +990,7 @@ msgstr "déplacement"
msgid "multi-part subtitles not yet supported"
msgstr "sous-titres en plusieurs parties non supportés"
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "nom"
@@ -1041,7 +1017,7 @@ msgstr "sRGB"
msgid "still"
msgstr "%1 [restant]"
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
msgstr "Inconnu"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 21c24dd10..2634d2379 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
-"PO-Revision-Date: 2014-02-03 10:48+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
+"PO-Revision-Date: 2015-07-06 16:03+0100\n"
"Last-Translator: William Fanelli <william.f@impronte.com>\n"
"Language-Team: \n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.5.4\n"
#: src/lib/dcp_content.cc:112
msgid "%1 [DCP]"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%1 [audio]"
msgstr ""
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr ""
@@ -61,80 +61,80 @@ msgstr "Pubblicità"
msgid "An error occurred whilst handling the file %1."
msgstr "Errore durante l'elaborazione del file %1."
-#: src/lib/analyse_audio_job.cc:52
-#, fuzzy
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
-msgstr "Analizzo l'audio di %1"
+msgstr ""
#: src/lib/single_stream_audio_content.cc:93
msgid "Audio channels"
msgstr ""
#: src/lib/audio_content.cc:257
-#, fuzzy
msgid "Audio will be resampled from %1kHz to %2kHz"
msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
#: src/lib/audio_content.cc:259
-#, fuzzy
msgid "Audio will be resampled to %1kHz"
-msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
+msgstr "L'Audio sarà ricampionato a %1kHz"
#: src/lib/audio_content.cc:248
-#, fuzzy
msgid "Audio will not be resampled"
-msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
+msgstr ""
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr ""
@@ -146,7 +146,7 @@ msgstr "Cancellato"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Non posso gestire il formato di pixel %1 durante %2"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Centro"
@@ -154,19 +154,20 @@ msgstr "Centro"
msgid "Checking existing image data"
msgstr ""
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -183,26 +184,20 @@ msgid "Computing image digest"
msgstr ""
#: src/lib/frame_rate_change.cc:86
-#, fuzzy
msgid "Content and DCP have the same rate.\n"
-msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
+msgstr ""
#: src/lib/video_content.cc:566
-#, fuzzy
msgid "Content frame rate"
-msgstr "tipo di contenuto"
+msgstr ""
#: src/lib/subtitle_content.cc:124
-#, fuzzy
msgid "Content to be joined must have the same 'burn subtitles' setting."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/subtitle_content.cc:120
-#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
@@ -221,20 +216,16 @@ msgid "Content to be joined must have the same crop."
msgstr ""
#: src/lib/video_content.cc:171
-#, fuzzy
msgid "Content to be joined must have the same fades."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same picture size."
msgstr ""
#: src/lib/video_content.cc:163
-#, fuzzy
msgid "Content to be joined must have the same scale setting."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/subtitle_content.cc:128
msgid "Content to be joined must have the same subtitle X offset."
@@ -242,10 +233,8 @@ msgstr ""
"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/subtitle_content.cc:136
-#, fuzzy
msgid "Content to be joined must have the same subtitle X scale."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/subtitle_content.cc:132
msgid "Content to be joined must have the same subtitle Y offset."
@@ -253,10 +242,8 @@ msgstr ""
"Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
#: src/lib/subtitle_content.cc:140
-#, fuzzy
msgid "Content to be joined must have the same subtitle Y scale."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same video frame rate."
@@ -267,10 +254,8 @@ msgid "Content to be joined must have the same video frame type."
msgstr ""
#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
-#, fuzzy
msgid "Content to be joined must use the same fonts."
msgstr ""
-"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
#: src/lib/ffmpeg_content.cc:124
msgid "Content to be joined must use the same subtitle stream."
@@ -293,16 +278,14 @@ msgid "Could not create remote directory %1 (%2)"
msgstr "Non posso creare la directory remota %1 (%2)"
#: src/lib/image_examiner.cc:61
-#, fuzzy
msgid "Could not decode JPEG2000 file %1 (%2)"
-msgstr "Non posso scrivere il file remoto (%1)"
+msgstr ""
#: src/lib/magick_image_proxy.cc:99
-#, fuzzy
msgid "Could not decode image file (%1)"
-msgstr "Non posso scrivere il file remoto (%1)"
+msgstr ""
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
@@ -317,14 +300,12 @@ msgid "Could not open %1 to send"
msgstr "Non posso aprire %1 da inviare"
#: src/lib/internet.cc:77
-#, fuzzy
msgid "Could not open downloaded ZIP file"
-msgstr "non riesco ad aprire %1"
+msgstr ""
#: src/lib/dcp_subtitle.cc:49
-#, fuzzy
msgid "Could not read subtitles"
-msgstr "non riesco a trovare il decoder dei sottotitoli"
+msgstr ""
#: src/lib/scp_dcp_job.cc:153
msgid "Could not start SCP session (%1)"
@@ -343,14 +324,12 @@ msgid "DCP XML subtitles"
msgstr ""
#: src/lib/frame_rate_change.cc:98
-#, fuzzy
msgid "DCP will run at %1%% of the content speed.\n"
-msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
+msgstr ""
#: src/lib/frame_rate_change.cc:89
-#, fuzzy
msgid "DCP will use every other frame of the content.\n"
-msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
+msgstr ""
#: src/lib/job.cc:94
msgid ""
@@ -398,9 +377,8 @@ msgid "Display aspect ratio"
msgstr ""
#: src/lib/dolby_cp750.cc:27
-#, fuzzy
msgid "Dolby CP650 and CP750"
-msgstr "Dolby CP750"
+msgstr ""
#: src/lib/internet.cc:70
msgid "Download failed (%1/%2 error %3)"
@@ -438,7 +416,7 @@ msgstr ""
msgid "Examine content"
msgstr "Esamino il contenuto"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -450,15 +428,15 @@ msgstr "Autenticazione col server fallita (%1) "
msgid "Feature"
msgstr "Caratteristica"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
msgid "Finding subtitles"
msgstr ""
@@ -470,11 +448,11 @@ msgstr "Flat"
msgid "Full frame"
msgstr "Schermo intero"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -482,11 +460,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Gradiente debander"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr ""
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr ""
@@ -494,11 +472,11 @@ msgstr ""
msgid "High quality 3D denoiser"
msgstr "Riduttore di rumore 3D di alta qualità"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
@@ -506,10 +484,6 @@ msgstr ""
msgid "It is not known what caused this error."
msgstr ""
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
msgstr ""
@@ -518,60 +492,54 @@ msgstr ""
msgid "Kernel deinterlacer"
msgstr "Deinterlacciatore Kernel"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr ""
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr ""
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Sinistro"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr ""
-#: src/lib/util.cc:506
-#, fuzzy
+#: src/lib/util.cc:482
msgid "Left rear surround"
-msgstr "Surround sinistro"
+msgstr ""
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "Surround sinistro"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr ""
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "Lfe(sub)"
-#: src/lib/ffmpeg_content.cc:401
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:407
msgid "Linear"
-msgstr "Bilineare"
+msgstr ""
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr ""
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr ""
@@ -605,9 +573,8 @@ msgid "No scale"
msgstr ""
#: src/lib/video_content_scale.cc:105
-#, fuzzy
msgid "No stretch"
-msgstr "Flat senza stiramento"
+msgstr ""
#: src/lib/image_content.cc:59
msgid "No valid image files were found in the folder."
@@ -642,9 +609,8 @@ msgid "P3"
msgstr ""
#: src/lib/video_content.cc:558
-#, fuzzy
msgid "Padded with black to fit container %1 (%2x%3)"
-msgstr "Riempito con nero a %1x%2"
+msgstr ""
#: src/lib/dcp_content_type.cc:52
msgid "Policy"
@@ -658,11 +624,11 @@ msgstr ""
msgid "Public Service Announcement"
msgstr "Annuncio di pubblico servizio"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -670,51 +636,48 @@ msgstr ""
msgid "Rating"
msgstr "Punteggio"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr ""
#: src/lib/colour_conversion.cc:263
-#, fuzzy
msgid "Rec. 601"
-msgstr "Rec 709"
+msgstr ""
#: src/lib/colour_conversion.cc:264
-#, fuzzy
msgid "Rec. 709"
-msgstr "Rec 709"
+msgstr ""
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Destro"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr ""
-#: src/lib/util.cc:507
-#, fuzzy
+#: src/lib/util.cc:483
msgid "Right rear surround"
-msgstr "Surround destro"
+msgstr ""
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Surround destro"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -739,9 +702,8 @@ msgid "Short"
msgstr "Corto"
#: src/lib/audio_content.cc:252
-#, fuzzy
msgid "Some audio will be resampled to %1kHz"
-msgstr "L'Audio sarà ricampionato da %1kHz a %2kHz"
+msgstr ""
#: src/lib/upmixer_a.cc:45
msgid "Stereo to 5.1 up-mixer A"
@@ -765,7 +727,7 @@ msgstr "Prova"
#: src/lib/dcp_examiner.cc:131
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
#: src/lib/exceptions.cc:72
@@ -784,7 +746,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr ""
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
#, fuzzy
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -795,7 +757,7 @@ msgstr ""
"un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci "
"dispiace!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -838,11 +800,11 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Maschera unsharp e sfocatura Gaussiana"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -858,7 +820,7 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr ""
@@ -875,7 +837,7 @@ msgstr ""
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr ""
@@ -883,7 +845,7 @@ msgstr ""
msgid "Waiting"
msgstr "Aspetta"
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -891,7 +853,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Altro filtro di deinterlacciamento"
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
msgid "You must add some content to the DCP before creating it"
msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
@@ -900,15 +862,14 @@ msgid "[moving images]"
msgstr ""
#: src/lib/image_content.cc:85
-#, fuzzy
msgid "[still]"
-msgstr "ancora"
+msgstr ""
#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
msgid "[subtitles]"
msgstr ""
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "non può contenere barre"
@@ -920,11 +881,11 @@ msgstr "connessione scaduta"
msgid "connecting"
msgstr "mi sto connettendo"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "contenitore"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "tipo di contenuto"
@@ -941,9 +902,8 @@ msgid "could not find stream information"
msgstr "non riesco a trovare informazioni sullo streaming"
#: src/lib/writer.cc:520
-#, fuzzy
msgid "could not move audio asset into the DCP (%1)"
-msgstr "Non posso scrivere il file remoto (%1)"
+msgstr ""
#: src/lib/sndfile_base.cc:47
msgid "could not open audio file for reading"
@@ -958,9 +918,8 @@ msgid "could not open file for reading"
msgstr "non riesco ad aprire il file per leggerlo"
#: src/lib/data.cc:61
-#, fuzzy
msgid "could not read from file"
-msgstr "non posso leggere dal file %1 (%2)"
+msgstr ""
#: src/lib/exceptions.cc:42
msgid "could not read from file %1 (%2)"
@@ -971,9 +930,8 @@ msgid "could not run sample-rate converter"
msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
#: src/lib/resampler.cc:77
-#, fuzzy
msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
-msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
+msgstr ""
#: src/lib/scp_dcp_job.cc:88
msgid "could not start SCP session (%1)"
@@ -1030,7 +988,7 @@ msgstr ""
msgid "multi-part subtitles not yet supported"
msgstr "sottotitoli multi-part non ancora supportati"
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "nome"
@@ -1054,14 +1012,12 @@ msgid "sRGB"
msgstr "sRGB"
#: src/lib/image_content.cc:100
-#, fuzzy
msgid "still"
-msgstr "ancora"
+msgstr ""
-#: src/lib/ffmpeg_examiner.cc:250
-#, fuzzy
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
-msgstr "Errore sconosciuto"
+msgstr ""
#: src/lib/video_content.cc:578
msgid "video frames"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 9743b9eaf..188d03866 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-30 22:20+0100\n"
-"PO-Revision-Date: 2014-09-04 20:34+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
+"PO-Revision-Date: 2015-07-06 16:07+0100\n"
"Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
"Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
"Language: nl_NL\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.5.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/lib/dcp_content.cc:112
@@ -26,7 +26,7 @@ msgstr ""
msgid "%1 [audio]"
msgstr "%1 [audio]"
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr "%1 [film]"
@@ -62,7 +62,7 @@ msgstr "Advertentie"
msgid "An error occurred whilst handling the file %1."
msgstr "Er is een fout opgetreden met bestand %1."
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
msgstr "Analyseer audio"
@@ -82,56 +82,60 @@ msgstr ""
msgid "Audio will not be resampled"
msgstr ""
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr ""
@@ -143,7 +147,7 @@ msgstr "Afgebroken"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Fout met pixel formaat %1 tijdens %2"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Midden"
@@ -151,19 +155,20 @@ msgstr "Midden"
msgid "Checking existing image data"
msgstr "Controleer bestaande videodata"
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -188,14 +193,12 @@ msgid "Content frame rate"
msgstr "Content frame rate"
#: src/lib/subtitle_content.cc:124
-#, fuzzy
msgid "Content to be joined must have the same 'burn subtitles' setting."
-msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
+msgstr ""
#: src/lib/subtitle_content.cc:120
-#, fuzzy
msgid "Content to be joined must have the same 'use subtitles' setting."
-msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
+msgstr ""
#: src/lib/audio_content.cc:94
msgid "Content to be joined must have the same audio delay."
@@ -214,9 +217,8 @@ msgid "Content to be joined must have the same crop."
msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
#: src/lib/video_content.cc:171
-#, fuzzy
msgid "Content to be joined must have the same fades."
-msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
+msgstr ""
#: src/lib/video_content.cc:147
msgid "Content to be joined must have the same picture size."
@@ -231,18 +233,16 @@ msgid "Content to be joined must have the same subtitle X offset."
msgstr "Toegevoegde bestanden moeten dezelfde ondertitel X offset hebben."
#: src/lib/subtitle_content.cc:136
-#, fuzzy
msgid "Content to be joined must have the same subtitle X scale."
-msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
+msgstr ""
#: src/lib/subtitle_content.cc:132
msgid "Content to be joined must have the same subtitle Y offset."
msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
#: src/lib/subtitle_content.cc:140
-#, fuzzy
msgid "Content to be joined must have the same subtitle Y scale."
-msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
+msgstr ""
#: src/lib/video_content.cc:151
msgid "Content to be joined must have the same video frame rate."
@@ -253,9 +253,8 @@ msgid "Content to be joined must have the same video frame type."
msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
-#, fuzzy
msgid "Content to be joined must use the same fonts."
-msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
+msgstr ""
#: src/lib/ffmpeg_content.cc:124
msgid "Content to be joined must use the same subtitle stream."
@@ -278,16 +277,14 @@ msgid "Could not create remote directory %1 (%2)"
msgstr "Kan geen remote map maken %1 (%2)"
#: src/lib/image_examiner.cc:61
-#, fuzzy
msgid "Could not decode JPEG2000 file %1 (%2)"
-msgstr "Kan beeldbestand niet decoderen"
+msgstr ""
#: src/lib/magick_image_proxy.cc:99
-#, fuzzy
msgid "Could not decode image file (%1)"
-msgstr "Kan beeldbestand niet decoderen"
+msgstr ""
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
@@ -306,9 +303,8 @@ msgid "Could not open downloaded ZIP file"
msgstr "Kan gedownloade ZIP bestand niet openen"
#: src/lib/dcp_subtitle.cc:49
-#, fuzzy
msgid "Could not read subtitles"
-msgstr "kan geen bestand maken %1"
+msgstr ""
#: src/lib/scp_dcp_job.cc:153
msgid "Could not start SCP session (%1)"
@@ -422,7 +418,7 @@ msgstr ""
msgid "Examine content"
msgstr "Controleer content"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -434,15 +430,15 @@ msgstr "Inlog fout met server (%1)"
msgid "Feature"
msgstr "Kenmerken"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
msgid "Finding subtitles"
msgstr ""
@@ -454,11 +450,11 @@ msgstr "Onbewerkt"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -466,11 +462,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Gradient debander"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr ""
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr "Slechthorenden"
@@ -478,11 +474,11 @@ msgstr "Slechthorenden"
msgid "High quality 3D denoiser"
msgstr "High quality 3D denoiser"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
@@ -490,10 +486,6 @@ msgstr ""
msgid "It is not known what caused this error."
msgstr ""
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
msgstr "KDM levering: $CPL_NAME"
@@ -502,59 +494,54 @@ msgstr "KDM levering: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Kernel deinterlacer"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr ""
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr ""
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Links"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr "Links midden"
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
msgid "Left rear surround"
msgstr "Links achter surround"
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "links surround"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr ""
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:401
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:407
msgid "Linear"
-msgstr "Bilinear"
+msgstr ""
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr ""
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr ""
@@ -628,9 +615,8 @@ msgid "P3"
msgstr ""
#: src/lib/video_content.cc:558
-#, fuzzy
msgid "Padded with black to fit container %1 (%2x%3)"
-msgstr "Opgevuld met zwart tot %1x%2"
+msgstr ""
#: src/lib/dcp_content_type.cc:52
msgid "Policy"
@@ -644,11 +630,11 @@ msgstr ""
msgid "Public Service Announcement"
msgstr "Publieke Service aankondiging"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -656,49 +642,48 @@ msgstr ""
msgid "Rating"
msgstr "Beoordeling"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr ""
#: src/lib/colour_conversion.cc:263
-#, fuzzy
msgid "Rec. 601"
-msgstr "Rec. 709"
+msgstr ""
#: src/lib/colour_conversion.cc:264
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Rechts"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr "Rechts midden"
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
msgid "Right rear surround"
msgstr "Rechtsachter surround"
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Rechts surround"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -748,7 +733,7 @@ msgstr "Test"
#: src/lib/dcp_examiner.cc:131
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
#: src/lib/exceptions.cc:72
@@ -767,7 +752,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr "Er was niet genoeg geheugen om dit uit te voeren."
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -775,7 +760,7 @@ msgstr ""
"Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet "
"geopend worden. Sorry!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -817,11 +802,11 @@ msgstr "Niet herkenbaar audio sample formaat (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Unsharp mask and Gaussian blur"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -837,14 +822,13 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr ""
#: src/lib/video_content.cc:580
-#, fuzzy
msgid "Video frame rate"
-msgstr "Content frame rate"
+msgstr ""
#: src/lib/video_content.cc:578
msgid "Video length"
@@ -854,7 +838,7 @@ msgstr ""
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr "Slechtzienden"
@@ -862,7 +846,7 @@ msgstr "Slechtzienden"
msgid "Waiting"
msgstr "Wachten"
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -870,7 +854,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
msgid "You must add some content to the DCP before creating it"
msgstr "U moet wat content toevoegen voor het maken van de DCP"
@@ -886,7 +870,7 @@ msgstr "[still]"
msgid "[subtitles]"
msgstr ""
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "er mag geen '\" gebruikt worden"
@@ -898,11 +882,11 @@ msgstr "verbinding timeout"
msgid "connecting"
msgstr "verbinden"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "container"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "content type"
@@ -919,9 +903,8 @@ msgid "could not find stream information"
msgstr "kan geen stream informatie vinden"
#: src/lib/writer.cc:520
-#, fuzzy
msgid "could not move audio asset into the DCP (%1)"
-msgstr "kan MXF audio niet plaatsen in DCP (%1)"
+msgstr ""
#: src/lib/sndfile_base.cc:47
msgid "could not open audio file for reading"
@@ -936,9 +919,8 @@ msgid "could not open file for reading"
msgstr "kan bestand niet openen om te lezen"
#: src/lib/data.cc:61
-#, fuzzy
msgid "could not read from file"
-msgstr "kan bestand niet lezen %1 (%2)"
+msgstr ""
#: src/lib/exceptions.cc:42
msgid "could not read from file %1 (%2)"
@@ -1007,7 +989,7 @@ msgstr "bewegend"
msgid "multi-part subtitles not yet supported"
msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "naam"
@@ -1034,7 +1016,7 @@ msgstr "sRGB"
msgid "still"
msgstr "still"
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
msgstr "onbekend"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
new file mode 100644
index 000000000..8ab0c763e
--- /dev/null
+++ b/src/lib/po/pl_PL.po
@@ -0,0 +1,1116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-06 16:46+0100\n"
+"PO-Revision-Date: 2015-06-11 19:19+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: pl_PL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: src/lib/dcp_content.cc:112
+msgid "%1 [DCP]"
+msgstr ""
+
+#: src/lib/sndfile_content.cc:66
+msgid "%1 [audio]"
+msgstr "%1 [dźwięk]"
+
+#: src/lib/ffmpeg_content.cc:219
+msgid "%1 [movie]"
+msgstr "%1 [obraz]"
+
+#: src/lib/ratio.cc:35
+msgid "1.19"
+msgstr "1.19"
+
+#: src/lib/ratio.cc:38
+msgid "1.66"
+msgstr "1.66"
+
+#: src/lib/ratio.cc:39
+msgid "16:9"
+msgstr "16:9"
+
+#: src/lib/filter.cc:70
+msgid "3D denoiser"
+msgstr "Odszumianie 3D"
+
+#: src/lib/ratio.cc:36
+msgid "4:3"
+msgstr "4:3"
+
+#: src/lib/ratio.cc:37
+msgid "Academy"
+msgstr "1.38"
+
+#: src/lib/dcp_content_type.cc:54
+msgid "Advertisement"
+msgstr "Reklamowy"
+
+#: src/lib/job.cc:74
+msgid "An error occurred whilst handling the file %1."
+msgstr "Wystąpił błąd podczas przetwarzania pliku %1."
+
+#: src/lib/analyse_audio_job.cc:54
+msgid "Analyse audio"
+msgstr "Analizuj dźwięk"
+
+#: src/lib/single_stream_audio_content.cc:93
+msgid "Audio channels"
+msgstr ""
+
+#: src/lib/audio_content.cc:257
+msgid "Audio will be resampled from %1kHz to %2kHz"
+msgstr "Dźwięk będzie przesamplowany z %1kHz na %2kHz."
+
+#: src/lib/audio_content.cc:259
+msgid "Audio will be resampled to %1kHz"
+msgstr "Dźwięk będzie przesamplowany na %1kHz."
+
+#: src/lib/audio_content.cc:248
+msgid "Audio will not be resampled"
+msgstr "Dźwięk nie będzie przesamplowany."
+
+#: src/lib/ffmpeg_content.cc:411
+msgid "BT1361 extended colour gamut"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:392
+msgid "BT2020"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:431
+msgid "BT2020 constant luminance"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:413
+msgid "BT2020 for a 10-bit system"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:414
+msgid "BT2020 for a 12-bit system"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:430
+msgid "BT2020 non-constant luminance"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:388
+msgid "BT470BG"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:426
+msgid "BT470BG (BT601-6)"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:387
+msgid "BT470M"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
+msgid "BT709"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
+msgid "BsL"
+msgstr ""
+
+#: src/lib/film.cc:1206
+msgid "BsR"
+msgstr ""
+
+#: src/lib/film.cc:1197
+msgid "C"
+msgstr ""
+
+#: src/lib/job.cc:335
+msgid "Cancelled"
+msgstr "Anulowane"
+
+#: src/lib/exceptions.cc:60
+msgid "Cannot handle pixel format %1 during %2"
+msgstr "Nie można było obsłużyć formatu %1 kiedy %2"
+
+#: src/lib/util.cc:474
+msgid "Centre"
+msgstr "Środek"
+
+#: src/lib/writer.cc:118
+msgid "Checking existing image data"
+msgstr "Sprwdzanie istniejących danych obrazu"
+
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
+msgid "Colour range"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:418
+msgid "Colour transfer characteristic"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:435
+msgid "Colourspace"
+msgstr ""
+
+#: src/lib/writer.cc:591
+msgid "Computing audio digest"
+msgstr "Obliczanie danych dźwięku"
+
+#: src/lib/content.cc:136
+msgid "Computing digest"
+msgstr "Obliczanie danych"
+
+#: src/lib/writer.cc:587
+msgid "Computing image digest"
+msgstr "Obliczanie danych obrazu"
+
+#: src/lib/frame_rate_change.cc:86
+msgid "Content and DCP have the same rate.\n"
+msgstr "Plik i DCP mają taką samą ilość kl/s.\n"
+
+#: src/lib/video_content.cc:566
+msgid "Content frame rate"
+msgstr "Ilość kl/s pliku to"
+
+#: src/lib/subtitle_content.cc:124
+msgid "Content to be joined must have the same 'burn subtitles' setting."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:120
+msgid "Content to be joined must have the same 'use subtitles' setting."
+msgstr ""
+
+#: src/lib/audio_content.cc:94
+msgid "Content to be joined must have the same audio delay."
+msgstr "Łączone pliki muszą mieć takie samo opóźnienie dźwięku."
+
+#: src/lib/audio_content.cc:90
+msgid "Content to be joined must have the same audio gain."
+msgstr "Łączone pliki muszą mieć takie samo gain dźwięku."
+
+#: src/lib/video_content.cc:167
+msgid "Content to be joined must have the same colour conversion."
+msgstr "Łączone pliki muszą mieć takią samą konwersję kolorów."
+
+#: src/lib/video_content.cc:159
+msgid "Content to be joined must have the same crop."
+msgstr "Łączone pliki muszą mieć takie samo kadrowanie."
+
+#: src/lib/video_content.cc:171
+msgid "Content to be joined must have the same fades."
+msgstr ""
+
+#: src/lib/video_content.cc:147
+msgid "Content to be joined must have the same picture size."
+msgstr "Łączone pliki muszą mieć taki sam rozmiar obrazu."
+
+#: src/lib/video_content.cc:163
+msgid "Content to be joined must have the same scale setting."
+msgstr "Łączone pliki muszą mieć takie samo skalowanie."
+
+#: src/lib/subtitle_content.cc:128
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "Łączone pliki muszą mieć takie samo przesunięcie X napisów."
+
+#: src/lib/subtitle_content.cc:136
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr "Łączone pliki muszą mieć taki sam rozmiar X napisów."
+
+#: src/lib/subtitle_content.cc:132
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Łączone pliki muszą mieć takie samo przesunięcie Y napisów."
+
+#: src/lib/subtitle_content.cc:140
+msgid "Content to be joined must have the same subtitle Y scale."
+msgstr "Łączone pliki muszą mieć taki sam rozmiar Y napisów."
+
+#: src/lib/video_content.cc:151
+msgid "Content to be joined must have the same video frame rate."
+msgstr "Łączone pliki muszą mieć taką samą ilość kl/s."
+
+#: src/lib/video_content.cc:155
+msgid "Content to be joined must have the same video frame type."
+msgstr "Łączone pliki muszą mieć taki sam typ klatki."
+
+#: src/lib/subtitle_content.cc:145 src/lib/subtitle_content.cc:153
+msgid "Content to be joined must use the same fonts."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:124
+msgid "Content to be joined must use the same subtitle stream."
+msgstr "Łączone pliki muszą używać tego samego strumienia napisów."
+
+#: src/lib/video_content.cc:515
+msgid "Content video is %1x%2"
+msgstr "Rozdzielczość materiału to %1x%2"
+
+#: src/lib/scp_dcp_job.cc:111
+msgid "Copy DCP to TMS"
+msgstr "Kopiuj DCP do TMS"
+
+#: src/lib/scp_dcp_job.cc:136
+msgid "Could not connect to server %1 (%2)"
+msgstr "Nie można połączyć z serwerem %1 (%2)"
+
+#: src/lib/scp_dcp_job.cc:158
+msgid "Could not create remote directory %1 (%2)"
+msgstr "Nie można utworzyć folderu zdalnego %1 (%2)"
+
+#: src/lib/image_examiner.cc:61
+msgid "Could not decode JPEG2000 file %1 (%2)"
+msgstr ""
+
+#: src/lib/magick_image_proxy.cc:99
+msgid "Could not decode image file (%1)"
+msgstr "Nie można odkodować obrazu (%1)"
+
+#: src/lib/server_finder.cc:126
+msgid ""
+"Could not listen for remote encode servers. Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+"Nie można nasłuchiwać serwerów zdalnych. Druga instancja DCP-o-matic jest "
+"już prawdopodobnie uruchomiona. "
+
+#: src/lib/job.cc:93
+msgid "Could not open %1"
+msgstr "Nie udało się otworzyć %1"
+
+#: src/lib/scp_dcp_job.cc:183
+msgid "Could not open %1 to send"
+msgstr "Nie udało się otworzyć %1 do wysłania"
+
+#: src/lib/internet.cc:77
+msgid "Could not open downloaded ZIP file"
+msgstr "Nie udało się otworzyć pobranego archiwum ZIP"
+
+#: src/lib/dcp_subtitle.cc:49
+msgid "Could not read subtitles"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:153
+msgid "Could not start SCP session (%1)"
+msgstr "Nie udało się rozpocząć sesji SCP (%1)"
+
+#: src/lib/scp_dcp_job.cc:197
+msgid "Could not write to remote file (%1)"
+msgstr "Nie udało się zapisać do pliku zdalnego (%1)"
+
+#: src/lib/video_content.cc:534
+msgid "Cropped to %1x%2"
+msgstr "Przycięty do"
+
+#: src/lib/dcp_subtitle_content.cc:96
+msgid "DCP XML subtitles"
+msgstr ""
+
+#: src/lib/frame_rate_change.cc:98
+msgid "DCP will run at %1%% of the content speed.\n"
+msgstr "DCP będzie odtwarzany z %1%% prędkości materiału.\n"
+
+#: src/lib/frame_rate_change.cc:89
+msgid "DCP will use every other frame of the content.\n"
+msgstr "DCP będzie używał każdej pozostałej klatki materiału.\n"
+
+#: src/lib/job.cc:94
+msgid ""
+"DCP-o-matic could not open the file %1. Perhaps it does not exist or is in "
+"an unexpected format."
+msgstr ""
+"DCP-o-matic nie mógł otworzyć pliku %1. Plik nie istnieje, lub jest w "
+"niewspieranym formacie."
+
+#: src/lib/ffmpeg_content.cc:96
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr "DCP-o-matic nie używa już filtru `%1', więc został on wyłączony."
+
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
+msgid "De-interlacing"
+msgstr "Usuwanie przeplotu"
+
+#: src/lib/config.cc:419
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+"Drogi Kinooperatorze\n"
+"\n"
+"W załączniku dodane są klucze dla $CPL_NAME.\n"
+"\n"
+"Kino: $CINEMA_NAME\n"
+"Sala(e): $SCREENS\n"
+"\n"
+"Klucze są ważne od $START_TIME do $END_TIME.\n"
+"\n"
+"Z poważaniem,\n"
+"DCP-o-matic"
+
+#: src/lib/video_content.cc:528
+msgid "Display aspect ratio"
+msgstr "Proporcje obrazu"
+
+#: src/lib/dolby_cp750.cc:27
+msgid "Dolby CP650 and CP750"
+msgstr "Dolby CP650 i CP750"
+
+#: src/lib/internet.cc:70
+msgid "Download failed (%1/%2 error %3)"
+msgstr "Pobieranie nie udało się (%1/%2 error %3)"
+
+#: src/lib/frame_rate_change.cc:91
+msgid "Each content frame will be doubled in the DCP.\n"
+msgstr "Każda klatka materiału będzie zdublowana.\n"
+
+#: src/lib/frame_rate_change.cc:93
+msgid "Each content frame will be repeated %1 more times in the DCP.\n"
+msgstr "Każda klatka materiału będzie powtórzona %1 razy.\n"
+
+#: src/lib/send_kdm_email_job.cc:52
+msgid "Email KDMs for %1"
+msgstr "Wyślij klucze do %1"
+
+#: src/lib/send_problem_report_job.cc:49
+msgid "Email problem report for %1"
+msgstr ""
+
+#: src/lib/writer.cc:152
+msgid "Encoding image data"
+msgstr "Kodowanie obrazu"
+
+#: src/lib/job.cc:333
+msgid "Error (%1)"
+msgstr "Błąd (%1)"
+
+#: src/lib/exceptions.cc:66
+msgid "Error in SubRip file: saw %1 while expecting %2"
+msgstr ""
+
+#: src/lib/examine_content_job.cc:46
+msgid "Examine content"
+msgstr "Sprawdzanie materiału"
+
+#: src/lib/ffmpeg_content.cc:425
+msgid "FCC"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:146
+msgid "Failed to authenticate with server (%1)"
+msgstr "Błąd uwierzytelniania na serwerze (%1)"
+
+#: src/lib/dcp_content_type.cc:45
+msgid "Feature"
+msgstr "Pełnometrażowy"
+
+#: src/lib/ffmpeg_content.cc:391
+msgid "Film"
+msgstr ""
+
+#: src/lib/ffmpeg_examiner.cc:78
+msgid "Finding length"
+msgstr "Ustalanie długości"
+
+#: src/lib/ffmpeg_examiner.cc:83
+msgid "Finding subtitles"
+msgstr ""
+
+#: src/lib/ratio.cc:40
+msgid "Flat"
+msgstr "1.85"
+
+#: src/lib/ratio.cc:42
+msgid "Full frame"
+msgstr "Pełna klatka"
+
+#: src/lib/ffmpeg_content.cc:403
+msgid "Gamma 22 (BT470M)"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:404
+msgid "Gamma 28 (BT470BG)"
+msgstr ""
+
+#: src/lib/filter.cc:68
+msgid "Gradient debander"
+msgstr "Zachowaj przejścia tonalne"
+
+#: src/lib/film.cc:1201
+msgid "HI"
+msgstr ""
+
+#: src/lib/util.cc:478
+msgid "Hearing impaired"
+msgstr "Dla niesłyszących"
+
+#: src/lib/filter.cc:71
+msgid "High quality 3D denoiser"
+msgstr "Odszumianie 3D wysokiej jakości"
+
+#: src/lib/ffmpeg_content.cc:412
+msgid "IEC61966-2-1 (sRGB or sYCC)"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:410
+msgid "IEC61966-2-4"
+msgstr ""
+
+#: src/lib/job.cc:114 src/lib/job.cc:124
+msgid "It is not known what caused this error."
+msgstr ""
+
+#: src/lib/config.cc:197
+msgid "KDM delivery: $CPL_NAME"
+msgstr "Wysyłka klucza: $CPL_NAME"
+
+#: src/lib/filter.cc:66
+msgid "Kernel deinterlacer"
+msgstr "Usuwanie przeplotu metodą Kernel"
+
+#: src/lib/film.cc:1195
+msgid "L"
+msgstr ""
+
+#: src/lib/film.cc:1203
+msgid "Lc"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+msgid "Left"
+msgstr "Lewy"
+
+#: src/lib/util.cc:480
+msgid "Left centre"
+msgstr "Lewy centralny"
+
+#: src/lib/util.cc:482
+msgid "Left rear surround"
+msgstr "Lewy tylny surround"
+
+#: src/lib/util.cc:476
+msgid "Left surround"
+msgstr "Lewy surround"
+
+#: src/lib/film.cc:1198
+msgid "Lfe"
+msgstr ""
+
+#: src/lib/util.cc:475
+msgid "Lfe (sub)"
+msgstr "Lfe (subwoofer)"
+
+#: src/lib/ffmpeg_content.cc:407
+msgid "Linear"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:408
+msgid "Logarithmic (100:1 range)"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:409
+msgid "Logarithmic (316:1 range)"
+msgstr ""
+
+#: src/lib/film.cc:1199
+msgid "Ls"
+msgstr ""
+
+#: src/lib/mid_side_decoder.cc:34
+msgid "Mid-side decoder"
+msgstr ""
+
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
+msgid "Misc"
+msgstr "Różne"
+
+#: src/lib/dcp_examiner.cc:93
+msgid "Mismatched audio channel counts in DCP"
+msgstr ""
+
+#: src/lib/dcp_examiner.cc:99
+msgid "Mismatched audio frame rates in DCP"
+msgstr ""
+
+#: src/lib/dcp_examiner.cc:74
+msgid "Mismatched frame rates in DCP"
+msgstr ""
+
+#: src/lib/dcp_examiner.cc:81
+msgid "Mismatched video sizes in DCP"
+msgstr ""
+
+#: src/lib/filter.cc:65
+msgid "Motion compensating deinterlacer"
+msgstr "Usuwanie przeplotu z kompensacją ruchu"
+
+#: src/lib/video_content_scale.cc:108
+msgid "No scale"
+msgstr "Nie skaluj"
+
+#: src/lib/video_content_scale.cc:105
+msgid "No stretch"
+msgstr "Nie rozciągaj"
+
+#: src/lib/image_content.cc:59
+msgid "No valid image files were found in the folder."
+msgstr "W folderze nie znaleziono obsługiwanych plików"
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
+msgid "Noise reduction"
+msgstr "Redukcja szumu"
+
+#: src/lib/job.cc:331
+msgid "OK (ran for %1)"
+msgstr "OK (minęło %1)"
+
+#: src/lib/content.cc:105
+msgid "Only the first piece of content to be joined can have a start trim."
+msgstr "Tylko pierwszy z łączonych plików może być przycięta na początku."
+
+#: src/lib/content.cc:109
+msgid "Only the last piece of content to be joined can have an end trim."
+msgstr "Tylko ostatni z łączonych plików może być przycięty na końcu."
+
+#: src/lib/job.cc:106
+msgid "Out of memory"
+msgstr "Zabrakło pamięci RAM"
+
+#: src/lib/filter.cc:73
+msgid "Overcomplete wavelet denoiser"
+msgstr "Odszumianie DWT"
+
+#: src/lib/colour_conversion.cc:265
+msgid "P3"
+msgstr ""
+
+#: src/lib/video_content.cc:558
+msgid "Padded with black to fit container %1 (%2x%3)"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:52
+msgid "Policy"
+msgstr "Umowa"
+
+#: src/lib/exceptions.cc:78
+msgid "Programming error at %1:%2"
+msgstr "Błąd programowania w lini %1:%2"
+
+#: src/lib/dcp_content_type.cc:53
+msgid "Public Service Announcement"
+msgstr "Komunikat publiczny"
+
+#: src/lib/film.cc:1196
+msgid "R"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:421
+msgid "RGB / sRGB (IEC61966-2-1)"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:50
+msgid "Rating"
+msgstr "Klasyfikacja"
+
+#: src/lib/film.cc:1204
+msgid "Rc"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:263
+msgid "Rec. 601"
+msgstr "Rec. 601"
+
+#: src/lib/colour_conversion.cc:264
+msgid "Rec. 709"
+msgstr "Rec. 709"
+
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+msgid "Right"
+msgstr "Prawy"
+
+#: src/lib/util.cc:481
+msgid "Right centre"
+msgstr "Prawy centralny"
+
+#: src/lib/util.cc:483
+msgid "Right rear surround"
+msgstr "Prawy centralny surround"
+
+#: src/lib/util.cc:477
+msgid "Right surround"
+msgstr "Prawy surround"
+
+#: src/lib/film.cc:1200
+msgid "Rs"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
+msgid "SMPTE 170M (BT601)"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:427
+msgid "SMPTE 170M (BT601-6)"
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
+msgid "SMPTE 240M"
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:141
+msgid "SSH error (%1)"
+msgstr "Błąd SSH (%1)"
+
+#: src/lib/video_content.cc:549
+msgid "Scaled to %1x%2"
+msgstr "Przeskalowany do %1x%2"
+
+#: src/lib/ratio.cc:41
+msgid "Scope"
+msgstr "2.39"
+
+#: src/lib/send_problem_report_job.cc:61
+msgid "Sending email"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:46
+msgid "Short"
+msgstr "Krótkometrażowy"
+
+#: src/lib/audio_content.cc:252
+msgid "Some audio will be resampled to %1kHz"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:45
+msgid "Stereo to 5.1 up-mixer A"
+msgstr ""
+
+#: src/lib/subrip_content.cc:79
+msgid "SubRip subtitles"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:51
+msgid "Teaser"
+msgstr "Zapowiedź"
+
+#: src/lib/filter.cc:72
+msgid "Telecine filter"
+msgstr "Filtr Telecine"
+
+#: src/lib/dcp_content_type.cc:48
+msgid "Test"
+msgstr "Testowy"
+
+#: src/lib/dcp_examiner.cc:131
+msgid ""
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
+msgstr ""
+
+#: src/lib/exceptions.cc:72
+msgid "The certificate chain for signing is invalid"
+msgstr ""
+
+#: src/lib/job.cc:80
+msgid ""
+"The drive that the film is stored on is low in disc space. Free some more "
+"space and try again."
+msgstr ""
+"Dysk na którym zapisany jest film ma mało wolnego miejsca. Zwolnij miejsce "
+"na dysku i spróbuj ponownie."
+
+#: src/lib/job.cc:106
+msgid "There was not enough memory to do this."
+msgstr "Zabrakło pamięci RAM."
+
+#: src/lib/film.cc:372
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version. Sorry!"
+msgstr ""
+"Film został utworzony przy pomocy nowszej wersji DCP-o-matic i nie może być "
+"otwarty w tej wersji. Przepraszamy!"
+
+#: src/lib/film.cc:364
+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 "
+"create a new Film, re-add your content and set it up again. Sorry!"
+msgstr ""
+"Projekt został utworzony przy pomocy starszej wersji DCP-o-matic i nie może "
+"być otwarty w tej wersji. Musisz stworzyć nowy Projekt i ponownie dodać "
+"materiały i ustawienia. Przepraszamy!"
+
+#: src/lib/dcp_content_type.cc:47
+msgid "Trailer"
+msgstr "Zwiastun"
+
+#: src/lib/transcode_job.cc:54
+msgid "Transcode %1"
+msgstr "Transkodowanie %1"
+
+#: src/lib/dcp_content_type.cc:49
+msgid "Transitional"
+msgstr "Tymczasowy"
+
+#: src/lib/internet.cc:82
+msgid "Unexpected ZIP file contents"
+msgstr "Archiwum ZIP zawiera nieobsługiwane pliki"
+
+#: src/lib/image_proxy.cc:47
+msgid "Unexpected image type received by server"
+msgstr "Serwer otrzymał nieobsługiwany typ obrazu"
+
+#: src/lib/job.cc:123
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
+#: src/lib/ffmpeg_decoder.cc:282
+msgid "Unrecognised audio sample format (%1)"
+msgstr "Nieznany rodzaj pliku audio (%1)"
+
+#: src/lib/filter.cc:69
+msgid "Unsharp mask and Gaussian blur"
+msgstr "Wyostrzanie i filtr Gausowski"
+
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
+msgid "Unspecified"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:221
+msgid "Untitled"
+msgstr "Nowy"
+
+#: src/lib/upmixer_a.cc:128
+msgid "Upmix L"
+msgstr ""
+
+#: src/lib/upmixer_a.cc:129
+msgid "Upmix R"
+msgstr ""
+
+#: src/lib/film.cc:1202
+msgid "VI"
+msgstr ""
+
+#: src/lib/video_content.cc:580
+msgid "Video frame rate"
+msgstr ""
+
+#: src/lib/video_content.cc:578
+msgid "Video length"
+msgstr ""
+
+#: src/lib/video_content.cc:579
+msgid "Video size"
+msgstr ""
+
+#: src/lib/util.cc:479
+msgid "Visually impaired"
+msgstr "Dla niedowidzących"
+
+#: src/lib/scp_dcp_job.cc:103
+msgid "Waiting"
+msgstr "Czekam"
+
+#: src/lib/ffmpeg_content.cc:429
+msgid "YCOCG"
+msgstr ""
+
+#: src/lib/filter.cc:67
+msgid "Yet Another Deinterlacing Filter"
+msgstr "I jeszcze jeden filtr usuwania przeplotu"
+
+#: src/lib/film.cc:287
+msgid "You must add some content to the DCP before creating it"
+msgstr "Musisz dodać pliki zanim utworzysz DCP"
+
+#: src/lib/image_content.cc:87
+msgid "[moving images]"
+msgstr "[ruchome obrazy]"
+
+#: src/lib/image_content.cc:85
+msgid "[still]"
+msgstr "[stopklatka]"
+
+#: src/lib/dcp_subtitle_content.cc:90 src/lib/subrip_content.cc:73
+msgid "[subtitles]"
+msgstr ""
+
+#: src/lib/film.cc:268
+msgid "cannot contain slashes"
+msgstr "nie może zawierać ukośników"
+
+#: src/lib/dcpomatic_socket.cc:66
+msgid "connect timed out"
+msgstr "minął czas połączenia"
+
+#: src/lib/scp_dcp_job.cc:127
+msgid "connecting"
+msgstr "łączenie"
+
+#: src/lib/film.cc:283
+msgid "container"
+msgstr "kontener"
+
+#: src/lib/film.cc:291
+msgid "content type"
+msgstr "typ kontentu"
+
+#: src/lib/scp_dcp_job.cc:176
+msgid "copying %1"
+msgstr "kopiowanie %1"
+
+#: src/lib/exceptions.cc:36
+msgid "could not create file %1"
+msgstr "nie udało się utworzyć pliku %1"
+
+#: src/lib/ffmpeg.cc:132
+msgid "could not find stream information"
+msgstr "nie udało się znaleźć właściwości strumienia"
+
+#: src/lib/writer.cc:520
+msgid "could not move audio asset into the DCP (%1)"
+msgstr ""
+
+#: src/lib/sndfile_base.cc:47
+msgid "could not open audio file for reading"
+msgstr ""
+
+#: src/lib/exceptions.cc:29
+msgid "could not open file %1"
+msgstr "nie udało się otworzyć pliku (%1)"
+
+#: src/lib/data.cc:55
+msgid "could not open file for reading"
+msgstr "nie udało się odczytać pliku"
+
+#: src/lib/data.cc:61
+msgid "could not read from file"
+msgstr ""
+
+#: src/lib/exceptions.cc:42
+msgid "could not read from file %1 (%2)"
+msgstr "nie udało czytać z pliku %1 (%2)"
+
+#: src/lib/resampler.cc:96
+msgid "could not run sample-rate converter"
+msgstr "nie udało się uruchomić konwertera częstotliwości próbkowania"
+
+#: src/lib/resampler.cc:77
+msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
+msgstr ""
+"nie udało się uruchomić konwertera częstotliwości próbkowania dla %1 próbek "
+"(%2) (%3)"
+
+#: src/lib/scp_dcp_job.cc:88
+msgid "could not start SCP session (%1)"
+msgstr "nie udało się uruchomić sesji SCP (%1)"
+
+#: src/lib/scp_dcp_job.cc:54
+msgid "could not start SSH session"
+msgstr "nie udało się uruchomić sesji SSH"
+
+#: src/lib/exceptions.cc:48
+msgid "could not write to file %1 (%2)"
+msgstr "nie udało się zapisać do pliku %1 (%2)"
+
+#: src/lib/dcpomatic_socket.cc:62
+msgid "error during async_connect (%1)"
+msgstr "Nastąpił błąd podczas async_connect (%1)"
+
+#: src/lib/dcpomatic_socket.cc:115
+msgid "error during async_read (%1)"
+msgstr "Nastąpił błąd podczas async_read (%1)"
+
+#: src/lib/dcpomatic_socket.cc:87
+msgid "error during async_write (%1)"
+msgstr "Nastąpił błąd podczas async_write (%1)"
+
+#. / TRANSLATORS: fps here is an abbreviation for frames per second
+#: src/lib/transcode_job.cc:102
+msgid "fps"
+msgstr ""
+
+#: src/lib/video_content.cc:580
+msgid "frames per second"
+msgstr "klatek na sekundę"
+
+#. / TRANSLATORS: h here is an abbreviation for hours
+#: src/lib/util.cc:139 src/lib/util.cc:142
+msgid "h"
+msgstr ""
+
+#. / TRANSLATORS: m here is an abbreviation for minutes
+#: src/lib/util.cc:154 src/lib/util.cc:157
+msgid "m"
+msgstr ""
+
+#: src/lib/exceptions.cc:54
+msgid "missing required setting %1"
+msgstr "brakuje wymaganych ustawień %1"
+
+#: src/lib/image_content.cc:102
+msgid "moving"
+msgstr ""
+
+#: src/lib/ffmpeg_decoder.cc:452
+msgid "multi-part subtitles not yet supported"
+msgstr "pliki kilkuczęściowe nie są jeszcze obsługiwane "
+
+#: src/lib/film.cc:268 src/lib/film.cc:295
+msgid "name"
+msgstr "nazwa"
+
+#: src/lib/video_content.cc:524
+msgid "pixel aspect ratio"
+msgstr "proporcje obrazu"
+
+#. / TRANSLATORS: remaining here follows an amount of time that is remaining
+#. / on an operation.
+#: src/lib/job.cc:328
+msgid "remaining"
+msgstr "pozostało"
+
+#. / TRANSLATORS: s here is an abbreviation for seconds
+#: src/lib/util.cc:168
+msgid "s"
+msgstr ""
+
+#: src/lib/colour_conversion.cc:262
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/lib/image_content.cc:100
+msgid "still"
+msgstr ""
+
+#: src/lib/ffmpeg_examiner.cc:252
+msgid "unknown"
+msgstr "nieznany"
+
+#: src/lib/video_content.cc:578
+msgid "video frames"
+msgstr ""
+
+#~ msgid "Area"
+#~ msgstr "Pole"
+
+#~ msgid "Audio will be resampled from %1kHz to %2kHz."
+#~ msgstr "Dźwięk będzie przesamplowany z %1kHz na %2kHz."
+
+#~ msgid "Audio will not be resampled."
+#~ msgstr "Dźwięk nie będzie przesamplowany."
+
+#~ msgid "Bicubic"
+#~ msgstr "Dwusześcienny"
+
+#~ msgid "Bilinear"
+#~ msgstr "Dwuliniowy"
+
+#~ msgid "Content to be joined must use the same audio stream."
+#~ msgstr "Łączone pliki muszą używać tego samego strumienia dźwięku."
+
+#~ msgid "Fast Bilinear"
+#~ msgstr "Szybki dwuliniowy"
+
+#~ msgid "Gaussian"
+#~ msgstr "Gausowski"
+
+#~ msgid ""
+#~ "It is not known what caused this error. Please report the problem to the "
+#~ "DCP-o-matic author (carl@dcpomatic.com)."
+#~ msgstr ""
+#~ "Nie udało się ustalić, co spowodowało błąd. Prosimy o zgłoszenie błędu do "
+#~ "autora DCP-o-matic (carl@dcpomatic.com)."
+
+#~ msgid "Lanczos"
+#~ msgstr "Lanczos"
+
+#~ msgid "P3 (from SMPTE RP 431-2)"
+#~ msgstr "P3 (z SMPTE RP 431-2)"
+
+#~ msgid "Padded with black to %1x%2"
+#~ msgstr "Dodano kaszetę do rozdzielczości %1x%2"
+
+#~ msgid "Sinc"
+#~ msgstr "Sinc"
+
+#~ msgid "Spline"
+#~ msgstr "Klin"
+
+#~ msgid "X"
+#~ msgstr "X"
+
+#~ msgid "could not find audio decoder"
+#~ msgstr "nie udało się znaleźć dekodera audio"
+
+#~ msgid "could not find video decoder"
+#~ msgstr "nie udało się znaleźć dekodera video"
+
+#~ msgid "could not move audio MXF into the DCP (%1)"
+#~ msgstr "nie udało się przenieść pliku audio MXF do DCP (%1)"
+
+#~ msgid "could not open audio file for reading (%1)"
+#~ msgstr "nie udało się odczytać pliku audio (%1)"
+
+#~ msgid "could not read encoded data"
+#~ msgstr "nie udało się odczytać danych zaszyfrowanych"
+
+#~ msgid "error during async_accept (%1)"
+#~ msgstr "Nastąpił błąd podczas async_accept (%1)"
+
+#~ msgid "hour"
+#~ msgstr "godzina"
+
+#~ msgid "hours"
+#~ msgstr "godzin"
+
+#~ msgid "minute"
+#~ msgstr "minuta"
+
+#~ msgid "minutes"
+#~ msgstr "minut"
+
+#~ msgid "missing key %1 in key-value set"
+#~ msgstr "brakuje klucza %1 w gałęzi key-value"
+
+#~ msgid "non-bitmap subtitles not yet supported"
+#~ msgstr "na razie obsługiwane są tylko napisy w bitmapie"
+
+#~ msgid "second"
+#~ msgstr "sekunda"
+
+#~ msgid "seconds"
+#~ msgstr "sekund"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 51e6407c4..fe6027971 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: Russian\n"
@@ -23,7 +23,7 @@ msgstr "%1 [DCP]"
msgid "%1 [audio]"
msgstr "%1 [аудио]"
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr "%1 [видео]"
@@ -59,7 +59,7 @@ msgstr "ADV (Реклама)"
msgid "An error occurred whilst handling the file %1."
msgstr "Возникла ошибка при обращении к файлу %1."
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
msgstr "Анализ аудио"
@@ -79,56 +79,60 @@ msgstr "Аудио будет ресэмплировано в %1кГц"
msgid "Audio will not be resampled"
msgstr "Аудио не будет ресэмплировано"
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr "BsL"
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr "BsR"
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr "C"
@@ -141,7 +145,7 @@ msgstr "Отменено"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Невозможно обработать формат пикселя %1 во время %2"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Центральный"
@@ -149,19 +153,20 @@ msgstr "Центральный"
msgid "Checking existing image data"
msgstr "Проверка данных изображения"
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -293,7 +298,7 @@ msgstr "Не удалось декодировать JPEG2000-файл(ы) %1 (%
msgid "Could not decode image file (%1)"
msgstr "Не удалось декодировать изображение (%1)"
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
@@ -430,7 +435,7 @@ msgstr ""
msgid "Examine content"
msgstr "Проверка контента"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -442,15 +447,15 @@ msgstr "Ошибка аутентификации сервером (%1)"
msgid "Feature"
msgstr "FTR (Фильм)"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
msgstr "Расчет длительности"
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
#, fuzzy
msgid "Finding subtitles"
msgstr "Субтитры SubRip"
@@ -463,11 +468,11 @@ msgstr "Flat (1998x1080)"
msgid "Full frame"
msgstr "FULL (2048x1080)"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -475,11 +480,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Разбиение градиента"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr "HI"
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr "Для слабослышащих"
@@ -487,11 +492,11 @@ msgstr "Для слабослышащих"
msgid "High quality 3D denoiser"
msgstr "Высококачественный подавитель шума 3D"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
@@ -499,10 +504,6 @@ msgstr ""
msgid "It is not known what caused this error."
msgstr "Неизвестно, что вызвало эту ошибку."
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
msgstr "Назначение KDM: $CPL_NAME"
@@ -511,58 +512,54 @@ msgstr "Назначение KDM: $CPL_NAME"
msgid "Kernel deinterlacer"
msgstr "Деинтерлейсинг ядром"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr "L"
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr "Lc"
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Левый"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr "Левый центральный"
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
msgid "Left rear surround"
msgstr "Левый тыловой surround"
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "Левый surround"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr "НЧ"
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "НЧ (sub)"
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
msgid "Linear"
msgstr ""
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr "Ls"
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr "Mid-side декодер"
@@ -647,11 +644,11 @@ msgstr "Ошибка програмиирования %1:%2"
msgid "Public Service Announcement"
msgstr "PSA (Социальная реклама)"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr "R"
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -659,7 +656,7 @@ msgstr ""
msgid "Rating"
msgstr "RTG (Оценивающий признак)"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr "Rc"
@@ -671,36 +668,36 @@ msgstr "Rec. 601"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Правый"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr "Правый центральный"
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
msgid "Right rear surround"
msgstr "Правый тыловой surround"
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Правый surround"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr "Rs"
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -749,8 +746,9 @@ msgid "Test"
msgstr "TST (Тестовый)"
#: src/lib/dcp_examiner.cc:131
+#, fuzzy
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
"Данный KDM не открывает DCP. Возможно он предназначен для другого CPL-файла"
@@ -770,7 +768,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr "Недостаточно памяти, чтобы сделать это."
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
"loaded into this version. Sorry!"
@@ -778,7 +776,7 @@ msgstr ""
"Проект создан более новой версией DCP-o-matic и не быть загружен этой "
"версией. Извините!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -820,11 +818,11 @@ msgstr "Нераспознанный формат аудио (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Маска понижения резкости и Гауссово размытие"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -840,7 +838,7 @@ msgstr "Преобразовать Л"
msgid "Upmix R"
msgstr "Преобразовать П"
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr "VI"
@@ -858,7 +856,7 @@ msgstr "Расчет длительности"
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr "Для слабовидящих"
@@ -866,7 +864,7 @@ msgstr "Для слабовидящих"
msgid "Waiting"
msgstr "Ожидание"
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -874,7 +872,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Ещё один фильтр деинтерлейсинга"
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
msgid "You must add some content to the DCP before creating it"
msgstr "Добавьте контент в проект прежде чем создавать DCP"
@@ -890,7 +888,7 @@ msgstr "[статичный]"
msgid "[subtitles]"
msgstr "[субтитры]"
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "не может содержать разрезы"
@@ -902,11 +900,11 @@ msgstr "таймаут соединения"
msgid "connecting"
msgstr "соединение"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "контейнер"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "тип контента"
@@ -1010,7 +1008,7 @@ msgstr "последовательность"
msgid "multi-part subtitles not yet supported"
msgstr "субтитры из нескольких частей ещё не поддерживаются"
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "название"
@@ -1037,7 +1035,7 @@ msgstr "sRGB"
msgid "still"
msgstr "статичный"
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
msgstr "неизвестно"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index b2fb4ffbc..6e263add8 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: 2015-06-30 22:20+0100\n"
+"POT-Creation-Date: 2015-07-06 16:13+0100\n"
"PO-Revision-Date: 2014-01-19 08:59+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%1 [audio]"
msgstr "%1 [ljud]"
-#: src/lib/ffmpeg_content.cc:217
+#: src/lib/ffmpeg_content.cc:219
msgid "%1 [movie]"
msgstr "%1 [film]"
@@ -61,7 +61,7 @@ msgstr "Advertisement"
msgid "An error occurred whilst handling the file %1."
msgstr "Ett fel inträffade vid hantering av filen %1"
-#: src/lib/analyse_audio_job.cc:52
+#: src/lib/analyse_audio_job.cc:54
msgid "Analyse audio"
msgstr "Analysera audio"
@@ -84,56 +84,60 @@ msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
msgid "Audio will not be resampled"
msgstr "Audio kommer att samplas om från %1kHz till %2kHz."
-#: src/lib/ffmpeg_content.cc:405
+#: src/lib/ffmpeg_content.cc:411
msgid "BT1361 extended colour gamut"
msgstr ""
-#: src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:392
msgid "BT2020"
msgstr ""
-#: src/lib/ffmpeg_content.cc:425
+#: src/lib/ffmpeg_content.cc:431
msgid "BT2020 constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:407
+#: src/lib/ffmpeg_content.cc:413
msgid "BT2020 for a 10-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:408
+#: src/lib/ffmpeg_content.cc:414
msgid "BT2020 for a 12-bit system"
msgstr ""
-#: src/lib/ffmpeg_content.cc:424
+#: src/lib/ffmpeg_content.cc:430
msgid "BT2020 non-constant luminance"
msgstr ""
-#: src/lib/ffmpeg_content.cc:382
+#: src/lib/ffmpeg_content.cc:388
msgid "BT470BG"
msgstr ""
-#: src/lib/ffmpeg_content.cc:420
+#: src/lib/ffmpeg_content.cc:426
msgid "BT470BG (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:381
+#: src/lib/ffmpeg_content.cc:387
msgid "BT470M"
msgstr ""
-#: src/lib/ffmpeg_content.cc:378 src/lib/ffmpeg_content.cc:394
-#: src/lib/ffmpeg_content.cc:416
+#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
+#: src/lib/ffmpeg_content.cc:422
msgid "BT709"
msgstr ""
-#: src/lib/film.cc:1213
+#: src/lib/ffmpeg_content.cc:437
+msgid "Bits per pixel"
+msgstr ""
+
+#: src/lib/film.cc:1205
msgid "BsL"
msgstr ""
-#: src/lib/film.cc:1214
+#: src/lib/film.cc:1206
msgid "BsR"
msgstr ""
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1197
msgid "C"
msgstr ""
@@ -145,7 +149,7 @@ msgstr "Avbruten"
msgid "Cannot handle pixel format %1 during %2"
msgstr "Kan inte hantera pixelformat %1 under %2"
-#: src/lib/util.cc:498
+#: src/lib/util.cc:474
msgid "Centre"
msgstr "Center"
@@ -153,19 +157,20 @@ msgstr "Center"
msgid "Checking existing image data"
msgstr "Kontrollerar befintligt bilddata"
-#: src/lib/ffmpeg_content.cc:390
-msgid "Color primaries"
+#: src/lib/ffmpeg_content.cc:396
+msgid "Colour primaries"
msgstr ""
-#: src/lib/ffmpeg_content.cc:374
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:373
+#: src/lib/ffmpeg_content.cc:376
msgid "Colour range"
msgstr ""
-#: src/lib/ffmpeg_content.cc:412
+#: src/lib/ffmpeg_content.cc:418
msgid "Colour transfer characteristic"
msgstr ""
-#: src/lib/ffmpeg_content.cc:429
+#: src/lib/ffmpeg_content.cc:435
msgid "Colourspace"
msgstr ""
@@ -295,7 +300,7 @@ msgstr "kunde inte skapa fil %1"
msgid "Could not decode image file (%1)"
msgstr "kunde inte skapa fil %1"
-#: src/lib/server_finder.cc:128
+#: src/lib/server_finder.cc:126
msgid ""
"Could not listen for remote encode servers. Perhaps another instance of DCP-"
"o-matic is running."
@@ -428,7 +433,7 @@ msgstr ""
msgid "Examine content"
msgstr "Undersök innehållet"
-#: src/lib/ffmpeg_content.cc:419
+#: src/lib/ffmpeg_content.cc:425
msgid "FCC"
msgstr ""
@@ -440,15 +445,15 @@ msgstr "Misslyckades att autentisera med server (%1)"
msgid "Feature"
msgstr "Feature"
-#: src/lib/ffmpeg_content.cc:385
+#: src/lib/ffmpeg_content.cc:391
msgid "Film"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:76
+#: src/lib/ffmpeg_examiner.cc:78
msgid "Finding length"
msgstr ""
-#: src/lib/ffmpeg_examiner.cc:81
+#: src/lib/ffmpeg_examiner.cc:83
msgid "Finding subtitles"
msgstr ""
@@ -460,11 +465,11 @@ msgstr "Flat"
msgid "Full frame"
msgstr "Full frame"
-#: src/lib/ffmpeg_content.cc:397
+#: src/lib/ffmpeg_content.cc:403
msgid "Gamma 22 (BT470M)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:398
+#: src/lib/ffmpeg_content.cc:404
msgid "Gamma 28 (BT470BG)"
msgstr ""
@@ -472,11 +477,11 @@ msgstr ""
msgid "Gradient debander"
msgstr "Gradientutjämnare"
-#: src/lib/film.cc:1209
+#: src/lib/film.cc:1201
msgid "HI"
msgstr ""
-#: src/lib/util.cc:502
+#: src/lib/util.cc:478
msgid "Hearing impaired"
msgstr ""
@@ -484,11 +489,11 @@ msgstr ""
msgid "High quality 3D denoiser"
msgstr "Högkvalitets 3D-brusreducering"
-#: src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:412
msgid "IEC61966-2-1 (sRGB or sYCC)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:404
+#: src/lib/ffmpeg_content.cc:410
msgid "IEC61966-2-4"
msgstr ""
@@ -496,10 +501,6 @@ msgstr ""
msgid "It is not known what caused this error."
msgstr ""
-#: src/lib/ffmpeg_content.cc:370
-msgid "JPEG (0-255 or equivalent)"
-msgstr ""
-
#: src/lib/config.cc:197
msgid "KDM delivery: $CPL_NAME"
msgstr ""
@@ -508,60 +509,56 @@ msgstr ""
msgid "Kernel deinterlacer"
msgstr "Kernel-avflätare"
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1195
msgid "L"
msgstr ""
-#: src/lib/film.cc:1211
+#: src/lib/film.cc:1203
msgid "Lc"
msgstr ""
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:496
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
msgid "Left"
msgstr "Vänster"
-#: src/lib/util.cc:504
+#: src/lib/util.cc:480
msgid "Left centre"
msgstr ""
-#: src/lib/util.cc:506
+#: src/lib/util.cc:482
#, fuzzy
msgid "Left rear surround"
msgstr "Vänster surround"
-#: src/lib/util.cc:500
+#: src/lib/util.cc:476
msgid "Left surround"
msgstr "Vänster surround"
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1198
msgid "Lfe"
msgstr ""
-#: src/lib/util.cc:499
+#: src/lib/util.cc:475
msgid "Lfe (sub)"
msgstr "Lfe (sub)"
-#: src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:407
#, fuzzy
msgid "Linear"
msgstr "Bilinjär"
-#: src/lib/ffmpeg_content.cc:402
+#: src/lib/ffmpeg_content.cc:408
msgid "Logarithmic (100:1 range)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:403
+#: src/lib/ffmpeg_content.cc:409
msgid "Logarithmic (316:1 range)"
msgstr ""
-#: src/lib/film.cc:1207
+#: src/lib/film.cc:1199
msgid "Ls"
msgstr ""
-#: src/lib/ffmpeg_content.cc:369
-msgid "MPEG (0-219 or equivalent)"
-msgstr ""
-
#: src/lib/mid_side_decoder.cc:34
msgid "Mid-side decoder"
msgstr ""
@@ -649,11 +646,11 @@ msgstr ""
msgid "Public Service Announcement"
msgstr "Public Service Announcement"
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1196
msgid "R"
msgstr ""
-#: src/lib/ffmpeg_content.cc:415
+#: src/lib/ffmpeg_content.cc:421
msgid "RGB / sRGB (IEC61966-2-1)"
msgstr ""
@@ -661,7 +658,7 @@ msgstr ""
msgid "Rating"
msgstr "Rating"
-#: src/lib/film.cc:1212
+#: src/lib/film.cc:1204
msgid "Rc"
msgstr ""
@@ -674,37 +671,37 @@ msgstr "Rec. 709"
msgid "Rec. 709"
msgstr "Rec. 709"
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:497
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
msgid "Right"
msgstr "Höger"
-#: src/lib/util.cc:505
+#: src/lib/util.cc:481
msgid "Right centre"
msgstr ""
-#: src/lib/util.cc:507
+#: src/lib/util.cc:483
#, fuzzy
msgid "Right rear surround"
msgstr "Höger surround"
-#: src/lib/util.cc:501
+#: src/lib/util.cc:477
msgid "Right surround"
msgstr "Höger surround"
-#: src/lib/film.cc:1208
+#: src/lib/film.cc:1200
msgid "Rs"
msgstr ""
-#: src/lib/ffmpeg_content.cc:383 src/lib/ffmpeg_content.cc:399
+#: src/lib/ffmpeg_content.cc:389 src/lib/ffmpeg_content.cc:405
msgid "SMPTE 170M (BT601)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:421
+#: src/lib/ffmpeg_content.cc:427
msgid "SMPTE 170M (BT601-6)"
msgstr ""
-#: src/lib/ffmpeg_content.cc:384 src/lib/ffmpeg_content.cc:400
-#: src/lib/ffmpeg_content.cc:422
+#: src/lib/ffmpeg_content.cc:390 src/lib/ffmpeg_content.cc:406
+#: src/lib/ffmpeg_content.cc:428
msgid "SMPTE 240M"
msgstr ""
@@ -755,7 +752,7 @@ msgstr "Test"
#: src/lib/dcp_examiner.cc:131
msgid ""
-"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL"
+"The KDM does not decrypt the DCP. Perhaps it is targeted at the wrong CPL."
msgstr ""
#: src/lib/exceptions.cc:72
@@ -774,7 +771,7 @@ msgstr ""
msgid "There was not enough memory to do this."
msgstr ""
-#: src/lib/film.cc:380
+#: src/lib/film.cc:372
#, fuzzy
msgid ""
"This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -784,7 +781,7 @@ msgstr ""
"inte öppnas i denna version. Du måste skapa en ny Film, lägga till ditt "
"innehåll och konfigurera allt igen. Ursäkta!"
-#: src/lib/film.cc:372
+#: src/lib/film.cc:364
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 "
@@ -827,11 +824,11 @@ msgstr "Okänt audio-sampelformat (%1)"
msgid "Unsharp mask and Gaussian blur"
msgstr "Oskärpemask och Gaussisk suddighet"
-#: src/lib/ffmpeg_content.cc:368 src/lib/ffmpeg_content.cc:377
-#: src/lib/ffmpeg_content.cc:379 src/lib/ffmpeg_content.cc:380
-#: src/lib/ffmpeg_content.cc:393 src/lib/ffmpeg_content.cc:395
-#: src/lib/ffmpeg_content.cc:396 src/lib/ffmpeg_content.cc:417
-#: src/lib/ffmpeg_content.cc:418
+#: src/lib/ffmpeg_content.cc:370 src/lib/ffmpeg_content.cc:383
+#: src/lib/ffmpeg_content.cc:385 src/lib/ffmpeg_content.cc:386
+#: src/lib/ffmpeg_content.cc:399 src/lib/ffmpeg_content.cc:401
+#: src/lib/ffmpeg_content.cc:402 src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:424
msgid "Unspecified"
msgstr ""
@@ -847,7 +844,7 @@ msgstr ""
msgid "Upmix R"
msgstr ""
-#: src/lib/film.cc:1210
+#: src/lib/film.cc:1202
msgid "VI"
msgstr ""
@@ -864,7 +861,7 @@ msgstr ""
msgid "Video size"
msgstr ""
-#: src/lib/util.cc:503
+#: src/lib/util.cc:479
msgid "Visually impaired"
msgstr ""
@@ -872,7 +869,7 @@ msgstr ""
msgid "Waiting"
msgstr "Väntar"
-#: src/lib/ffmpeg_content.cc:423
+#: src/lib/ffmpeg_content.cc:429
msgid "YCOCG"
msgstr ""
@@ -881,7 +878,7 @@ msgstr ""
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:295
+#: src/lib/film.cc:287
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"
@@ -897,7 +894,7 @@ msgstr "[stillbild]"
msgid "[subtitles]"
msgstr ""
-#: src/lib/film.cc:276
+#: src/lib/film.cc:268
msgid "cannot contain slashes"
msgstr "får inte innehålla snedstreck"
@@ -910,11 +907,11 @@ msgstr "uppkopplingen tajmade ur"
msgid "connecting"
msgstr "kopplar upp"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:283
msgid "container"
msgstr "behållare"
-#: src/lib/film.cc:299
+#: src/lib/film.cc:291
msgid "content type"
msgstr "innehållstyp"
@@ -1021,7 +1018,7 @@ msgstr "rörlig"
msgid "multi-part subtitles not yet supported"
msgstr "undertexter i flera delar stöds inte ännu"
-#: src/lib/film.cc:276 src/lib/film.cc:303
+#: src/lib/film.cc:268 src/lib/film.cc:295
msgid "name"
msgstr "namn"
@@ -1048,7 +1045,7 @@ msgstr "sRGB"
msgid "still"
msgstr "stillbild"
-#: src/lib/ffmpeg_examiner.cc:250
+#: src/lib/ffmpeg_examiner.cc:252
msgid "unknown"
msgstr "okänd"
diff --git a/src/lib/quickmail.cc b/src/lib/quickmail.cc
index 8d62e02c9..39e724c68 100644
--- a/src/lib/quickmail.cc
+++ b/src/lib/quickmail.cc
@@ -40,7 +40,7 @@
#define MAILPART_END 5
#define MAILPART_DONE 6
-static const char* default_mime_type = "text/plain";
+static const char* default_mime_type = "text/plain; charset=UTF-8";
////////////////////////////////////////////////////////////////////////
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index ac4651657..3eec6597b 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -41,27 +41,28 @@ ServerFinder* ServerFinder::_instance = 0;
ServerFinder::ServerFinder ()
: _disabled (false)
- , _broadcast_thread (0)
+ , _search_thread (0)
, _listen_thread (0)
, _stop (false)
{
- _broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this));
+ _search_thread = new boost::thread (boost::bind (&ServerFinder::search_thread, this));
_listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this));
+ Config::instance()->Changed.connect (boost::bind (&ServerFinder::config_changed, this, _1));
}
ServerFinder::~ServerFinder ()
{
_stop = true;
- _broadcast_thread->interrupt ();
- _broadcast_thread->join ();
+ _search_condition.notify_all ();
+ _search_thread->join ();
_listen_io_service.stop ();
_listen_thread->join ();
}
void
-ServerFinder::broadcast_thread ()
+ServerFinder::search_thread ()
try
{
boost::system::error_code error;
@@ -105,11 +106,8 @@ try
}
}
- try {
- boost::thread::sleep (boost::get_system_time() + boost::posix_time::seconds (10));
- } catch (boost::thread_interrupted& e) {
- return;
- }
+ boost::mutex::scoped_lock lm (_search_condition_mutex);
+ _search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (10));
}
}
catch (...)
@@ -172,7 +170,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so
boost::mutex::scoped_lock lm (_mutex);
_servers.push_back (sd);
}
- emit (boost::bind (boost::ref (ServerFound), sd));
+ emit (boost::bind (boost::ref (ServersListChanged)));
}
start_accept ();
@@ -190,19 +188,6 @@ ServerFinder::server_found (string ip) const
return i != _servers.end ();
}
-boost::signals2::connection
-ServerFinder::connect (boost::function<void (ServerDescription)> fn)
-{
- boost::mutex::scoped_lock lm (_mutex);
-
- /* Emit the current list of servers */
- for (list<ServerDescription>::iterator i = _servers.begin(); i != _servers.end(); ++i) {
- fn (*i);
- }
-
- return ServerFound.connect (fn);
-}
-
ServerFinder*
ServerFinder::instance ()
{
@@ -219,3 +204,29 @@ ServerFinder::drop ()
delete _instance;
_instance = 0;
}
+
+list<ServerDescription>
+ServerFinder::servers () const
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ return _servers;
+}
+
+void
+ServerFinder::config_changed (Config::Property what)
+{
+ if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _servers.clear ();
+ }
+ ServersListChanged ();
+ search_now ();
+ }
+}
+
+void
+ServerFinder::search_now ()
+{
+ _search_condition.notify_all ();
+}
diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index ec855938b..3bb0e03f9 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -19,13 +19,12 @@
#include "server.h"
#include "signaller.h"
+#include "config.h"
#include <boost/signals2.hpp>
class ServerFinder : public Signaller, public ExceptionStore
{
public:
- boost::signals2::connection connect (boost::function<void (ServerDescription)>);
-
static ServerFinder* instance ();
static void drop ();
@@ -37,23 +36,29 @@ public:
return _disabled;
}
+ std::list<ServerDescription> servers () const;
+
+ /** Emitted whenever the list of servers changes */
+ boost::signals2::signal<void ()> ServersListChanged;
+
private:
ServerFinder ();
~ServerFinder ();
- void broadcast_thread ();
+ void search_thread ();
void listen_thread ();
bool server_found (std::string) const;
void start_accept ();
void handle_accept (boost::system::error_code ec, boost::shared_ptr<Socket> socket);
- boost::signals2::signal<void (ServerDescription)> ServerFound;
+ void config_changed (Config::Property what);
+ void search_now ();
bool _disabled;
- /** Thread to periodically issue broadcasts to find encoding servers */
- boost::thread* _broadcast_thread;
+ /** Thread to periodically issue broadcasts and requests to find encoding servers */
+ boost::thread* _search_thread;
/** Thread to listen to the responses from servers */
boost::thread* _listen_thread;
@@ -64,5 +69,8 @@ private:
boost::shared_ptr<boost::asio::ip::tcp::acceptor> _listen_acceptor;
bool _stop;
+ boost::condition _search_condition;
+ boost::mutex _search_condition_mutex;
+
static ServerFinder* _instance;
};