pot/merge.

1 files changed, 117 insertions, 125 deletions

diff --git a/src/lib/po/fi_FI.po b/src/lib/po/fi_FI.po
index a3f4a348d..8f40d8288 100644
--- a/src/lib/po/fi_FI.po
+++ b/src/lib/po/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-31 23:35+0000\n"
+"POT-Creation-Date: 2019-02-07 23:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,7 +163,7 @@ msgid ""
 "unlikely to have any visible effect on the image."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:612
+#: src/lib/ffmpeg_content.cc:615
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr ""
 
@@ -207,64 +207,64 @@ msgstr ""
 msgid "Audio will not be resampled"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:609
 msgid "BT1361 extended colour gamut"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:574
+#: src/lib/ffmpeg_content.cc:577
 msgid "BT2020"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:629
+#: src/lib/ffmpeg_content.cc:632
 msgid "BT2020 constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:608
+#: src/lib/ffmpeg_content.cc:611
 msgid "BT2020 for a 10-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:609
+#: src/lib/ffmpeg_content.cc:612
 msgid "BT2020 for a 12-bit system"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:628
+#: src/lib/ffmpeg_content.cc:631
 msgid "BT2020 non-constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:633
+#: src/lib/ffmpeg_content.cc:636
 msgid "BT2100"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:573
 msgid "BT470BG"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:627
 msgid "BT470BG (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:569
+#: src/lib/ffmpeg_content.cc:572
 msgid "BT470M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:566 src/lib/ffmpeg_content.cc:595
-#: src/lib/ffmpeg_content.cc:620
+#: src/lib/ffmpeg_content.cc:569 src/lib/ffmpeg_content.cc:598
+#: src/lib/ffmpeg_content.cc:623
 msgid "BT709"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:640
+#: src/lib/ffmpeg_content.cc:643
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/util.cc:556
+#: src/lib/util.cc:570
 msgid "BsL"
 msgstr ""
 
-#: src/lib/util.cc:557
+#: src/lib/util.cc:571
 msgid "BsR"
 msgstr ""
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:562
 msgid "C"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
-#: src/lib/util.cc:517
+#: src/lib/util.cc:531
 msgid "Centre"
 msgstr ""
 
@@ -304,11 +304,11 @@ msgstr ""
 msgid "Choose 'Make DCP' again when you have done this."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:632
+#: src/lib/ffmpeg_content.cc:635
 msgid "Chroma-derived constant luminance"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:631
+#: src/lib/ffmpeg_content.cc:634
 msgid "Chroma-derived non-constant luminance"
 msgstr ""
 
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Closed captions"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:591
+#: src/lib/ffmpeg_content.cc:594
 msgid "Colour primaries"
 msgstr ""
 
@@ -330,17 +330,17 @@ msgstr ""
 #. / file is limited, so that not all possible values are valid.
 #. / TRANSLATORS: this means that the range of pixel values used in this
 #. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:530
-#: src/lib/ffmpeg_content.cc:537 src/lib/ffmpeg_content.cc:547
-#: src/lib/ffmpeg_content.cc:552 src/lib/ffmpeg_content.cc:557
+#: src/lib/ffmpeg_content.cc:526 src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:540 src/lib/ffmpeg_content.cc:550
+#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:560
 msgid "Colour range"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:616
+#: src/lib/ffmpeg_content.cc:619
 msgid "Colour transfer characteristic"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:637
+#: src/lib/ffmpeg_content.cc:640
 msgid "Colourspace"
 msgstr ""
 
@@ -518,19 +518,19 @@ msgstr ""
 msgid "Could not write to remote file (%1)"
 msgstr ""
 
-#: src/lib/util.cc:527
+#: src/lib/util.cc:541
 msgid "D-BOX primary"
 msgstr ""
 
-#: src/lib/util.cc:528
+#: src/lib/util.cc:542
 msgid "D-BOX secondary"
 msgstr ""
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:572
 msgid "DBP"
 msgstr ""
 
-#: src/lib/util.cc:559
+#: src/lib/util.cc:573
 msgid "DBS"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "Error: %1"
 msgstr ""
 
-#: src/lib/hints.cc:262
+#: src/lib/hints.cc:265
 msgid "Examining closed captions"
 msgstr ""
 
@@ -660,7 +660,7 @@ msgstr ""
 msgid "Examining subtitles"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:626
 msgid "FCC"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:573
+#: src/lib/ffmpeg_content.cc:576
 msgid "Film"
 msgstr ""
 
@@ -692,15 +692,15 @@ msgstr ""
 msgid "Frame rate"
 msgstr ""
 
-#: src/lib/util.cc:857
+#: src/lib/util.cc:871
 msgid "Friday"
 msgstr "Perjantai"
 
-#: src/lib/ffmpeg_content.cc:557
+#: src/lib/ffmpeg_content.cc:560
 msgid "Full"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:537
+#: src/lib/ffmpeg_content.cc:540
 msgid "Full (0-%1)"
 msgstr ""
 
@@ -724,11 +724,11 @@ msgstr ""
 msgid "Full length in video frames at content rate"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:598
+#: src/lib/ffmpeg_content.cc:601
 msgid "Gamma 22 (BT470M)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:599
+#: src/lib/ffmpeg_content.cc:602
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
@@ -736,11 +736,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr ""
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:566
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:521
+#: src/lib/util.cc:535
 msgid "Hearing impaired"
 msgstr ""
 
@@ -752,35 +752,27 @@ msgstr ""
 msgid "Horizontal flip"
 msgstr ""
 
-#: src/lib/hints.cc:170
-msgid ""
-"However, setting your DCP frame rate to 24 or 48 will cause a significant "
-"slowdown of your content, and SMPTE DCPs are not supported by all projectors."
-msgstr ""
-
-#: src/lib/hints.cc:167
-msgid ""
-"However, setting your DCP frame rate to 24 or 48 will cause a significant "
-"speed-up of your content, and SMPTE DCPs are not supported by all projectors."
-msgstr ""
-
 #: src/lib/audio_content.cc:293 src/lib/audio_content.cc:313
 msgid "Hz"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:610
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:605
+#: src/lib/ffmpeg_content.cc:608
 msgid "IEC61966-2-4"
 msgstr ""
 
+#: src/lib/hints.cc:168
+msgid "If you do use 25fps you should change your DCP standard to SMPTE."
+msgstr ""
+
 #: src/lib/job.cc:147 src/lib/job.cc:197 src/lib/job.cc:207
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:587
+#: src/lib/ffmpeg_content.cc:590
 msgid "JEDEC P22"
 msgstr ""
 
@@ -800,27 +792,27 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr ""
 
-#: src/lib/ffmpeg_encoder.cc:203 src/lib/util.cc:546
+#: src/lib/ffmpeg_encoder.cc:203 src/lib/util.cc:560
 msgid "L"
 msgstr ""
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:568
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:515
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:529
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:523
+#: src/lib/util.cc:537
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:525
+#: src/lib/util.cc:539
 msgid "Left rear surround"
 msgstr ""
 
-#: src/lib/util.cc:519
+#: src/lib/util.cc:533
 msgid "Left surround"
 msgstr ""
 
@@ -828,35 +820,35 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: src/lib/util.cc:549
+#: src/lib/util.cc:563
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:518
+#: src/lib/util.cc:532
 msgid "Lfe (sub)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:552
+#: src/lib/ffmpeg_content.cc:555
 msgid "Limited"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:533
 msgid "Limited (%1-%2)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:605
 msgid "Linear"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:603
+#: src/lib/ffmpeg_content.cc:606
 msgid "Logarithmic (100:1 range)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:604
+#: src/lib/ffmpeg_content.cc:607
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:564
 msgid "Ls"
 msgstr ""
 
@@ -888,7 +880,7 @@ msgstr ""
 msgid "Missing required setting %1"
 msgstr ""
 
-#: src/lib/util.cc:849
+#: src/lib/util.cc:863
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -983,11 +975,11 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr ""
 
-#: src/lib/ffmpeg_encoder.cc:207 src/lib/util.cc:547
+#: src/lib/ffmpeg_encoder.cc:207 src/lib/util.cc:561
 msgid "R"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:619
+#: src/lib/ffmpeg_content.cc:622
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
@@ -995,7 +987,7 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: src/lib/util.cc:555
+#: src/lib/util.cc:569
 msgid "Rc"
 msgstr ""
 
@@ -1015,19 +1007,19 @@ msgstr ""
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:516
+#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:530
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:524
+#: src/lib/util.cc:538
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:526
+#: src/lib/util.cc:540
 msgid "Right rear surround"
 msgstr ""
 
-#: src/lib/util.cc:520
+#: src/lib/util.cc:534
 msgid "Right surround"
 msgstr ""
 
@@ -1039,7 +1031,7 @@ msgstr ""
 msgid "Rotate 90 degrees clockwise"
 msgstr ""
 
-#: src/lib/util.cc:551
+#: src/lib/util.cc:565
 msgid "Rs"
 msgstr ""
 
@@ -1047,40 +1039,40 @@ msgstr ""
 msgid "S-Gamut3/S-Log3"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:600
+#: src/lib/ffmpeg_content.cc:574 src/lib/ffmpeg_content.cc:603
 msgid "SMPTE 170M (BT601)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:625
+#: src/lib/ffmpeg_content.cc:628
 msgid "SMPTE 170M (BT601-6)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:633
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:572 src/lib/ffmpeg_content.cc:601
-#: src/lib/ffmpeg_content.cc:626
+#: src/lib/ffmpeg_content.cc:575 src/lib/ffmpeg_content.cc:604
+#: src/lib/ffmpeg_content.cc:629
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:613
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:611
+#: src/lib/ffmpeg_content.cc:614
 msgid "SMPTE ST 428-1"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:575
+#: src/lib/ffmpeg_content.cc:578
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:579
 msgid "SMPTE ST 431-2 (2011)"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:577
+#: src/lib/ffmpeg_content.cc:580
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr ""
 
@@ -1088,7 +1080,7 @@ msgstr ""
 msgid "SSH error (%1)"
 msgstr ""
 
-#: src/lib/util.cc:859
+#: src/lib/util.cc:873
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -1119,13 +1111,13 @@ msgid ""
 "These files will now be re-examined, so you may need to check their settings."
 msgstr ""
 
-#: src/lib/hints.cc:310
+#: src/lib/hints.cc:313
 msgid ""
 "Some of your closed captions have lines longer than %1 characters, so they "
 "will probably be word-wrapped."
 msgstr ""
 
-#: src/lib/hints.cc:316
+#: src/lib/hints.cc:319
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
@@ -1151,7 +1143,7 @@ msgstr ""
 msgid "Stereo to 5.1 up-mixer B"
 msgstr ""
 
-#: src/lib/util.cc:847
+#: src/lib/util.cc:861
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -1201,7 +1193,7 @@ msgstr ""
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr ""
 
-#: src/lib/hints.cc:203
+#: src/lib/hints.cc:206
 msgid ""
 "There is a large difference between the frame rate of your DCP and that of "
 "some of your content.  This will cause your audio to play back at a much "
@@ -1240,7 +1232,7 @@ msgid ""
 "create a new Film, re-add your content and set it up again.  Sorry!"
 msgstr ""
 
-#: src/lib/util.cc:855
+#: src/lib/util.cc:869
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -1260,7 +1252,7 @@ msgstr ""
 msgid "Transitional"
 msgstr ""
 
-#: src/lib/util.cc:851
+#: src/lib/util.cc:865
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -1284,11 +1276,11 @@ msgstr ""
 msgid "Unsharp mask and Gaussian blur"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:523 src/lib/ffmpeg_content.cc:547
-#: src/lib/ffmpeg_content.cc:565 src/lib/ffmpeg_content.cc:567
-#: src/lib/ffmpeg_content.cc:568 src/lib/ffmpeg_content.cc:594
-#: src/lib/ffmpeg_content.cc:596 src/lib/ffmpeg_content.cc:597
-#: src/lib/ffmpeg_content.cc:621 src/lib/ffmpeg_content.cc:622
+#: src/lib/ffmpeg_content.cc:526 src/lib/ffmpeg_content.cc:550
+#: src/lib/ffmpeg_content.cc:568 src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:597
+#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:600
+#: src/lib/ffmpeg_content.cc:624 src/lib/ffmpeg_content.cc:625
 msgid "Unspecified"
 msgstr ""
 
@@ -1296,7 +1288,7 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: src/lib/util.cc:529 src/lib/util.cc:530
+#: src/lib/util.cc:543 src/lib/util.cc:544
 msgid "Unused"
 msgstr ""
 
@@ -1308,7 +1300,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/util.cc:553
+#: src/lib/util.cc:567
 msgid "VI"
 msgstr ""
 
@@ -1320,7 +1312,7 @@ msgstr ""
 msgid "Vertical flip"
 msgstr ""
 
-#: src/lib/util.cc:522
+#: src/lib/util.cc:536
 msgid "Visually impaired"
 msgstr ""
 
@@ -1332,11 +1324,11 @@ msgstr ""
 msgid "Weave filter"
 msgstr ""
 
-#: src/lib/util.cc:853
+#: src/lib/util.cc:867
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: src/lib/ffmpeg_content.cc:627
+#: src/lib/ffmpeg_content.cc:630
 msgid "YCOCG"
 msgstr ""
 
@@ -1344,29 +1336,29 @@ msgstr ""
 msgid "Yet Another Deinterlacing Filter"
 msgstr ""
 
-#: src/lib/hints.cc:179
+#: src/lib/hints.cc:181
+#, c-format
 msgid ""
-"You are set up for a DCP at a frame rate of %1.  This frame rate is not "
+"You are set up for a DCP at a frame rate of %1fps.  This frame rate is not "
 "supported by all projectors.  You are advised to change the DCP frame rate "
-"to %2."
+"to %2fps."
 msgstr ""
 
-#: src/lib/hints.cc:172
+#: src/lib/hints.cc:165
+#, c-format
 msgid ""
-"You are set up for an Interop DCP at a frame rate which is not officially "
-"supported.  You are advised either to change the frame rate of your DCP or "
-"to make a SMPTE DCP instead (although SMPTE DCPs are not supported by all "
-"projectors)."
+"You are set up for a DCP at a frame rate of %1fps.  This frame rate is not "
+"supported by all projectors.  You may want to consider changing your frame "
+"rate to %2fps."
 msgstr ""
 
-#: src/lib/hints.cc:159
+#: src/lib/hints.cc:175
 msgid ""
-"You are set up for an Interop DCP at a frame rate which is not officially "
-"supported.  You are advised either to change the frame rate of your DCP or "
-"to make a SMPTE DCP instead."
+"You are set up for a DCP frame rate of 30fps, which is not supported by all "
+"projectors.  Be aware that you may have compatibility problems."
 msgstr ""
 
-#: src/lib/hints.cc:225
+#: src/lib/hints.cc:228
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1379,13 +1371,13 @@ msgid ""
 "resulting DCP in a cinema to make sure that it sounds good."
 msgstr ""
 
-#: src/lib/hints.cc:214
+#: src/lib/hints.cc:217
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
 
-#: src/lib/hints.cc:322
+#: src/lib/hints.cc:325
 msgid "You have overlapping closed captions, which are not allowed."
 msgstr ""
 
@@ -1411,7 +1403,7 @@ msgid ""
 "projectors.  If possible, use Flat or Scope for the DCP container ratio"
 msgstr ""
 
-#: src/lib/hints.cc:250
+#: src/lib/hints.cc:253
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
@@ -1520,7 +1512,7 @@ msgid "frames per second"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:179
+#: src/lib/util.cc:182
 msgid "h"
 msgstr ""
 
@@ -1592,7 +1584,7 @@ msgid "its video frame size differs from the film's."
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:188
+#: src/lib/util.cc:191
 msgid "m"
 msgstr ""
 
@@ -1605,7 +1597,7 @@ msgid "name"
 msgstr ""
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:198
+#: src/lib/util.cc:201
 msgid "s"
 msgstr ""