pot/merge.

1 files changed, 98 insertions, 91 deletions

diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 1a401036e..0ce698924 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: 2017-02-15 11:18+0000\n"
+"POT-Creation-Date: 2017-04-27 11:57+0100\n"
 "PO-Revision-Date: 2016-10-25 17:57+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -66,7 +66,7 @@ msgstr " (%.2f:1)"
 
 #. / TRANSLATORS: the %1 in this string will be filled in with a day of the week
 #. / to say what day a job will finish.
-#: src/lib/job.cc:430
+#: src/lib/job.cc:432
 msgid " on %1"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ", pixlars höjd/bredd-förhållande %.2f:1"
 msgid "1.19"
 msgstr "1,19"
 
-#: src/lib/ratio.cc:39
+#: src/lib/ratio.cc:40
 msgid "1.66"
 msgstr "1,66"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:41
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:43
 msgid "2.35"
 msgstr "2,35"
 
@@ -120,12 +120,12 @@ msgid "4:3"
 msgstr "4:3"
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:125
+#: src/lib/transcode_job.cc:124
 #, c-format
 msgid "; %.1f fps"
 msgstr "; %.1f bps"
 
-#: src/lib/job.cc:435
+#: src/lib/job.cc:437
 msgid "; %1 remaining; finishing at %2%3"
 msgstr ""
 
@@ -139,7 +139,7 @@ msgstr ""
 "bandbredd. Det är en god idé att sänka JPEG2000-bandbredden till ungefär "
 "200Mbit/s; det ger troligen ingen synbar minskning på bildkvaliteten."
 
-#: src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:525
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 ('Hybrid log-gamma')"
 
@@ -195,48 +195,48 @@ msgstr "Audio kommer att samplas om till %1kHz"
 msgid "Audio will not be resampled"
 msgstr "Audio kommer inte att samplas om"
 
-#: src/lib/ffmpeg_content.cc:541
+#: src/lib/ffmpeg_content.cc:519
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361 utökat färgomfång"
 
-#: src/lib/ffmpeg_content.cc:519
+#: src/lib/ffmpeg_content.cc:497
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:564
+#: src/lib/ffmpeg_content.cc:542
 msgid "BT2020 constant luminance"
 msgstr "BT2020 konstant luminans"
 
-#: src/lib/ffmpeg_content.cc:543
+#: src/lib/ffmpeg_content.cc:521
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 för ett 10-bitars system"
 
-#: src/lib/ffmpeg_content.cc:544
+#: src/lib/ffmpeg_content.cc:522
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 för ett 12-bitars system"
 
-#: src/lib/ffmpeg_content.cc:563
+#: src/lib/ffmpeg_content.cc:541
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 icke-konstant luminans"
 
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:493
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:559
+#: src/lib/ffmpeg_content.cc:537
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:492
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:511 src/lib/ffmpeg_content.cc:530
-#: src/lib/ffmpeg_content.cc:555
+#: src/lib/ffmpeg_content.cc:489 src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:533
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:572
+#: src/lib/ffmpeg_content.cc:550
 msgid "Bits per pixel"
 msgstr "Bitar per pixel"
 
@@ -252,7 +252,7 @@ msgstr "BsH"
 msgid "C"
 msgstr "C"
 
-#: src/lib/job.cc:444
+#: src/lib/job.cc:446
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -272,7 +272,7 @@ msgstr "Kanaler"
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/ffmpeg_content.cc:526
+#: src/lib/ffmpeg_content.cc:504
 msgid "Colour primaries"
 msgstr "Grundläggande färger"
 
@@ -286,17 +286,17 @@ msgstr "Grundläggande färger"
 #. / 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:468 src/lib/ffmpeg_content.cc:475
-#: src/lib/ffmpeg_content.cc:482 src/lib/ffmpeg_content.cc:492
-#: src/lib/ffmpeg_content.cc:497 src/lib/ffmpeg_content.cc:502
+#: src/lib/ffmpeg_content.cc:446 src/lib/ffmpeg_content.cc:453
+#: src/lib/ffmpeg_content.cc:460 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:475 src/lib/ffmpeg_content.cc:480
 msgid "Colour range"
 msgstr "Färgomfång"
 
-#: src/lib/ffmpeg_content.cc:551
+#: src/lib/ffmpeg_content.cc:529
 msgid "Colour transfer characteristic"
 msgstr "Färgöversättningskarakteristik"
 
-#: src/lib/ffmpeg_content.cc:569
+#: src/lib/ffmpeg_content.cc:547
 msgid "Colourspace"
 msgstr "Färgrymd"
 
@@ -304,7 +304,7 @@ msgstr "Färgrymd"
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:485
 msgid "Computing digests"
 msgstr "Beräknar sammanfattning"
 
@@ -444,7 +444,7 @@ msgstr "Kunde inte avkoda JPEG2000-fil %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "Kunde inte avkoda bildfil (%1)"
 
-#: src/lib/ffmpeg_examiner.cc:370
+#: src/lib/ffmpeg_examiner.cc:267
 msgid "Could not find pixel format for video."
 msgstr "Kunde inte hitta information om pixel-formatet för videon."
 
@@ -533,7 +533,7 @@ msgstr "DCP-o-matic stödjer inte längre '%1'-filter, så det har stängts av."
 msgid "De-interlacing"
 msgstr "Avflätning"
 
-#: src/lib/config.cc:551
+#: src/lib/config.cc:580
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -576,23 +576,23 @@ msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr ""
 "Varje bild från källan kommer att användas ytterligare %1 gång(er) i DCPn.\n"
 
-#: src/lib/send_kdm_email_job.cc:56
+#: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"
 msgstr "E-posta KDM:er"
 
-#: src/lib/send_kdm_email_job.cc:59
+#: src/lib/send_kdm_email_job.cc:64
 msgid "Email KDMs for %1"
 msgstr "E-posta KDM:er för %1"
 
-#: src/lib/send_problem_report_job.cc:55
+#: src/lib/send_problem_report_job.cc:59
 msgid "Email problem report"
 msgstr "E-posta problemrapport"
 
-#: src/lib/send_problem_report_job.cc:58
+#: src/lib/send_problem_report_job.cc:62
 msgid "Email problem report for %1"
 msgstr "E-posta problemrapport för %1"
 
-#: src/lib/transcoder.cc:77
+#: src/lib/transcoder.cc:86
 msgid "Encoding"
 msgstr ""
 
@@ -600,7 +600,7 @@ msgstr ""
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "Fel i undertext-filen: såg %1 men förväntade %2"
 
-#: src/lib/job.cc:442
+#: src/lib/job.cc:444
 msgid "Error: %1"
 msgstr "Fel: %1"
 
@@ -608,7 +608,7 @@ msgstr "Fel: %1"
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/ffmpeg_content.cc:558
+#: src/lib/ffmpeg_content.cc:536
 msgid "FCC"
 msgstr "FCC"
 
@@ -628,23 +628,15 @@ msgstr "Feature"
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/lib/ffmpeg_content.cc:518
+#: src/lib/ffmpeg_content.cc:496
 msgid "Film"
 msgstr "Film"
 
-#: src/lib/ffmpeg_examiner.cc:100
+#: src/lib/ffmpeg_examiner.cc:95
 msgid "Finding length"
 msgstr "Söker längd"
 
-#: src/lib/ffmpeg_examiner.cc:96
-msgid "Finding length and subtitles"
-msgstr "Söker längd och undertexter"
-
-#: src/lib/ffmpeg_examiner.cc:98
-msgid "Finding subtitles"
-msgstr "Letar undertexter"
-
-#: src/lib/ratio.cc:41
+#: src/lib/ratio.cc:42
 msgid "Flat"
 msgstr "Flat"
 
@@ -653,16 +645,16 @@ msgid "Frame rate"
 msgstr "Bildhastighet"
 
 # Sammanhang?
-#: src/lib/ffmpeg_content.cc:502
+#: src/lib/ffmpeg_content.cc:480
 msgid "Full"
 msgstr "Full"
 
 # Sammanhang?
-#: src/lib/ffmpeg_content.cc:482
+#: src/lib/ffmpeg_content.cc:460
 msgid "Full (0-%1)"
 msgstr "Full (0-%1)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:45
 msgid "Full frame"
 msgstr "Full frame"
 
@@ -682,11 +674,11 @@ msgstr "Full längd i bilder med DCP-hastighet"
 msgid "Full length in video frames at content rate"
 msgstr "Full längd i bilder med innehållets hastighet"
 
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:511
 msgid "Gamma 22 (BT470M)"
 msgstr "Gamma 22 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:534
+#: src/lib/ffmpeg_content.cc:512
 msgid "Gamma 28 (BT470BG)"
 msgstr "Gamma 28 (BT470BG)"
 
@@ -711,19 +703,23 @@ msgstr "Högkvalitets 3D-brusreducering"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/lib/ffmpeg_content.cc:542
+#: src/lib/ffmpeg_content.cc:520
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB eller sYCC)"
 
-#: src/lib/ffmpeg_content.cc:540
+#: src/lib/ffmpeg_content.cc:518
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
+#: src/lib/ratio.cc:39
+msgid "IMAX"
+msgstr ""
+
 #: src/lib/job.cc:144 src/lib/job.cc:176 src/lib/job.cc:186
 msgid "It is not known what caused this error."
 msgstr "Det är inte känt vad som orsakade detta fel."
 
-#: src/lib/config.cc:243 src/lib/config.cc:548
+#: src/lib/config.cc:254 src/lib/config.cc:577
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM-leverans: $CPL_NAME"
 
@@ -767,23 +763,23 @@ msgstr "Lfe"
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/ffmpeg_content.cc:497
+#: src/lib/ffmpeg_content.cc:475
 msgid "Limited"
 msgstr "Begränsad"
 
-#: src/lib/ffmpeg_content.cc:475
+#: src/lib/ffmpeg_content.cc:453
 msgid "Limited (%1-%2)"
 msgstr "Begränsad (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:537
+#: src/lib/ffmpeg_content.cc:515
 msgid "Linear"
 msgstr "Linjär"
 
-#: src/lib/ffmpeg_content.cc:538
+#: src/lib/ffmpeg_content.cc:516
 msgid "Logarithmic (100:1 range)"
 msgstr "Logaritmisk (100:1 omfång)"
 
-#: src/lib/ffmpeg_content.cc:539
+#: src/lib/ffmpeg_content.cc:517
 msgid "Logarithmic (316:1 range)"
 msgstr "Logaritmisk (316:1 omfång)"
 
@@ -819,7 +815,7 @@ msgstr "Icke-passande videostorlekar i DCP:n"
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/cinema_kdms.cc:151
+#: src/lib/cinema_kdms.cc:199
 msgid "No mail server configured in preferences"
 msgstr "Ingen epostserver har konfigurerats i inställningar"
 
@@ -839,7 +835,7 @@ msgstr "Inga giltiga bildfiler hittades i foldern."
 msgid "Noise reduction"
 msgstr "Brusreducering"
 
-#: src/lib/job.cc:440
+#: src/lib/job.cc:442
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
@@ -872,7 +868,7 @@ msgstr "Policy"
 msgid "Prepared for video frame rate"
 msgstr "Förberedd för videobildshastighet"
 
-#: src/lib/exceptions.cc:79
+#: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2"
 msgstr "Programmeringsfel vid %1:%2"
 
@@ -884,7 +880,7 @@ msgstr "Public Service Announcement"
 msgid "R"
 msgstr "H"
 
-#: src/lib/ffmpeg_content.cc:554
+#: src/lib/ffmpeg_content.cc:532
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
@@ -936,41 +932,41 @@ msgstr "Hs"
 msgid "S-Gamut3/S-Log3"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:516 src/lib/ffmpeg_content.cc:535
+#: src/lib/ffmpeg_content.cc:494 src/lib/ffmpeg_content.cc:513
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:560
+#: src/lib/ffmpeg_content.cc:538
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:565
+#: src/lib/ffmpeg_content.cc:543
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:517 src/lib/ffmpeg_content.cc:536
-#: src/lib/ffmpeg_content.cc:561
+#: src/lib/ffmpeg_content.cc:495 src/lib/ffmpeg_content.cc:514
+#: src/lib/ffmpeg_content.cc:539
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:545
+#: src/lib/ffmpeg_content.cc:523
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr "SMPTE ST 2084 för 10-, 12-, 14- och 16-bitars system"
 
-#: src/lib/ffmpeg_content.cc:546
+#: src/lib/ffmpeg_content.cc:524
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:520
+#: src/lib/ffmpeg_content.cc:498
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
-#: src/lib/ffmpeg_content.cc:521
+#: src/lib/ffmpeg_content.cc:499
 #, fuzzy
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:522
+#: src/lib/ffmpeg_content.cc:500
 #, fuzzy
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 428-1"
@@ -979,11 +975,11 @@ msgstr "SMPTE ST 428-1"
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:44
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/send_problem_report_job.cc:70
+#: src/lib/send_problem_report_job.cc:74
 msgid "Sending email"
 msgstr "Skickar e-post"
 
@@ -1023,7 +1019,7 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Undertexter"
 
-#: src/lib/film.cc:1560
+#: src/lib/film.cc:1559
 msgid ""
 "The DCP %1 was being referred to by this film.  This not now possible "
 "because the reel sizes in the film no longer agree with those in the "
@@ -1056,6 +1052,11 @@ msgstr "DCP:n har inte undertexter i alla rullar."
 msgid "The certificate chain for signing is invalid"
 msgstr "Certifikatkedjan för att signera är ogiltigt"
 
+#: src/lib/exceptions.cc:79
+#, fuzzy
+msgid "The certificate chain for signing is invalid (%1)"
+msgstr "Certifikatkedjan för att signera är ogiltigt"
+
 #: src/lib/job.cc:108
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
@@ -1132,7 +1133,7 @@ msgstr ""
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/lib/transcode_job.cc:58
+#: src/lib/transcode_job.cc:57
 msgid "Transcode %1"
 msgstr "Konvertera %1"
 
@@ -1152,7 +1153,7 @@ msgstr "Oväntad bildtyp mottogs av server"
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/lib/ffmpeg_decoder.cc:289
+#: src/lib/ffmpeg_decoder.cc:281
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt ljudformat (%1)"
 
@@ -1160,11 +1161,11 @@ msgstr "Okänt ljudformat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
-#: src/lib/ffmpeg_content.cc:468 src/lib/ffmpeg_content.cc:492
-#: src/lib/ffmpeg_content.cc:510 src/lib/ffmpeg_content.cc:512
-#: src/lib/ffmpeg_content.cc:513 src/lib/ffmpeg_content.cc:529
-#: src/lib/ffmpeg_content.cc:531 src/lib/ffmpeg_content.cc:532
-#: src/lib/ffmpeg_content.cc:556 src/lib/ffmpeg_content.cc:557
+#: src/lib/ffmpeg_content.cc:446 src/lib/ffmpeg_content.cc:470
+#: src/lib/ffmpeg_content.cc:488 src/lib/ffmpeg_content.cc:490
+#: src/lib/ffmpeg_content.cc:491 src/lib/ffmpeg_content.cc:507
+#: src/lib/ffmpeg_content.cc:509 src/lib/ffmpeg_content.cc:510
+#: src/lib/ffmpeg_content.cc:534 src/lib/ffmpeg_content.cc:535
 msgid "Unspecified"
 msgstr "Ospecificerad"
 
@@ -1197,7 +1198,7 @@ msgstr "Synskadade"
 msgid "Waiting"
 msgstr "Väntar"
 
-#: src/lib/ffmpeg_content.cc:562
+#: src/lib/ffmpeg_content.cc:540
 msgid "YCOCG"
 msgstr "YCOCG"
 
@@ -1286,7 +1287,7 @@ msgstr "[undertexter]"
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
-#: src/lib/dcpomatic_socket.cc:68
+#: src/lib/dcpomatic_socket.cc:69
 msgid "connect timed out"
 msgstr "uppkopplingen tog för lång tid"
 
@@ -1338,15 +1339,15 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/dcpomatic_socket.cc:64
+#: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/dcpomatic_socket.cc:117
+#: src/lib/dcpomatic_socket.cc:118
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/dcpomatic_socket.cc:89
+#: src/lib/dcpomatic_socket.cc:90
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
@@ -1402,7 +1403,7 @@ msgstr ""
 msgid "still"
 msgstr "stillbild"
 
-#: src/lib/ffmpeg_examiner.cc:337
+#: src/lib/ffmpeg_examiner.cc:234
 msgid "unknown"
 msgstr "okänd"
 
@@ -1415,6 +1416,12 @@ msgstr "bildrutor"
 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"
 
+#~ msgid "Finding length and subtitles"
+#~ msgstr "Söker längd och undertexter"
+
+#~ msgid "Finding subtitles"
+#~ msgstr "Letar undertexter"
+
 #~ msgid "Encoding picture and sound"
 #~ msgstr "Kodar bild och ljud"