pot/merge.

1 files changed, 57 insertions, 49 deletions

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 73a30085a..e0fd19d42 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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: 2019-03-26 14:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic <carl@dcpomatic.com>\n"
@@ -32,11 +32,11 @@ msgstr "%d KDMs geschrieben nach %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Projekt hinzufügen...\tCtrl-A"
 
-#: src/tools/dcpomatic_player.cc:507
+#: src/tools/dcpomatic_player.cc:517
 msgid "&Add OV..."
 msgstr "&OV zu geladenem VF hinzufügen..."
 
-#: src/tools/dcpomatic_player.cc:513
+#: src/tools/dcpomatic_player.cc:523
 msgid "&Close"
 msgstr "&Schließen"
 
@@ -45,25 +45,25 @@ msgid "&Close\tCtrl-W"
 msgstr "&Schließen\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 "&Bearbeiten"
 
 #: 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 "&Ende"
 
 #: 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 "&Datei"
 
 #: 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 "&Hilfe"
@@ -76,20 +76,20 @@ msgstr "&Aufgaben"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&DCP erstellen\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 "&Öffnen...\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 "&Einstellungen...\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 "&Beenden"
@@ -103,11 +103,11 @@ msgid "&Send DCP to TMS"
 msgstr "&DCP an TMS senden"
 
 #: 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 "&Werkzeuge"
 
-#: 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 "&Darstellung"
 
@@ -120,13 +120,13 @@ msgid "<b>Playlists</b>"
 msgstr ""
 
 #: 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 "Über"
 
 #: 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 "Über DCP-o-matic"
 
@@ -134,7 +134,7 @@ msgstr "Über DCP-o-matic"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/tools/dcpomatic_player.cc:508
+#: src/tools/dcpomatic_player.cc:518
 #, fuzzy
 msgid "Add &KDM..."
 msgstr "&(D)KDM hinzufügen..."
@@ -156,7 +156,7 @@ msgid "Add..."
 msgstr "Hinzufügen..."
 
 #: 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"
@@ -175,7 +175,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"
@@ -190,7 +190,7 @@ msgstr "Ein unbekannter Fehler ist beim J2C Kodierungsserver aufgetreten."
 
 #: 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 "Ein unbekannter Fehler ist aufgetreten."
@@ -209,7 +209,7 @@ msgstr ""
 msgid "Bad setting for %s."
 msgstr "Falscher Parameter 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"
 
@@ -219,7 +219,7 @@ msgstr ""
 "Medien der CPL sind bei der DCP-Erstellung nicht verschlüsselt worden. Nur "
 "für verschlüsselte CPLs können KDMs erstellt werden."
 
-#: 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 "Auf Updates überprüfen..."
 
@@ -232,7 +232,7 @@ msgstr "DCP-o-matic"
 msgid "Close without saving film"
 msgstr "Schließen ohne speichern"
 
-#: 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 "Closed Captions (CCAP) monitor…"
 
@@ -260,11 +260,11 @@ msgstr "Batchkonverter nicht gestartet!?"
 msgid "Could not find player."
 msgstr "Konnte den Player nicht starten!?"
 
-#: 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 "DCP %1 konnte nicht geladen werden."
 
-#: src/tools/dcpomatic_player.cc:496
+#: src/tools/dcpomatic_player.cc:506
 #, fuzzy, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -272,11 +272,12 @@ msgid ""
 "%s."
 msgstr "DCP %1 konnte nicht geladen werden."
 
-#: src/tools/dcpomatic_player.cc:660
+#: src/tools/dcpomatic_player.cc:670
 msgid "Could not load KDM."
 msgstr "Konnte KDM nicht laden."
 
-#: 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 "Konnte kein DCP aus %s laden"
@@ -355,7 +356,7 @@ msgstr ""
 "wurden nicht gespeichert."
 
 #: 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."
@@ -363,7 +364,7 @@ msgstr ""
 "Konnte nicht in die Konfigurationsdatei schreiben (%s). Ihre Änderungen "
 "wurden nicht gespeichert."
 
-#: 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 ""
 "Konnte nicht in die Konfigurationsdatei schreiben. Ihre Änderungen wurden "
@@ -390,13 +391,13 @@ msgstr "DCP-o-matic J2C Kodierungsserver"
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM Verwaltung"
 
-#: 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 Player"
 
-#: 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 konnte nicht gestartet werden."
 
@@ -412,15 +413,15 @@ msgstr "DCP-o-matic konnte nicht gestartet werden"
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic_player.cc:544
+#: src/tools/dcpomatic_player.cc:554
 msgid "Decode at full resolution"
 msgstr "Dekodiere bei voller Auflösung"
 
-#: src/tools/dcpomatic_player.cc:545
+#: src/tools/dcpomatic_player.cc:555
 msgid "Decode at half resolution"
 msgstr "Dekodiere bei halber Auflösung"
 
-#: src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic_player.cc:556
 msgid "Decode at quarter resolution"
 msgstr "Dekodiere bei Viertel-Auflösung"
 
@@ -449,7 +450,7 @@ msgstr "Nicht duplizieren"
 msgid "Down"
 msgstr "Nach unten"
 
-#: src/tools/dcpomatic_player.cc:538
+#: src/tools/dcpomatic_player.cc:548
 msgid "Dual screen\tShift+F11"
 msgstr "Zweischirmbetrieb\tShift+F11"
 
@@ -509,7 +510,7 @@ msgstr "Projektdaten geändert!"
 msgid "Frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: src/tools/dcpomatic_player.cc:537
+#: src/tools/dcpomatic_player.cc:547
 msgid "Full screen\tF11"
 msgstr "Vollbild\tF11"
 
@@ -535,7 +536,7 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: 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 "Lade DCP..."
 
@@ -630,7 +631,7 @@ msgid "Remove"
 msgstr "Entfernen"
 
 #: 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 "Problembericht senden..."
 
@@ -683,11 +684,11 @@ msgstr "Speichern und Projekt duplizieren"
 msgid "Screens"
 msgstr "Stammdaten Kinos und Leinwände"
 
-#: src/tools/dcpomatic_player.cc:579
+#: src/tools/dcpomatic_player.cc:589
 msgid "Select DCP to open"
 msgstr "DCP Ordner auswählen"
 
-#: src/tools/dcpomatic_player.cc:604
+#: src/tools/dcpomatic_player.cc:614
 msgid "Select DCP to open as OV"
 msgstr "Ordner mit DCP OV auswählen"
 
@@ -700,7 +701,7 @@ msgstr "DKDM auswählen"
 msgid "Select DKDM file"
 msgstr "DKDM auswählen"
 
-#: src/tools/dcpomatic_player.cc:646
+#: src/tools/dcpomatic_player.cc:656
 msgid "Select KDM"
 msgstr "(D)KDM auswählen"
 
@@ -720,11 +721,11 @@ msgstr "Sende KDM Emails"
 msgid "Send translations..."
 msgstr "Sende In-App Übersetzungen..."
 
-#: src/tools/dcpomatic_player.cc:543
+#: src/tools/dcpomatic_player.cc:553
 msgid "Set decode resolution to match display"
 msgstr "Dekodierungs-Auflösung an Displayauflösung anpassen"
 
-#: 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 ""
 
@@ -750,7 +751,7 @@ msgstr ""
 "Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
 "Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem fortfahren ?"
 
-#: 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 "Der DCP-o-matic Download Server ist nicht erreichbar."
 
@@ -800,7 +801,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."
@@ -808,7 +809,7 @@ msgstr ""
 "Die Programmeinstellungen konnten nicht geladen werden. Es werden "
 "Standardeinstellungen wiederhergestellt. Dies kann etwas länger dauern."
 
-#: 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 "Es ist keine neue Version von DCP-o-matic verfügbar."
 
@@ -827,7 +828,14 @@ msgstr ""
 "worden und wird in dieser Programmversion möglicherweise nicht korrekt "
 "umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
 
-#: 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
 #, fuzzy
 msgid "Timing..."
 msgstr ""
@@ -851,7 +859,7 @@ msgstr "Unerledigte Aufgaben"
 msgid "Up"
 msgstr "Nach oben"
 
-#: src/tools/dcpomatic_player.cc:549
+#: src/tools/dcpomatic_player.cc:559
 #, fuzzy
 msgid "Verify DCP..."
 msgstr "DCP Integrität prüfen"
@@ -925,7 +933,7 @@ msgid ""
 msgstr ""
 
 #: 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."