pot/merge.

[dcpomatic.git] / src / wx / po / da_DK.po

diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index 183bb456c4ad116c20bf27781a43b101be0bef22..a264ef535a971d71c8691159fad525024faecfb0 100644 (file)
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-23 00:24+0000\n"
+"POT-Creation-Date: 2016-02-28 00:29+0000\n"
 "PO-Revision-Date: 2015-10-27 20:35+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,15 @@ msgstr ""
 "X-Generator: Poedit 1.8.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/wx/subtitle_panel.cc:71 src/wx/subtitle_panel.cc:81
-#: src/wx/subtitle_panel.cc:91 src/wx/subtitle_panel.cc:101
+#: src/wx/subtitle_panel.cc:72 src/wx/subtitle_panel.cc:82
+#: src/wx/subtitle_panel.cc:92 src/wx/subtitle_panel.cc:102
 msgid "%"
 msgstr "%"
 
 #: src/wx/about_dialog.cc:82
+#, fuzzy
 msgid ""
-"(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n"
+"(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n"
 " Ole Laursen, Brecht Sanders"
 msgstr ""
 "(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n"
@@ -35,7 +36,7 @@ msgstr ""
 msgid "(None)"
 msgstr "Ingen"
 
-#: src/wx/config_dialog.cc:175
+#: src/wx/config_dialog.cc:179
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(genstart DCP-o-matic for at se sprogændringerne)"
 
@@ -43,6 +44,10 @@ msgstr "(genstart DCP-o-matic for at se sprogændringerne)"
 msgid "-6dB"
 msgstr "-6dB"
 
+#: src/wx/rgba_colour_picker.cc:35
+msgid "255"
+msgstr ""
+
 #: src/wx/video_panel.cc:224
 msgid "2D"
 msgstr "2D"
@@ -51,11 +56,11 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "2D-version af 3D-indhold"
 
-#: src/wx/dcp_panel.cc:676
+#: src/wx/dcp_panel.cc:696
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:634
+#: src/wx/dcp_panel.cc:654
 msgid "3D"
 msgstr "3D"
 
@@ -79,10 +84,18 @@ msgstr "3D, kun højre"
 msgid "3D top/bottom"
 msgstr "3D, top/bund"
 
-#: src/wx/dcp_panel.cc:677
+#: src/wx/dcp_panel.cc:697
 msgid "4K"
 msgstr "4K"
 
+#: src/wx/image_subtitle_colour_dialog.cc:40
+msgid "<b>New colour</b>"
+msgstr ""
+
+#: src/wx/image_subtitle_colour_dialog.cc:37
+msgid "<b>Original colour</b>"
+msgstr ""
+
 #. //trac.wxwidgets.org/ticket/13389
 #.
 #: src/wx/timing_panel.cc:123
@@ -95,7 +108,7 @@ msgstr ""
 msgid "A"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:148
+#: src/wx/hints_dialog.cc:139
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
@@ -113,7 +126,7 @@ msgstr "En ny version af DCP-o-matic er tilgængelig."
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
-#: src/wx/screens_panel.cc:55
+#: src/wx/screens_panel.cc:56
 msgid "Add Cinema..."
 msgstr "Tilføj biograf..."
 
@@ -121,11 +134,11 @@ msgstr "Tilføj biograf..."
 msgid "Add KDM..."
 msgstr "Tilføj KDM..."
 
-#: src/wx/screens_panel.cc:62
+#: src/wx/screens_panel.cc:63
 msgid "Add Screen..."
 msgstr "Tilføj sal..."
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:84
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
@@ -133,11 +146,11 @@ msgstr ""
 "Tilføj folder med billedfiler (der vil blive brugt som sekvens af levende "
 "billeder) eller en DCP."
 
-#: src/wx/content_panel.cc:77
+#: src/wx/content_panel.cc:79
 msgid "Add file(s)..."
 msgstr "Tilføj fil(er)..."
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:83
 msgid "Add folder..."
 msgstr "Tilføj folder..."
 
@@ -145,15 +158,15 @@ msgstr "Tilføj folder..."
 msgid "Add image sequence"
 msgstr "Tilføj billedsekvens"
 
-#: src/wx/content_panel.cc:78
+#: src/wx/content_panel.cc:80
 msgid "Add video, image or sound files to the film."
 msgstr "Tilføj video-, billed- eller lydfiler til filmen."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
+#: src/wx/config_dialog.cc:699 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Tilføj..."
 
-#: src/wx/cinema_dialog.cc:58
+#: src/wx/cinema_dialog.cc:58 src/wx/config_dialog.cc:1225
 #, fuzzy
 msgid "Address"
 msgstr "CC-adresse"
@@ -162,7 +175,7 @@ msgstr "CC-adresse"
 msgid "Adjust white point to"
 msgstr "Juster hvidpunkt til "
 
-#: src/wx/hints_dialog.cc:136
+#: src/wx/hints_dialog.cc:127
 msgid ""
 "All of your content is at 1.85:1 or narrower but your DCP's container is "
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
@@ -174,7 +187,7 @@ msgstr ""
 "billede. Du vil måske foretrække at sætte din DCP's container til Flat "
 "(1.85:1) i fanen \"DCP\"."
 
-#: src/wx/hints_dialog.cc:130
+#: src/wx/hints_dialog.cc:121
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -186,15 +199,20 @@ msgstr ""
 "billede. Du vil måske foretrække at sætte din DCP's container til Scope "
 "(2.39:1) i fanen \"DCP\"."
 
-#: src/wx/config_dialog.cc:1337
+#: src/wx/config_dialog.cc:1369
 msgid "Allow any DCP frame rate"
 msgstr "Tillad vilkårlig DCP-billedhastighed"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/rgba_colour_picker.cc:32
+msgid "Alpha   0"
+msgstr ""
+
+#: src/wx/subtitle_panel.cc:124
 msgid "Appearance..."
 msgstr ""
 
 #: src/wx/audio_dialog.cc:41 src/wx/audio_panel.cc:47 src/wx/dcp_panel.cc:110
+#: src/wx/timeline_labels_view.cc:34 src/wx/timeline_labels_view.cc:62
 msgid "Audio"
 msgstr "Lyd"
 
@@ -216,7 +234,7 @@ msgid ""
 msgstr ""
 "Lyd bliver sendt fra indholdskanal %d til DCP-kanal %d med gain %.1fdB."
 
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:197
 msgid "Automatically analyse content audio"
 msgstr "Analyser lydindhold automatisk"
 
@@ -224,7 +242,7 @@ msgstr "Analyser lydindhold automatisk"
 msgid "B"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1232
 msgid "BCC address"
 msgstr "BCC-adresse"
 
@@ -249,7 +267,7 @@ msgstr "Bund"
 msgid "Browse..."
 msgstr "Gennemse..."
 
-#: src/wx/subtitle_panel.cc:62
+#: src/wx/subtitle_panel.cc:63
 msgid "Burn subtitles into image"
 msgstr "Brænd undertekster ind i billedet"
 
@@ -257,12 +275,13 @@ msgstr "Brænd undertekster ind i billedet"
 msgid "But I have to use fader"
 msgstr "Men jeg bliver nødt til at bruge fader"
 
-#: src/wx/config_dialog.cc:1191
-msgid "CC address"
+#: src/wx/config_dialog.cc:1226
+#, fuzzy
+msgid "CC addresses"
 msgstr "CC-adresse"
 
-#: src/wx/kdm_cpl_panel.cc:34 src/wx/kdm_dialog.cc:67
-#: src/wx/self_dkdm_dialog.cc:57
+#: src/wx/kdm_cpl_panel.cc:34 src/wx/kdm_dialog.cc:71
+#: src/wx/self_dkdm_dialog.cc:52
 msgid "CPL"
 msgstr "CPL"
 
@@ -282,12 +301,11 @@ msgstr "Beregn..."
 msgid "Cancel"
 msgstr "Annuller"
 
-#: src/wx/audio_panel.cc:252 src/wx/subtitle_panel.cc:277
-#: src/wx/video_panel.cc:448
+#: src/wx/content_sub_panel.cc:48
 msgid "Cannot reference this DCP.  "
 msgstr ""
 
-#: src/wx/dolby_doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:202
 msgid "Certificate downloaded"
 msgstr "Certifikat downloadet"
 
@@ -299,16 +317,16 @@ msgstr "Kæde"
 msgid "Channel gain"
 msgstr "Kanalgain"
 
-#: src/wx/audio_dialog.cc:70 src/wx/dcp_panel.cc:719
+#: src/wx/audio_dialog.cc:70 src/wx/dcp_panel.cc:739
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/config_dialog.cc:196
+#: src/wx/config_dialog.cc:205
 #, fuzzy
 msgid "Check for testing updates on startup"
 msgstr "Søg efter opdateringer ved opstart."
 
-#: src/wx/config_dialog.cc:192
+#: src/wx/config_dialog.cc:201
 msgid "Check for updates on startup"
 msgstr "Søg efter opdateringer ved opstart."
 
@@ -316,11 +334,11 @@ msgstr "Søg efter opdateringer ved opstart."
 msgid "Choose a file"
 msgstr "Vælg en fil"
 
-#: src/wx/content_panel.cc:248
+#: src/wx/content_panel.cc:277
 msgid "Choose a file or files"
 msgstr "Vælg en fil eller filer"
 
-#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:270
+#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:305
 msgid "Choose a folder"
 msgstr "Vælg en folder"
 
@@ -332,7 +350,11 @@ msgstr "Vælg en skrifttype"
 msgid "Choose a font file"
 msgstr "Vælg fil med skrifttyper"
 
-#: src/wx/subtitle_appearance_dialog.cc:31
+#: src/wx/config_dialog.cc:192
+msgid "Cinema and screen database file"
+msgstr ""
+
+#: src/wx/text_subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
 
@@ -345,7 +367,7 @@ msgstr "Farvekonvertering"
 msgid "Component"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1361
+#: src/wx/config_dialog.cc:1393
 msgid "Config|Timing"
 msgstr "Konfig|Timing"
 
@@ -353,7 +375,7 @@ msgstr "Konfig|Timing"
 msgid "Contact email"
 msgstr "Kontakt email"
 
-#: src/wx/dcp_panel.cc:609
+#: src/wx/dcp_panel.cc:629
 msgid "Container"
 msgstr "Container"
 
@@ -361,7 +383,7 @@ msgstr "Container"
 msgid "Content"
 msgstr "Indhold"
 
-#: src/wx/content_properties_dialog.cc:36
+#: src/wx/content_properties_dialog.cc:38
 msgid "Content Properties"
 msgstr "Egenskaber for indhold"
 
@@ -395,13 +417,13 @@ msgstr ""
 msgid "Could not load KDM (%s)"
 msgstr "Kunne ikke indlæse KDM (%s)"
 
-#: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
+#: src/wx/config_dialog.cc:769 src/wx/config_dialog.cc:934
 #: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Kunne ikke læse certifikatfil (%s)"
 
-#: src/wx/config_dialog.cc:899
+#: src/wx/config_dialog.cc:926
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr "Kunne ikke læse nøgle fil (%s)"
@@ -410,7 +432,7 @@ msgstr "Kunne ikke læse nøgle fil (%s)"
 msgid "Create in folder"
 msgstr "Opret i folder"
 
-#: src/wx/config_dialog.cc:207
+#: src/wx/config_dialog.cc:216
 msgid "Creator"
 msgstr ""
 
@@ -418,7 +440,7 @@ msgstr ""
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/wx/dcp_panel.cc:175 src/wx/video_panel.cc:196
+#: src/wx/dcp_panel.cc:180 src/wx/video_panel.cc:196
 msgid "Custom"
 msgstr "Brugerdefineret"
 
@@ -439,56 +461,56 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic lyd"
 
-#: src/wx/config_dialog.cc:1363
+#: src/wx/config_dialog.cc:1395
 msgid "Debug: decode"
 msgstr "Debug: decode"
 
-#: src/wx/config_dialog.cc:1367
+#: src/wx/config_dialog.cc:1399
 #, fuzzy
 msgid "Debug: email sending"
 msgstr "Debug: encode"
 
-#: src/wx/config_dialog.cc:1365
+#: src/wx/config_dialog.cc:1397
 msgid "Debug: encode"
 msgstr "Debug: encode"
 
-#: src/wx/config_dialog.cc:988
+#: src/wx/config_dialog.cc:1015
 msgid "Decrypting DCPs"
 msgstr "Dekrypterer DCPere"
 
-#: src/wx/config_dialog.cc:406
+#: src/wx/config_dialog.cc:433
 msgid "Default ISDCF name details"
 msgstr "Standard ISDCF-navne-detaljer"
 
-#: src/wx/config_dialog.cc:419
+#: src/wx/config_dialog.cc:446
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standard JPEG2000-båndbredde"
 
-#: src/wx/config_dialog.cc:428
+#: src/wx/config_dialog.cc:455
 msgid "Default audio delay"
 msgstr "Standardlydforsinkelse"
 
-#: src/wx/config_dialog.cc:410
+#: src/wx/config_dialog.cc:437
 msgid "Default container"
 msgstr "Standardcontainer"
 
-#: src/wx/config_dialog.cc:414
+#: src/wx/config_dialog.cc:441
 msgid "Default content type"
 msgstr "Standardindholdstype"
 
-#: src/wx/config_dialog.cc:398
+#: src/wx/config_dialog.cc:425
 msgid "Default directory for new films"
 msgstr "Standardfolder til nye film"
 
-#: src/wx/config_dialog.cc:390
+#: src/wx/config_dialog.cc:417
 msgid "Default duration of still images"
 msgstr "Standardvarighed af stillbilleder"
 
-#: src/wx/config_dialog.cc:436
+#: src/wx/config_dialog.cc:463
 msgid "Default standard"
 msgstr ""
 
-#: src/wx/config_dialog.cc:372
+#: src/wx/config_dialog.cc:399
 msgid "Defaults"
 msgstr "Standardindstillinger"
 
@@ -505,7 +527,7 @@ msgstr "Detaljer..."
 msgid "Dolby / Doremi"
 msgstr "Doremi"
 
-#: src/wx/content_panel.cc:93
+#: src/wx/content_panel.cc:95
 msgid "Down"
 msgstr "Ned"
 
@@ -525,15 +547,15 @@ msgstr "Download..."
 msgid "Downloading certificate"
 msgstr "Downloader certifikat"
 
-#: src/wx/screens_panel.cc:57
+#: src/wx/screens_panel.cc:58
 msgid "Edit Cinema..."
 msgstr "Rediger biograf..."
 
-#: src/wx/screens_panel.cc:64
+#: src/wx/screens_panel.cc:65
 msgid "Edit Screen..."
 msgstr "Rediger sal..."
 
-#: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
+#: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:434
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
 #: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
@@ -561,24 +583,24 @@ msgstr "Krypteret"
 msgid "End"
 msgstr "Slut"
 
-#: src/wx/config_dialog.cc:1359
+#: src/wx/config_dialog.cc:1391
 msgid "Errors"
 msgstr "Fejl"
 
-#: src/wx/config_dialog.cc:676
+#: src/wx/config_dialog.cc:703
 msgid "Export"
 msgstr "Eksporter"
 
-#: src/wx/config_dialog.cc:995
+#: src/wx/config_dialog.cc:1022
 msgid "Export DCP decryption certificate..."
 msgstr "Eksporter DCPens dekrypterings certifikat..."
 
-#: src/wx/config_dialog.cc:693
+#: src/wx/config_dialog.cc:720
 #, fuzzy
 msgid "Export..."
 msgstr "Eksporter"
 
-#: src/wx/config_dialog.cc:1079
+#: src/wx/config_dialog.cc:1106
 msgid "FTP (for Dolby)"
 msgstr ""
 
@@ -594,7 +616,7 @@ msgstr ""
 msgid "Fade out"
 msgstr ""
 
-#: src/wx/content_properties_dialog.cc:40
+#: src/wx/content_properties_dialog.cc:42
 msgid "Filename"
 msgstr "Filnavn"
 
@@ -615,11 +637,11 @@ msgstr "Find manglende..."
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:122
 msgid "Fonts..."
 msgstr "Skrifttyper..."
 
-#: src/wx/dcp_panel.cc:620
+#: src/wx/dcp_panel.cc:640
 msgid "Frame Rate"
 msgstr "Billedhastighed"
 
@@ -635,7 +657,7 @@ msgstr "Gratis, open source-oprettelse af DCP fra næsten alt."
 msgid "From"
 msgstr "Fra"
 
-#: src/wx/config_dialog.cc:1187
+#: src/wx/config_dialog.cc:1220
 msgid "From address"
 msgstr "Fra adresse"
 
@@ -664,7 +686,7 @@ msgstr "Gainberegner"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Gain til indholdskanal %d i DCP-kanal %d"
 
-#: src/wx/config_dialog.cc:1355
+#: src/wx/config_dialog.cc:1387
 msgid "General"
 msgstr "Generelt"
 
@@ -697,11 +719,11 @@ msgstr "Jeg vil afspille dette på fader-niveau"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1062
+#: src/wx/config_dialog.cc:1089
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: src/wx/config_dialog.cc:583
+#: src/wx/config_dialog.cc:610
 msgid "IP address / host name"
 msgstr "IP-adresse / værtsnavn"
 
@@ -726,7 +748,7 @@ msgstr ""
 msgid "Integrated loudness %.2f LUFS"
 msgstr ""
 
-#: src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:839
 msgid "Intermediate"
 msgstr ""
 
@@ -734,11 +756,11 @@ msgstr ""
 msgid "Intermediate common name"
 msgstr ""
 
-#: src/wx/config_dialog.cc:468 src/wx/dcp_panel.cc:180
+#: src/wx/config_dialog.cc:495 src/wx/dcp_panel.cc:185
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:203
+#: src/wx/config_dialog.cc:212
 msgid "Issuer"
 msgstr "Udsteder"
 
@@ -751,7 +773,7 @@ msgstr "Skrifttype fil"
 msgid "Italic font"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:644
+#: src/wx/dcp_panel.cc:664
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000-båndbredde"
 
@@ -759,7 +781,7 @@ msgstr "JPEG2000-båndbredde"
 msgid "Join"
 msgstr "Sammensæt"
 
-#: src/wx/config_dialog.cc:1146
+#: src/wx/config_dialog.cc:1179
 msgid "KDM Email"
 msgstr "KDM-e-mail"
 
@@ -767,27 +789,28 @@ msgstr "KDM-e-mail"
 msgid "KDM type"
 msgstr "KDM-type"
 
-#: src/wx/kdm_dialog.cc:60
+#: src/wx/kdm_dialog.cc:64
 msgid "KDM|Timing"
 msgstr "KDM|Timing"
 
 #: src/wx/timeline_dialog.cc:43
-msgid "Keep video in sequence"
+#, fuzzy
+msgid "Keep video and subtitles in sequence"
 msgstr "Bevar videosekvens"
 
 #: src/wx/dcp_panel.cc:125 src/wx/key_dialog.cc:27 src/wx/key_dialog.cc:29
 msgid "Key"
 msgstr "Nøgle"
 
-#: src/wx/config_dialog.cc:965
+#: src/wx/config_dialog.cc:992
 msgid "Keys"
 msgstr "Nøgler"
 
-#: src/wx/subtitle_panel.cc:106
+#: src/wx/subtitle_panel.cc:107
 msgid "Language"
 msgstr "Sprog"
 
-#: src/wx/config_dialog.cc:810
+#: src/wx/config_dialog.cc:837
 msgid "Leaf"
 msgstr ""
 
@@ -795,7 +818,7 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
-#: src/wx/config_dialog.cc:685
+#: src/wx/config_dialog.cc:712
 msgid "Leaf private key"
 msgstr ""
 
@@ -807,15 +830,15 @@ msgstr "Venstre"
 msgid "Linearise input gamma curve for small values"
 msgstr ""
 
-#: src/wx/config_dialog.cc:691
+#: src/wx/config_dialog.cc:718
 msgid "Load..."
 msgstr "Indlæs"
 
-#: src/wx/config_dialog.cc:1349
+#: src/wx/config_dialog.cc:1381
 msgid "Log"
 msgstr "Log"
 
-#: src/wx/config_dialog.cc:1346
+#: src/wx/config_dialog.cc:1378
 msgid "Log:"
 msgstr "Log:"
 
@@ -824,19 +847,19 @@ msgstr "Log:"
 msgid "Loudness range %.2f LU"
 msgstr ""
 
-#: src/wx/content_panel.cc:448 src/wx/content_panel.cc:477
+#: src/wx/content_panel.cc:494
 msgid "MISSING: "
 msgstr "MANGLER:"
 
-#: src/wx/config_dialog.cc:1179
+#: src/wx/config_dialog.cc:1212
 msgid "Mail password"
 msgstr "Mail password"
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1208
 msgid "Mail user name"
 msgstr "Mail brugernavn"
 
-#: src/wx/self_dkdm_dialog.cc:47
+#: src/wx/self_dkdm_dialog.cc:42
 #, fuzzy
 msgid "Make DKDM for DCP-o-matic"
 msgstr "Om DCP-o-matic"
@@ -857,20 +880,20 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:1329
+#: src/wx/config_dialog.cc:1361
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maksimal JPEG2000-båndbredde"
 
-#: src/wx/config_dialog.cc:423 src/wx/config_dialog.cc:1333
-#: src/wx/dcp_panel.cc:648
+#: src/wx/config_dialog.cc:450 src/wx/config_dialog.cc:1365
+#: src/wx/dcp_panel.cc:668
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:92
 msgid "Move the selected piece of content earlier in the film."
 msgstr "Flyt det valgte indhold til tidligere i filmen."
 
-#: src/wx/content_panel.cc:94
+#: src/wx/content_panel.cc:96
 msgid "Move the selected piece of content later in the film."
 msgstr "Flyt det valgte indhold til senere i filmen."
 
@@ -886,7 +909,7 @@ msgstr "Mine dokumenter"
 msgid "My problem is"
 msgstr "Mit problem er"
 
-#: src/wx/content_panel.cc:481
+#: src/wx/content_panel.cc:498
 msgid "NEEDS KDM: "
 msgstr "HAR BRUG FOR KDM:"
 
@@ -903,16 +926,20 @@ msgstr "Ny film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Nye versioner af DCP-o-matic er tilgængelige."
 
+#: src/wx/content_sub_panel.cc:46
+msgid "No DCP selected."
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:314
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Ingen lyd vil blive sendt fra indholdskanal %d til DCP-kanal %d."
 
-#: src/wx/content_panel.cc:281
+#: src/wx/content_panel.cc:316
 msgid "No content found in this folder."
 msgstr "Fandt intet indhold i denne folder."
 
-#: src/wx/dcp_panel.cc:727 src/wx/video_panel.cc:178 src/wx/video_panel.cc:192
+#: src/wx/dcp_panel.cc:747 src/wx/video_panel.cc:178 src/wx/video_panel.cc:192
 #: src/wx/video_panel.cc:294
 msgid "None"
 msgstr "Ingen"
@@ -930,15 +957,15 @@ msgstr ""
 msgid "Off"
 msgstr "Off"
 
-#: src/wx/config_dialog.cc:1341
+#: src/wx/config_dialog.cc:1373
 msgid "Only servers encode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1373
+#: src/wx/config_dialog.cc:1405
 msgid "Open console window"
 msgstr ""
 
-#: src/wx/content_panel.cc:98
+#: src/wx/content_panel.cc:100
 msgid "Open the timeline for the film."
 msgstr "Åbn filmens tidslinie."
 
@@ -954,15 +981,15 @@ msgstr "Organisations enhed"
 msgid "Other trusted devices"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1163
+#: src/wx/config_dialog.cc:1196
 msgid "Outgoing mail server"
 msgstr "Udgående mail server"
 
-#: src/wx/subtitle_appearance_dialog.cc:35
+#: src/wx/text_subtitle_appearance_dialog.cc:35
 msgid "Outline"
 msgstr ""
 
-#: src/wx/subtitle_appearance_dialog.cc:39
+#: src/wx/text_subtitle_appearance_dialog.cc:39
 msgid "Outline colour"
 msgstr ""
 
@@ -970,11 +997,11 @@ msgstr ""
 msgid "Outline content"
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:74 src/wx/self_dkdm_dialog.cc:64
+#: src/wx/kdm_dialog.cc:78
 msgid "Output"
 msgstr "Output"
 
-#: src/wx/config_dialog.cc:1074
+#: src/wx/config_dialog.cc:1101
 msgid "Password"
 msgstr "Password"
 
@@ -986,12 +1013,12 @@ msgstr "Pause"
 msgid "Peak"
 msgstr ""
 
-#: src/wx/audio_panel.cc:311
+#: src/wx/audio_panel.cc:302
 #, c-format
 msgid "Peak: %.2fdB"
 msgstr ""
 
-#: src/wx/audio_panel.cc:313 src/wx/audio_panel.cc:316
+#: src/wx/audio_panel.cc:304 src/wx/audio_panel.cc:307
 msgid "Peak: unknown"
 msgstr ""
 
@@ -1023,7 +1050,7 @@ msgstr "Position"
 msgid "Pre-release"
 msgstr "Pre-release"
 
-#: src/wx/dcp_panel.cc:725
+#: src/wx/dcp_panel.cc:745
 msgid "Processor"
 msgstr "Processor"
 
@@ -1031,7 +1058,7 @@ msgstr "Processor"
 msgid "Properties..."
 msgstr "Egenskaber..."
 
-#: src/wx/config_dialog.cc:1058
+#: src/wx/config_dialog.cc:1085
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1055,7 +1082,7 @@ msgstr "Censur (f.eks. 15)"
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:698
+#: src/wx/config_dialog.cc:725
 msgid "Re-make certificates and key..."
 msgstr ""
 
@@ -1080,7 +1107,7 @@ msgstr ""
 msgid "Red chromaticity"
 msgstr "Rød farvetone"
 
-#: src/wx/timeline_reels_view.cc:82
+#: src/wx/timeline_reels_view.cc:83
 #, c-format
 msgid "Reel %d"
 msgstr ""
@@ -1094,25 +1121,25 @@ msgstr "Fuld længde"
 msgid "Reels"
 msgstr ""
 
-#: src/wx/audio_panel.cc:55 src/wx/subtitle_panel.cc:54
+#: src/wx/audio_panel.cc:55 src/wx/subtitle_panel.cc:55
 #: src/wx/video_panel.cc:80
 msgid "Refer to existing DCP"
 msgstr ""
 
-#: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
+#: src/wx/config_dialog.cc:701 src/wx/content_menu.cc:68
+#: src/wx/content_panel.cc:87 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Fjern"
 
-#: src/wx/screens_panel.cc:59
+#: src/wx/screens_panel.cc:60
 msgid "Remove Cinema"
 msgstr "Fjern biograf"
 
-#: src/wx/screens_panel.cc:66
+#: src/wx/screens_panel.cc:67
 msgid "Remove Screen"
 msgstr "Fjern sal"
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:88
 msgid "Remove the selected piece of content from the film."
 msgstr "Fjern det valgte indhold fra filmen."
 
@@ -1132,12 +1159,12 @@ msgstr "Gentag..."
 msgid "Report A Problem"
 msgstr "Rapporter Et Problem"
 
-#: src/wx/config_dialog.cc:1202
+#: src/wx/config_dialog.cc:1239
 #, fuzzy
 msgid "Reset to default subject and text"
 msgstr "Nulstil til standard tekst"
 
-#: src/wx/dcp_panel.cc:638
+#: src/wx/dcp_panel.cc:658
 msgid "Resolution"
 msgstr "Opløsning"
 
@@ -1153,7 +1180,7 @@ msgstr "Højre"
 msgid "Right click to change gain."
 msgstr "Højreklik for at ændre gain."
 
-#: src/wx/config_dialog.cc:808
+#: src/wx/config_dialog.cc:835
 msgid "Root"
 msgstr ""
 
@@ -1161,11 +1188,11 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1078
+#: src/wx/config_dialog.cc:1105
 msgid "SCP (for AAM and Doremi)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:467 src/wx/dcp_panel.cc:179
+#: src/wx/config_dialog.cc:494 src/wx/dcp_panel.cc:184
 msgid "SMPTE"
 msgstr "SMPTE"
 
@@ -1182,7 +1209,7 @@ msgstr "Skaler til"
 msgid "Screens"
 msgstr "Sale"
 
-#: src/wx/config_dialog.cc:579
+#: src/wx/config_dialog.cc:606
 msgid "Search network for servers"
 msgstr ""
 
@@ -1190,8 +1217,8 @@ msgstr ""
 msgid "Select CPL XML file"
 msgstr "Vælg CPL XML-fil"
 
-#: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
+#: src/wx/config_dialog.cc:760 src/wx/config_dialog.cc:800
+#: src/wx/config_dialog.cc:1031 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Vælg certifikatfil"
 
@@ -1199,7 +1226,7 @@ msgstr "Vælg certifikatfil"
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:893 src/wx/config_dialog.cc:924
+#: src/wx/config_dialog.cc:920 src/wx/config_dialog.cc:951
 msgid "Select Key File"
 msgstr "Vælg Nøglefil"
 
@@ -1208,6 +1235,10 @@ msgstr "Vælg Nøglefil"
 msgid "Select certificate file"
 msgstr "Vælg certifikatfil"
 
+#: src/wx/config_dialog.cc:193
+msgid "Select cinema and screen database file"
+msgstr ""
+
 #: src/wx/kdm_output_panel.cc:58
 msgid "Send by email"
 msgstr "Send som e-mail"
@@ -1216,15 +1247,15 @@ msgstr "Send som e-mail"
 msgid "Send logs"
 msgstr "Send logfiler"
 
+#: src/wx/dolby_doremi_certificate_panel.cc:42
+msgid "Serial number"
+msgstr "Serienummer"
+
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/dolby_doremi_certificate_panel.cc:42
-msgid "Server serial number"
-msgstr "Servers serienummer"
-
-#: src/wx/config_dialog.cc:566
+#: src/wx/config_dialog.cc:593
 msgid "Servers"
 msgstr "Servere"
 
@@ -1241,11 +1272,11 @@ msgstr "Indlæs fra .ttf fil..."
 msgid "Set from system font..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:157
+#: src/wx/config_dialog.cc:159
 msgid "Set language"
 msgstr "Indstil sprog"
 
-#: src/wx/dcp_panel.cc:734
+#: src/wx/dcp_panel.cc:754
 msgid "Show audio..."
 msgstr "Vis lyd..."
 
@@ -1257,11 +1288,11 @@ msgstr ""
 msgid "Signed"
 msgstr "Signeret"
 
-#: src/wx/config_dialog.cc:980
+#: src/wx/config_dialog.cc:1007
 msgid "Signing DCPs and KDMs"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:173
+#: src/wx/dcp_panel.cc:178
 msgid "Single reel"
 msgstr ""
 
@@ -1273,7 +1304,7 @@ msgstr ""
 msgid "Snap"
 msgstr ""
 
-#: src/wx/dcp_panel.cc:174
+#: src/wx/dcp_panel.cc:179
 msgid "Split by video content"
 msgstr ""
 
@@ -1289,7 +1320,7 @@ msgstr "Standard"
 msgid "Start"
 msgstr "Start"
 
-#: src/wx/subtitle_panel.cc:111
+#: src/wx/subtitle_panel.cc:112
 msgid "Stream"
 msgstr ""
 
@@ -1297,7 +1328,7 @@ msgstr ""
 msgid "Studio (e.g. TCF)"
 msgstr "Studie (f.eks. TCF)"
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1216
 msgid "Subject"
 msgstr "Emne"
 
@@ -1309,23 +1340,29 @@ msgstr "Undertekster"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Tekstningssprog (f.eks. FR)"
 
-#: src/wx/subtitle_appearance_dialog.cc:28
+#: src/wx/text_subtitle_appearance_dialog.cc:28
 msgid "Subtitle appearance"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:46 src/wx/subtitle_view.cc:32
+#: src/wx/image_subtitle_colour_dialog.cc:30
+#, fuzzy
+msgid "Subtitle colours"
+msgstr "Undertekster"
+
+#: src/wx/subtitle_panel.cc:47 src/wx/subtitle_view.cc:32
+#: src/wx/timeline_labels_view.cc:35 src/wx/timeline_labels_view.cc:61
 msgid "Subtitles"
 msgstr "Undertekster"
 
-#: src/wx/about_dialog.cc:220
+#: src/wx/about_dialog.cc:236
 msgid "Supported by"
 msgstr "Støttet af"
 
-#: src/wx/config_dialog.cc:1041
+#: src/wx/config_dialog.cc:1068
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:1066
+#: src/wx/config_dialog.cc:1093
 msgid "Target path"
 msgstr "Destinationsfolder"
 
@@ -1341,7 +1378,7 @@ msgstr "Område (f.eks. UK)"
 msgid "Test version "
 msgstr "Testversion "
 
-#: src/wx/about_dialog.cc:272
+#: src/wx/about_dialog.cc:288
 msgid "Tested by"
 msgstr "Testet af"
 
@@ -1354,7 +1391,7 @@ msgstr ""
 "De(n) angivne indholdsfil(er) stemmer ikke med dem, der mangler. Prøv igen "
 "med den korrekte indholdsfil eller fjern det manglende indhold fra filmen."
 
-#: src/wx/hints_dialog.cc:188
+#: src/wx/hints_dialog.cc:179
 msgid "There are no hints: everything looks good!"
 msgstr "Der er ingen tips; det hele ser godt ud!"
 
@@ -1370,11 +1407,11 @@ msgstr "Dette er ikke en gyldig CPL-fil"
 msgid "Threads"
 msgstr "Tråde"
 
-#: src/wx/config_dialog.cc:183
+#: src/wx/config_dialog.cc:187
 msgid "Threads to use for encoding on this host"
 msgstr "Antal tråde der kan bruges til at danne filmen på denne maskine"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
+#: src/wx/config_dialog.cc:685 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr ""
 
@@ -1386,7 +1423,7 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: src/wx/content_panel.cc:97
+#: src/wx/content_panel.cc:99
 msgid "Timeline..."
 msgstr "Tidslinje..."
 
@@ -1398,7 +1435,7 @@ msgstr "Timing|Timing"
 msgid "Top"
 msgstr "Top"
 
-#: src/wx/about_dialog.cc:120
+#: src/wx/about_dialog.cc:122
 msgid "Translated by"
 msgstr "Oversat af"
 
@@ -1423,12 +1460,12 @@ msgstr ""
 msgid "True peak is %.2fdB"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:82 src/wx/config_dialog.cc:650
+#: src/wx/audio_dialog.cc:82 src/wx/config_dialog.cc:677
 #: src/wx/video_panel.cc:84
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/content_panel.cc:89
+#: src/wx/content_panel.cc:91
 msgid "Up"
 msgstr "Op"
 
@@ -1436,11 +1473,15 @@ msgstr "Op"
 msgid "Update"
 msgstr "Opdater"
 
+#: src/wx/dcp_panel.cc:156
+msgid "Upload DCP to TMS after it is made"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:77
 msgid "Use ISDCF name"
 msgstr "Brug ISDCF-navn"
 
-#: src/wx/dcp_panel.cc:628
+#: src/wx/dcp_panel.cc:648
 msgid "Use best"
 msgstr "Brug bedste"
 
@@ -1448,15 +1489,16 @@ msgstr "Brug bedste"
 msgid "Use preset"
 msgstr "Brug forudindstillede"
 
-#: src/wx/subtitle_panel.cc:58
+#: src/wx/subtitle_panel.cc:59
 msgid "Use subtitles"
 msgstr "Brug undertekster"
 
-#: src/wx/config_dialog.cc:1070
+#: src/wx/config_dialog.cc:1097
 msgid "User name"
 msgstr "Brugernavn"
 
-#: src/wx/dcp_panel.cc:109 src/wx/video_panel.cc:73
+#: src/wx/dcp_panel.cc:109 src/wx/timeline_labels_view.cc:33
+#: src/wx/timeline_labels_view.cc:60 src/wx/video_panel.cc:73
 msgid "Video"
 msgstr "Video"
 
@@ -1468,11 +1510,11 @@ msgstr ""
 msgid "Video frame rate"
 msgstr "Videobilledhastighed"
 
-#: src/wx/subtitle_panel.cc:119
+#: src/wx/subtitle_panel.cc:120
 msgid "View..."
 msgstr "Se..."
 
-#: src/wx/config_dialog.cc:1357
+#: src/wx/config_dialog.cc:1389
 msgid "Warnings"
 msgstr "Advarsler"
 
@@ -1484,11 +1526,11 @@ msgstr "Hvidpunkt"
 msgid "White point adjustment"
 msgstr "Hvidpunktsjustering"
 
-#: src/wx/about_dialog.cc:126
+#: src/wx/about_dialog.cc:128
 msgid "With help from"
 msgstr "Med hjælp fra"
 
-#: src/wx/kdm_output_panel.cc:45 src/wx/self_dkdm_dialog.cc:70
+#: src/wx/kdm_output_panel.cc:45
 msgid "Write to"
 msgstr "Skriv til"
 
@@ -1496,19 +1538,19 @@ msgstr "Skriv til"
 msgid "Written by"
 msgstr "Skrevet af"
 
-#: src/wx/subtitle_panel.cc:67
+#: src/wx/subtitle_panel.cc:68
 msgid "X Offset"
 msgstr "X-Offset"
 
-#: src/wx/subtitle_panel.cc:87
+#: src/wx/subtitle_panel.cc:88
 msgid "X Scale"
 msgstr ""
 
-#: src/wx/subtitle_panel.cc:77
+#: src/wx/subtitle_panel.cc:78
 msgid "Y Offset"
 msgstr "Y-Offset"
 
-#: src/wx/subtitle_panel.cc:97
+#: src/wx/subtitle_panel.cc:98
 msgid "Y Scale"
 msgstr ""
 
@@ -1520,19 +1562,19 @@ msgstr ""
 msgid "YUV to RGB matrix"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:154
+#: src/wx/hints_dialog.cc:145
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised to make a SMPTE DCP instead."
 msgstr ""
 
-#: src/wx/hints_dialog.cc:181
+#: src/wx/hints_dialog.cc:172
 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.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:167
+#: src/wx/hints_dialog.cc:158
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1547,7 +1589,7 @@ msgid ""
 "likely to cause problems on playback."
 msgstr ""
 
-#: src/wx/hints_dialog.cc:142
+#: src/wx/hints_dialog.cc:133
 #, c-format
 msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
@@ -1559,26 +1601,12 @@ msgstr ""
 
 #: src/wx/hints_dialog.cc:101
 msgid ""
-"Your DCP has an odd number of audio channels.  This is very likely to cause "
-"problems on playback."
-msgstr ""
-
-#: src/wx/hints_dialog.cc:105
-msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
 msgstr ""
 "Din DCP har færre end 6 lydkanaler. Dette kan give problemer på nogle "
 "projektorer."
 
-#: src/wx/hints_dialog.cc:110
-msgid ""
-"Your DCP has no audio channels.  This is likely to cause problems on "
-"playback."
-msgstr ""
-"Din DCP har ingen lydkanaler. Dette vil formodentlig give problemer ved "
-"afspilning."
-
 #: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:75
 msgid "dB"
 msgstr "dB"
@@ -1599,16 +1627,16 @@ msgid "m"
 msgstr "m"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:91 src/wx/config_dialog.cc:432
+#: src/wx/audio_panel.cc:91 src/wx/config_dialog.cc:459
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1168
+#: src/wx/config_dialog.cc:1201
 msgid "port"
 msgstr ""
 
 #. // TRANSLATORS: this is an abbreviation for "seconds"
-#: src/wx/config_dialog.cc:394 src/wx/timing_panel.cc:69
+#: src/wx/config_dialog.cc:421 src/wx/timing_panel.cc:69
 msgid "s"
 msgstr "s"
 
@@ -1633,6 +1661,16 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Server serial number"
+#~ msgstr "Servers serienummer"
+
+#~ msgid ""
+#~ "Your DCP has no audio channels.  This is likely to cause problems on "
+#~ "playback."
+#~ msgstr ""
+#~ "Din DCP har ingen lydkanaler. Dette vil formodentlig give problemer ved "
+#~ "afspilning."
+
 #~ msgid "Cinema"
 #~ msgstr "Biograf"
 
@@ -1657,9 +1695,6 @@ msgstr "y"
 #~ msgid "Fetching..."
 #~ msgstr "Henter..."
 
-#~ msgid "Serial number"
-#~ msgstr "Serienummer"
-
 #~ msgid "Unexpected certificate filename form"
 #~ msgstr "Uventet filnavnsformat for certifikat"