pot/merge.

1 files changed, 57 insertions, 49 deletions

diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 8c64d5ed5..40f122daa 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/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: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
 "PO-Revision-Date: 2021-03-22 02:21+0100\n"
 "Last-Translator: Mattias Mattsson <vitplister@gmail.com>\n"
 "Language-Team: \n"
@@ -31,11 +31,11 @@ msgstr "%d KDM:er skrivna till %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Lägg till film...\tCtrl-A"
 
-#: src/tools/dcpomatic_player.cc:507
+#: src/tools/dcpomatic_player.cc:517
 msgid "&Add OV..."
 msgstr "&Lägg till OV..."
 
-#: src/tools/dcpomatic_player.cc:513
+#: src/tools/dcpomatic_player.cc:523
 msgid "&Close"
 msgstr "&Stäng"
 
@@ -44,25 +44,25 @@ msgid "&Close\tCtrl-W"
 msgstr "&Stäng\tCtrl-W"
 
 #: src/tools/dcpomatic.cc:1395 src/tools/dcpomatic_batch.cc:93
-#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:565
+#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:575
 #: src/tools/dcpomatic_playlist.cc:547
 msgid "&Edit"
 msgstr "&Redigera"
 
 #: src/tools/dcpomatic.cc:1331 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:517
+#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:527
 #: src/tools/dcpomatic_playlist.cc:528
 msgid "&Exit"
 msgstr "&Avsluta"
 
 #: src/tools/dcpomatic.cc:1394 src/tools/dcpomatic_batch.cc:91
-#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:563
+#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:573
 #: src/tools/dcpomatic_playlist.cc:545
 msgid "&File"
 msgstr "&Arkiv"
 
 #: src/tools/dcpomatic.cc:1399 src/tools/dcpomatic_batch.cc:96
-#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:569
+#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:579
 #: src/tools/dcpomatic_playlist.cc:549
 msgid "&Help"
 msgstr "&Hjälp"
@@ -75,20 +75,20 @@ msgstr "&Jobb"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Gör DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:506
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:516
 msgid "&Open...\tCtrl-O"
 msgstr "&Öppna...\tCtrl-O"
 
 #: src/tools/dcpomatic.cc:1343 src/tools/dcpomatic.cc:1346
 #: src/tools/dcpomatic_batch.cc:79 src/tools/dcpomatic_batch.cc:82
 #: src/tools/dcpomatic_kdm.cc:250 src/tools/dcpomatic_kdm.cc:253
-#: src/tools/dcpomatic_player.cc:523 src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_player.cc:533 src/tools/dcpomatic_player.cc:536
 #: src/tools/dcpomatic_playlist.cc:535
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Inställningar...\tCtrl-P"
 
 #: src/tools/dcpomatic.cc:1333 src/tools/dcpomatic_batch.cc:75
-#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:519
+#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:529
 #: src/tools/dcpomatic_playlist.cc:530
 msgid "&Quit"
 msgstr "&Avsluta"
@@ -102,11 +102,11 @@ msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
 #: src/tools/dcpomatic.cc:1398 src/tools/dcpomatic_batch.cc:95
-#: src/tools/dcpomatic_player.cc:568
+#: src/tools/dcpomatic_player.cc:578
 msgid "&Tools"
 msgstr "&Verktyg"
 
-#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_player.cc:567
+#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_player.cc:577
 msgid "&View"
 msgstr "&Visa"
 
@@ -119,13 +119,13 @@ msgid "<b>Playlists</b>"
 msgstr "<b>Playlistor</b>"
 
 #: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_batch.cc:89
-#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:559
+#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:569
 #: src/tools/dcpomatic_playlist.cc:542
 msgid "About"
 msgstr "Om"
 
 #: src/tools/dcpomatic.cc:1388 src/tools/dcpomatic_kdm.cc:258
-#: src/tools/dcpomatic_player.cc:557 src/tools/dcpomatic_playlist.cc:540
+#: src/tools/dcpomatic_player.cc:567 src/tools/dcpomatic_playlist.cc:540
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -133,7 +133,7 @@ msgstr "Om DCP-o-matic"
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/tools/dcpomatic_player.cc:508
+#: src/tools/dcpomatic_player.cc:518
 msgid "Add &KDM..."
 msgstr "&Lägg till KDM..."
 
@@ -154,7 +154,7 @@ msgid "Add..."
 msgstr "Lägg till..."
 
 #: src/tools/dcpomatic.cc:1731 src/tools/dcpomatic_kdm.cc:704
-#: src/tools/dcpomatic_player.cc:1202 src/tools/dcpomatic_playlist.cc:652
+#: src/tools/dcpomatic_player.cc:1212 src/tools/dcpomatic_playlist.cc:652
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -173,7 +173,7 @@ msgstr ""
 "\n"
 
 #: src/tools/dcpomatic.cc:1750 src/tools/dcpomatic_kdm.cc:713
-#: src/tools/dcpomatic_player.cc:1211 src/tools/dcpomatic_playlist.cc:661
+#: src/tools/dcpomatic_player.cc:1221 src/tools/dcpomatic_playlist.cc:661
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -188,7 +188,7 @@ msgstr "Ett okänt fel har inträffat i DCP-o-matic servern."
 
 #: src/tools/dcpomatic.cc:964 src/tools/dcpomatic.cc:1755
 #: src/tools/dcpomatic_kdm.cc:403 src/tools/dcpomatic_kdm.cc:718
-#: src/tools/dcpomatic_kdm.cc:727 src/tools/dcpomatic_player.cc:1216
+#: src/tools/dcpomatic_kdm.cc:727 src/tools/dcpomatic_player.cc:1226
 #: src/tools/dcpomatic_playlist.cc:666 src/tools/dcpomatic_playlist.cc:675
 msgid "An unknown exception occurred."
 msgstr "Ett okänt fel inträffade."
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Bad setting for %s."
 msgstr "Felaktig inställning för %s."
 
-#: src/tools/dcpomatic_player.cc:535 src/tools/dcpomatic_playlist.cc:271
+#: src/tools/dcpomatic_player.cc:545 src/tools/dcpomatic_playlist.cc:271
 msgid "CPL"
 msgstr "CPL"
 
@@ -214,7 +214,7 @@ msgstr "CPL"
 msgid "CPL's content is not encrypted."
 msgstr "CPL:ens innehåll är inte krypterat."
 
-#: src/tools/dcpomatic.cc:1380 src/tools/dcpomatic_player.cc:551
+#: src/tools/dcpomatic.cc:1380 src/tools/dcpomatic_player.cc:561
 msgid "Check for updates"
 msgstr "Leta efter uppdateringar"
 
@@ -226,7 +226,7 @@ msgstr "Avsluta DCP-o-matic"
 msgid "Close without saving film"
 msgstr "Avsluta utan att spara film"
 
-#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:541
+#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:551
 msgid "Closed captions..."
 msgstr "Dolda undertexter…"
 
@@ -253,11 +253,11 @@ msgstr "Kunde inte hitta DCP-o-matic batchkonverterare."
 msgid "Could not find player."
 msgstr "Kunde inte hitta DCP-o-matic Player."
 
-#: src/tools/dcpomatic_player.cc:678 src/tools/dcpomatic_player.cc:1141
+#: src/tools/dcpomatic_player.cc:688 src/tools/dcpomatic_player.cc:1151
 msgid "Could not load DCP %1."
 msgstr "Kunde inte ladda DCP %1."
 
-#: src/tools/dcpomatic_player.cc:496
+#: src/tools/dcpomatic_player.cc:506
 #, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -268,11 +268,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/tools/dcpomatic_player.cc:660
+#: src/tools/dcpomatic_player.cc:670
 msgid "Could not load KDM."
 msgstr "Kunde inte ladda KDM."
 
-#: src/tools/dcpomatic_player.cc:365 src/tools/dcpomatic_player.cc:367
+#: src/tools/dcpomatic_player.cc:368 src/tools/dcpomatic_player.cc:375
+#: src/tools/dcpomatic_player.cc:377
 #, c-format
 msgid "Could not load a DCP from %s"
 msgstr "Kunde inte ladda DCP från %s"
@@ -354,7 +355,7 @@ msgstr ""
 "Kunde inte skriva till biograffilen i %s. Dina ändringar har inte sparats."
 
 #: src/tools/dcpomatic.cc:1424 src/tools/dcpomatic_batch.cc:336
-#: src/tools/dcpomatic_player.cc:899 src/tools/dcpomatic_playlist.cc:561
+#: src/tools/dcpomatic_player.cc:909 src/tools/dcpomatic_playlist.cc:561
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -362,7 +363,7 @@ msgstr ""
 "Kunde inte skriva till inställningsfilen i %s. Dina ändringar har inte "
 "sparats."
 
-#: src/tools/dcpomatic_player.cc:907
+#: src/tools/dcpomatic_player.cc:917
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 "Kunde inte skriva till inställningsfilen i %s. Dina ändringar har inte "
@@ -389,13 +390,13 @@ msgstr "DCP-o-matic Encode Server"
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM-skapare"
 
-#: src/tools/dcpomatic_player.cc:140 src/tools/dcpomatic_player.cc:359
-#: src/tools/dcpomatic_player.cc:625 src/tools/dcpomatic_player.cc:811
-#: src/tools/dcpomatic_player.cc:1089
+#: src/tools/dcpomatic_player.cc:140 src/tools/dcpomatic_player.cc:360
+#: src/tools/dcpomatic_player.cc:635 src/tools/dcpomatic_player.cc:821
+#: src/tools/dcpomatic_player.cc:1099
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic Spelare"
 
-#: src/tools/dcpomatic_player.cc:1164
+#: src/tools/dcpomatic_player.cc:1174
 msgid "DCP-o-matic Player could not start."
 msgstr "DCP-o-matic Player kunde inte starta."
 
@@ -411,15 +412,15 @@ msgstr "DCP-o-matic kunde inte starta"
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic_player.cc:544
+#: src/tools/dcpomatic_player.cc:554
 msgid "Decode at full resolution"
 msgstr "Avkoda i full upplösning"
 
-#: src/tools/dcpomatic_player.cc:545
+#: src/tools/dcpomatic_player.cc:555
 msgid "Decode at half resolution"
 msgstr "Avkoda i halv upplösning"
 
-#: src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic_player.cc:556
 msgid "Decode at quarter resolution"
 msgstr "Avkoda i kvarts upplösning"
 
@@ -448,7 +449,7 @@ msgstr "Gör ingen kopia"
 msgid "Down"
 msgstr "Ner"
 
-#: src/tools/dcpomatic_player.cc:538
+#: src/tools/dcpomatic_player.cc:548
 msgid "Dual screen\tShift+F11"
 msgstr "Delad skärm\tShift+F11"
 
@@ -503,7 +504,7 @@ msgstr "Film ändrad"
 msgid "Frames per second"
 msgstr "Bilder per sekund"
 
-#: src/tools/dcpomatic_player.cc:537
+#: src/tools/dcpomatic_player.cc:547
 msgid "Full screen\tF11"
 msgstr "Fullskärm\tF11"
 
@@ -531,7 +532,7 @@ msgstr "Tajming"
 msgid "Length"
 msgstr "Speltid"
 
-#: src/tools/dcpomatic_player.cc:359 src/tools/dcpomatic_player.cc:625
+#: src/tools/dcpomatic_player.cc:360 src/tools/dcpomatic_player.cc:635
 msgid "Loading content"
 msgstr "Laddar källmaterial"
 
@@ -627,7 +628,7 @@ msgid "Remove"
 msgstr "Ta bort"
 
 #: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_kdm.cc:262
-#: src/tools/dcpomatic_player.cc:561
+#: src/tools/dcpomatic_player.cc:571
 msgid "Report a problem..."
 msgstr "Rapportera ett problem..."
 
@@ -677,11 +678,11 @@ msgstr "Spara film och duplicera"
 msgid "Screens"
 msgstr "Salonger"
 
-#: src/tools/dcpomatic_player.cc:579
+#: src/tools/dcpomatic_player.cc:589
 msgid "Select DCP to open"
 msgstr "Välj DCP att öppna"
 
-#: src/tools/dcpomatic_player.cc:604
+#: src/tools/dcpomatic_player.cc:614
 msgid "Select DCP to open as OV"
 msgstr "Välj DCP att öppna som OV"
 
@@ -693,7 +694,7 @@ msgstr "Välj DKDM-fil"
 msgid "Select DKDM file"
 msgstr "Välj DKDM-fil"
 
-#: src/tools/dcpomatic_player.cc:646
+#: src/tools/dcpomatic_player.cc:656
 msgid "Select KDM"
 msgstr "Välj KDM"
 
@@ -713,11 +714,11 @@ msgstr "Skicka KDM-epost"
 msgid "Send translations..."
 msgstr "Skicka översättningar…"
 
-#: src/tools/dcpomatic_player.cc:543
+#: src/tools/dcpomatic_player.cc:553
 msgid "Set decode resolution to match display"
 msgstr "Sätt avkodningsupplösning att matcha bildskärmen"
 
-#: src/tools/dcpomatic.cc:1382 src/tools/dcpomatic_player.cc:553
+#: src/tools/dcpomatic.cc:1382 src/tools/dcpomatic_player.cc:563
 msgid "System information..."
 msgstr "Systeminformation..."
 
@@ -743,7 +744,7 @@ msgstr ""
 "Den färdiga DCP:n för denna film kommer att uppta ungefär %.1f GB. Disken du "
 "använder har bara %.1f GB ledigt. Vill du fortsätta ändå?"
 
-#: src/tools/dcpomatic.cc:1486 src/tools/dcpomatic_player.cc:881
+#: src/tools/dcpomatic.cc:1486 src/tools/dcpomatic_player.cc:891
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
@@ -811,7 +812,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:1797 src/tools/dcpomatic_batch.cc:481
 #: src/tools/dcpomatic_kdm.cc:737 src/tools/dcpomatic_server.cc:353
-#: src/tools/dcpomatic_player.cc:1240
+#: src/tools/dcpomatic_player.cc:1250
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -819,7 +820,7 @@ msgstr ""
 "De nuvaranda inställningarna kan inte laddas. Standardvärden kommer att "
 "används istället. Dessa kan ta en kort stund att återskapa."
 
-#: src/tools/dcpomatic.cc:1488 src/tools/dcpomatic_player.cc:883
+#: src/tools/dcpomatic.cc:1488 src/tools/dcpomatic_player.cc:893
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Det finns inga nya versioner av DCP-o-matic tillgängliga."
 
@@ -835,7 +836,14 @@ msgstr ""
 "Denna film skapades i en gammal version av DVD-o-matic och läses kanske in "
 "felaktigt i denna version. Kontrollera alla inställningarn noggrant."
 
-#: src/tools/dcpomatic_player.cc:552
+#: src/tools/dcpomatic_player.cc:370
+msgid ""
+"This looks like a DCP-o-matic project folder, which cannot be loaded into "
+"the player.  Choose the DCP directory inside the DCP-o-matic project folder "
+"if that's what you want to play."
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:562
 msgid "Timing..."
 msgstr "Tajming…"
 
@@ -856,7 +864,7 @@ msgstr "Oavslutade jobb"
 msgid "Up"
 msgstr "Upp"
 
-#: src/tools/dcpomatic_player.cc:549
+#: src/tools/dcpomatic_player.cc:559
 #, fuzzy
 msgid "Verify DCP..."
 msgstr "Verifiera DCP"
@@ -922,7 +930,7 @@ msgstr ""
 "matic."
 
 #: src/tools/dcpomatic.cc:586 src/tools/dcpomatic_batch.cc:299
-#: src/tools/dcpomatic_player.cc:585 src/tools/dcpomatic_player.cc:613
+#: src/tools/dcpomatic_player.cc:595 src/tools/dcpomatic_player.cc:623
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."