Some missing i18n markup. Add S_ macro to allow contextual translations. Add updates to de_DE from Carsten Kurz. Merge pot files.

24 files changed, 338 insertions, 199 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 2129352a4..f853d2ce2 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
-"PO-Revision-Date: 2014-06-20 02:38+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-21 03:55+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/lib/sndfile_content.cc:61
@@ -120,64 +120,64 @@ msgstr "Bildübersicht berechnen"
 
 #: src/lib/frame_rate_change.cc:78
 msgid "Content and DCP have the same rate.\n"
-msgstr "Inhalt und DCP haben die selbe Rate.\n"
+msgstr "Quelle und DCP haben dieselbe Bildrate. Gut ;-)\n"
 
 #: src/lib/audio_content.cc:83
 msgid "Content to be joined must have the same audio delay."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Tonverzögerung haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Tonverzögerung verwenden."
 
 #: src/lib/audio_content.cc:79
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
-"Zu kombinierende Inhalte müssen die gleichen Tonpegeleinstellungen haben."
+"Zu verbindende Inhalte müssen die gleichen Tonpegeleinstellungen verwenden."
 
 #: src/lib/video_content.cc:144
 msgid "Content to be joined must have the same colour conversion."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Farbumwandlung verwenden."
+msgstr "Zu verbindende Inhalte müssen die gleiche Farbumwandlung verwenden."
 
 #: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
-msgstr "Zu kombinierende Inhalte müssen gleichen Beschnitt haben."
+msgstr "Zu verbindende Inhalte müssen gleichen Beschnitt verwenden."
 
 #: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Bildgröße haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
 
 #: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same scale setting."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Skalierung verwenden."
+msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
 
 #: src/lib/subtitle_content.cc:73
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
-"Zu kombinierende Inhalte müssen den gleichen horizontalen Untertitelversatz "
-"haben."
+"Zu verbindende Inhalte müssen den gleichen horizontalen Untertitelversatz "
+"verwenden."
 
 #: src/lib/subtitle_content.cc:77
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
-"Zu kombinierende Inhalte müssen den gleichen vertikalen Untertitelversatz "
-"haben."
+"Zu verbindende Inhalte müssen den gleichen vertikalen Untertitelversatz "
+"verwenden."
 
 #: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle scale."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Untertitelgröße haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
 
 #: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame rate."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Bildrate haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
 
 #: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Bildart (z.B. 2D) haben."
+msgstr "Zu verbindende Inhalte müssen die gleiche Bildart (z.B. 2D) haben."
 
 #: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Tonspur verwenden."
+msgstr "Zu verbindende Inhalte müssen die gleiche Tonspurart verwenden."
 
 #: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
-msgstr "Zu kombinierende Inhalte müssen die gleiche Untertitelspur verwenden."
+msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
 
 #: src/lib/scp_dcp_job.cc:112
 msgid "Copy DCP to TMS"
@@ -192,9 +192,8 @@ msgid "Could not create remote directory %1 (%2)"
 msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 
 #: src/lib/image_proxy.cc:128
-#, fuzzy
 msgid "Could not decode image file"
-msgstr "Datei %1 konnte nicht erstellt werden."
+msgstr "Bilddatei konnte nicht dekodiert werden"
 
 #: src/lib/job.cc:90
 msgid "Could not open %1"
@@ -222,7 +221,7 @@ msgstr "DCP läuft mit %1% der Original Geschwindigkeit der Quelle.\n"
 
 #: src/lib/frame_rate_change.cc:81
 msgid "DCP will use every other frame of the content.\n"
-msgstr "DCP benutzt nur jedes zweite Bild des Quell-Inhalts.\n"
+msgstr "DCP verwendet nur jedes zweite Bild des Quelle.\n"
 
 #: src/lib/job.cc:91
 msgid ""
@@ -272,11 +271,11 @@ msgstr "Herunterladen fehlgeschlagen (%1/%2 Fehler %3)"
 
 #: src/lib/frame_rate_change.cc:83
 msgid "Each content frame will be doubled in the DCP.\n"
-msgstr "Jedes Bild des Quell-Inhalts wird im DCP verdoppelt.\n"
+msgstr "Jedes Bild der Quelle wird im DCP verdoppelt.\n"
 
 #: src/lib/frame_rate_change.cc:85
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
-msgstr "Jedes Bild des Quell-Inhalts wird %1 mal im DCP wiederholt.\n"
+msgstr "Jedes Bild der Quelle wird %1 mal im DCP wiederholt.\n"
 
 #: src/lib/send_kdm_email_job.cc:50
 msgid "Email KDMs for %1"
@@ -324,7 +323,7 @@ msgstr "Gradient Glätter"
 
 #: src/lib/util.cc:755
 msgid "Hearing impaired"
-msgstr "Hörbehindert"
+msgstr "HI"
 
 #: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
@@ -397,12 +396,14 @@ msgstr "OK (Dauer %1)"
 #: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
-"Nur das erste Segment der Inhalte kann vom Anfang her beschnitten werden."
+"Nur das erste Segment der zu verbindenden Inhalte kann vom Anfang her "
+"beschnitten werden."
 
 #: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
-"Nur das letzte Segment der Inhalte kann vom Ende her beschnitten werden."
+"Nur das letzte Segment der zu verbindenden Inhalte kann vom Ende her "
+"beschnitten werden."
 
 #: src/lib/job.cc:103
 msgid "Out of memory"
@@ -422,7 +423,7 @@ msgstr "Hinweis"
 
 #: src/lib/dcp_content_type.cc:49
 msgid "Rating"
-msgstr "Freigabe"
+msgstr "Freigabehinweis"
 
 #: src/lib/config.cc:87 src/lib/config.cc:174
 msgid "Rec. 709"
@@ -513,7 +514,7 @@ msgstr "Trailer"
 
 #: src/lib/transcode_job.cc:53
 msgid "Transcode %1"
-msgstr "Wandle %1 um."
+msgstr "Wandle %1 um"
 
 #: src/lib/dcp_content_type.cc:48
 msgid "Transitional"
@@ -525,7 +526,7 @@ msgstr "Ungültiger ZIP Inhalt"
 
 #: src/lib/image_proxy.cc:172
 msgid "Unexpected image type received by server"
-msgstr ""
+msgstr "Ungültiges Bildformat vom Server erhalten"
 
 #: src/lib/job.cc:120
 msgid "Unknown error"
@@ -537,7 +538,7 @@ msgstr "Ton Sample Format (%1) nicht erkannt."
 
 #: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
-msgstr "Maske mit Gaußschem Unschärfefilter"
+msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 
 #: src/lib/colour_conversion.cc:140
 msgid "Untitled"
@@ -545,7 +546,7 @@ msgstr "Unbenannt"
 
 #: src/lib/util.cc:756
 msgid "Visually impaired"
-msgstr "Sehbehindert"
+msgstr "VI"
 
 #: src/lib/scp_dcp_job.cc:104
 msgid "Waiting"
@@ -601,7 +602,7 @@ msgstr "Datei %1 konnte nicht erstellt werden."
 
 #: src/lib/ffmpeg.cc:177
 msgid "could not find audio decoder"
-msgstr "Kein Ton Decoder gefunden."
+msgstr "Ton Dekoder nicht gefunden."
 
 #: src/lib/ffmpeg.cc:106
 msgid "could not find stream information"
@@ -609,7 +610,7 @@ msgstr "Keine Spur-Information gefunden"
 
 #: src/lib/ffmpeg.cc:156
 msgid "could not find video decoder"
-msgstr "Bild-Decoder nicht gefunden"
+msgstr "Bild-Dekoder nicht gefunden"
 
 #: src/lib/writer.cc:428
 msgid "could not move audio MXF into the DCP (%1)"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 70c8239f3..6f93bba55 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 2eb72d47c..e9e67bf4f 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-06-20 15:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 04b14a0cb..365360260 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 52c2c9b35..eae118175 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-03-30 19:39+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 0197026f1..ef2c36d85 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: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 3a25b0e81..79eab5fb7 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
-"PO-Revision-Date: 2014-06-20 03:38+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-21 02:38+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/tools/dcpomatic.cc:370
@@ -30,7 +30,7 @@ msgstr "&Projekt hinzufügen"
 
 #: src/tools/dcpomatic.cc:243
 msgid "&Content"
-msgstr ""
+msgstr "&Quelle"
 
 #: src/tools/dcpomatic.cc:241
 msgid "&Edit"
@@ -100,7 +100,7 @@ msgstr "Über DCP-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:84
 msgid "Add Film..."
-msgstr "Film hinzufügen..."
+msgstr "Projekt hinzufügen..."
 
 #: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
@@ -116,7 +116,7 @@ msgstr "Ein unbekannter Fehler ist aufgetreten."
 
 #: src/tools/dcpomatic.cc:480
 msgid "CPL's content is not encrypted."
-msgstr ""
+msgstr "Medien der CPL sind nicht verschlüsselt worden."
 
 #: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
@@ -186,11 +186,11 @@ msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
 #: src/tools/dcpomatic.cc:219
 msgid "Scale to fit &height"
-msgstr ""
+msgstr "Skalieren auf &Höhe DCI-Container"
 
 #: src/tools/dcpomatic.cc:218
 msgid "Scale to fit &width"
-msgstr ""
+msgstr "Skalieren auf &Breite DCI-Container"
 
 #: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 0c0cc007f..92d9a7853 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-04-20 10:21-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index f8b6a4b58..832f409b9 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-06-20 15:57+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index dc800bf08..dc30ef04c 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 89adcfff9..5730dadad 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-03-30 19:38+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index b962e4b48..bf69aafc9 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: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index e65e931d0..0f3f6e61f 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -753,7 +753,7 @@ public:
 		_log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
 		table->AddSpacer (0);
 		table->Add (_log_error, 1, wxEXPAND | wxALL);
-		_log_timing = new wxCheckBox (panel, wxID_ANY, _("Timing"));
+		_log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
 		table->AddSpacer (0);
 		table->Add (_log_timing, 1, wxEXPAND | wxALL);
 
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 42b8297f0..6750e0e98 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -96,7 +96,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
 
 	/* Sub-heading: Timing */
-	h = new wxStaticText (this, wxID_ANY, _("Timing"));
+	h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing"));
 	h->SetFont (subheading_font);
 	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 	
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index d7db129bc..52e3a2cc4 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
-"PO-Revision-Date: 2014-06-20 04:18+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"PO-Revision-Date: 2014-06-21 04:06+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
@@ -31,7 +31,7 @@ msgstr ""
 
 #: src/wx/config_dialog.cc:121
 msgid "(password will be stored on disk in plaintext)"
-msgstr "(Passwort wird im Klartext gespeichert)"
+msgstr "(Passwort wird im Klartext gespeichert!)"
 
 #: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
@@ -39,7 +39,7 @@ msgstr "(Programm zum Ändern der Sprache neu starten)"
 
 #: src/wx/audio_mapping_view.cc:134
 msgid "-6dB"
-msgstr ""
+msgstr "-6dB"
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
@@ -54,9 +54,8 @@ msgid "2D"
 msgstr "2D"
 
 #: src/wx/isdcf_metadata_dialog.cc:68
-#, fuzzy
 msgid "2D version of content available in 3D"
-msgstr "Eine neue Version von DCP-o-matic ist verfügbar."
+msgstr "2D Version eines Films, der auch in 3D verfügbar ist"
 
 #: src/wx/film_editor.cc:224
 msgid "2K"
@@ -119,9 +118,8 @@ msgid "Add..."
 msgstr "Hinzufügen..."
 
 #: src/wx/config_dialog.cc:743
-#, fuzzy
 msgid "Allow any DCP frame rate"
-msgstr "Bildwiederholrate"
+msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 
 #: src/wx/about_dialog.cc:109
 msgid "Artwork by"
@@ -197,17 +195,16 @@ msgid "C"
 msgstr "C"
 
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
-#, fuzzy
 msgid "CPL"
-msgstr "DCP"
+msgstr "CPL"
 
 #: src/wx/kdm_dialog.cc:143
 msgid "CPL ID"
-msgstr ""
+msgstr "CPL ID"
 
 #: src/wx/kdm_dialog.cc:146
 msgid "CPL annotation text"
-msgstr ""
+msgstr "CPL annotation text"
 
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
@@ -228,7 +225,7 @@ msgstr "Zertifikat heruntergeladen"
 
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
-msgstr ""
+msgstr "Kinokette"
 
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
@@ -263,7 +260,6 @@ msgid "Cinema"
 msgstr "Kino"
 
 #: src/wx/config_dialog.cc:547
-#, fuzzy
 msgid "Colour Conversions"
 msgstr "Farbumwandlungen"
 
@@ -272,6 +268,11 @@ msgstr "Farbumwandlungen"
 msgid "Colour conversion"
 msgstr "Farbumwandlung"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Timing"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Container"
@@ -312,6 +313,11 @@ msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
 msgid "Could not make DCP: %s"
 msgstr "DCP konnte nicht erstellt werden: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "Land"
@@ -339,7 +345,7 @@ msgstr "DCP Name"
 
 #: src/wx/kdm_dialog.cc:140
 msgid "DCP directory"
-msgstr ""
+msgstr "DCP Verzeichnis"
 
 #: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
@@ -351,9 +357,8 @@ msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic Ton - %s"
 
 #: src/wx/config_dialog.cc:317
-#, fuzzy
 msgid "Default ISDCF name details"
-msgstr "Standard DCI Name Details"
+msgstr "Standard ISDCF Name Details"
 
 #: src/wx/config_dialog.cc:330
 msgid "Default JPEG2000 bandwidth"
@@ -361,7 +366,7 @@ msgstr "Standard JPEG2000 Datenrate"
 
 #: src/wx/config_dialog.cc:339
 msgid "Default audio delay"
-msgstr "Standard Ton Delay"
+msgstr "Standard Ton Verzögerung"
 
 #: src/wx/config_dialog.cc:321
 msgid "Default container"
@@ -373,23 +378,23 @@ msgstr "Standard Inhalt Typ"
 
 #: src/wx/config_dialog.cc:351
 msgid "Default creator"
-msgstr "Standard Erzeuger"
+msgstr "Standard 'creator' (DCI)"
 
 #: src/wx/config_dialog.cc:309
 msgid "Default directory for new films"
-msgstr "Standard Ordner für neue Filme"
+msgstr "Standard Ordner für neue Projekte"
 
 #: src/wx/config_dialog.cc:301
 msgid "Default duration of still images"
-msgstr "Standard Länge der Standbilder"
+msgstr "Standard Länge für Standbilder"
 
 #: src/wx/config_dialog.cc:347
 msgid "Default issuer"
-msgstr "Standard Herausgeber"
+msgstr "Standard 'issuer' (DCI)"
 
 #: src/wx/config_dialog.cc:280
 msgid "Defaults"
-msgstr "Standards"
+msgstr "Vorgaben"
 
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
@@ -428,7 +433,7 @@ msgstr "Lade Zertifikat"
 #: src/wx/dolby_certificate_dialog.cc:132
 #: src/wx/doremi_certificate_dialog.cc:52
 msgid "Downloading certificate"
-msgstr "Zertifikat wird heruntergeladen"
+msgstr "Zertifikat wird heruntergeladen..."
 
 #: src/wx/kdm_dialog.cc:81
 msgid "Edit Cinema..."
@@ -450,15 +455,15 @@ msgstr "Absender Email Adresse (KDM Zustellung)"
 
 #: src/wx/servers_list_dialog.cc:30
 msgid "Encoding Servers"
-msgstr "Encodier Server"
+msgstr "Enkodier Server"
 
 #: src/wx/film_editor.cc:162
 msgid "Encrypted"
-msgstr "Verschlüsselt"
+msgstr "Verschlüsselt (-> KDM Erstellung)"
 
 #: src/wx/config_dialog.cc:753
 msgid "Errors"
-msgstr ""
+msgstr "Fehler"
 
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
@@ -509,15 +514,15 @@ msgstr "Von"
 
 #: src/wx/config_dialog.cc:125
 msgid "From address for KDM emails"
-msgstr "Absender Adresse für KDM Emails"
+msgstr "Absenderadresse (KDM Zustellung)"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
 msgstr "Voll"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
-msgstr "Ganze Länge"
+msgstr "Gesamtlänge"
 
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
@@ -534,7 +539,7 @@ msgstr "Gb"
 
 #: src/wx/config_dialog.cc:748
 msgid "General"
-msgstr ""
+msgstr "Allgemein"
 
 #: src/wx/audio_mapping_view.cc:301
 msgid "HI"
@@ -569,9 +574,8 @@ msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
 #: src/wx/isdcf_metadata_dialog.cc:30
-#, fuzzy
 msgid "ISDCF name"
-msgstr "DCI Name"
+msgstr "ISDCF Name"
 
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
@@ -587,13 +591,17 @@ msgstr "JPEG2000 Datenrate"
 
 #: src/wx/content_menu.cc:51
 msgid "Join"
-msgstr "Mitmachen"
+msgstr "Verbinden"
 
 #: src/wx/config_dialog.cc:680
-#, fuzzy
 msgid "KDM Email"
 msgstr "KDM Email"
 
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Timing"
+
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Bildreihenfolge beibehalten"
@@ -624,7 +632,7 @@ msgstr "Lade aus Datei..."
 
 #: src/wx/config_dialog.cc:747
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
@@ -640,7 +648,7 @@ msgstr "Mail Passwort (KDM Zustellung)"
 
 #: src/wx/config_dialog.cc:113
 msgid "Mail user name"
-msgstr "Mail Benutzername (KDM Zustellung)"
+msgstr "Mail Benutzername/Login (KDM Zustellung)"
 
 #: src/wx/kdm_dialog.cc:49
 msgid "Make KDMs"
@@ -648,7 +656,7 @@ msgstr "KDMs erstellen"
 
 #: src/wx/isdcf_metadata_dialog.cc:71
 msgid "Mastered luminance (e.g. 4fl)"
-msgstr ""
+msgstr "Zielhelligkeit (z.B. '4fL' für 3D)"
 
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
@@ -656,7 +664,7 @@ msgstr "Matrix"
 
 #: src/wx/config_dialog.cc:739
 msgid "Maximum JPEG2000 bandwidth"
-msgstr "Maximale JPEG2000 Datenrate"
+msgstr "Maximale JPEG2000 Datenrate(!)"
 
 #: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
 msgid "Mbit/s"
@@ -672,6 +680,7 @@ msgstr "Meine Dokumente"
 
 #: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Name"
 
@@ -702,20 +711,19 @@ msgstr "Andere"
 
 #: src/wx/config_dialog.cc:109
 msgid "Outgoing mail server"
-msgstr "Ausgehender Mail Server (KDM Zustellung)"
+msgstr "Ausgehender/SMTP Mail Server (KDM Zustellung)"
 
 #: src/wx/kdm_dialog.cc:156
-#, fuzzy
 msgid "Output"
-msgstr "Ausgangs Gamma"
+msgstr "Ausgabe"
 
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
-msgstr "Ausgangs Gamma"
+msgstr "Ziel Gamma"
 
 #: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
-msgstr "DCP Paket Typ (e.g. OV)"
+msgstr "DCP Paket Typ (z.B. OV)"
 
 #: src/wx/video_panel.cc:325
 #, c-format
@@ -738,7 +746,7 @@ msgstr "Spitze"
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Abspiellänge"
 
@@ -746,13 +754,13 @@ msgstr "Abspiellänge"
 msgid "Please wait; audio is being analysed..."
 msgstr "Bitte warten; Ton wird analysiert..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
-msgstr "Position"
+msgstr "Startposition"
 
 #: src/wx/isdcf_metadata_dialog.cc:59
 msgid "Pre-release"
-msgstr ""
+msgstr "Vorabversion"
 
 #: src/wx/audio_mapping_view.cc:281
 msgid "R"
@@ -764,7 +772,7 @@ msgstr "RMS"
 
 #: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
-msgstr "FSK (z.B. 12)"
+msgstr "Freigabe (z.B. FSK12)"
 
 #: src/wx/audio_mapping_view.cc:313
 msgid "Rc"
@@ -772,7 +780,7 @@ msgstr "Rc"
 
 #: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Red band"
-msgstr ""
+msgstr "Red band (USA, für explizite Inhalte)"
 
 #: src/wx/content_menu.cc:54 src/wx/film_editor.cc:283
 #: src/wx/editable_list.h:66
@@ -837,13 +845,12 @@ msgid "Scaler"
 msgstr "Skalierer"
 
 #: src/wx/kdm_dialog.cc:60
-#, fuzzy
 msgid "Screens"
-msgstr "Saal hinzufügen..."
+msgstr "Saal"
 
 #: src/wx/kdm_dialog.cc:515
 msgid "Select CPL XML file"
-msgstr ""
+msgstr "CPL XML Datei auswählen"
 
 #: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
@@ -861,16 +868,20 @@ msgstr "Seriennummer"
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Server Seriennummer"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Server Seriennummer"
 
 #: src/wx/config_dialog.cc:485
-#, fuzzy
 msgid "Servers"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Setzen"
 
@@ -892,7 +903,7 @@ msgstr "Glätten"
 
 #: src/wx/timeline_dialog.cc:38
 msgid "Snap"
-msgstr "Einschnappen"
+msgstr "Anschließen"
 
 #: src/wx/update_dialog.cc:43
 msgid "Stable version "
@@ -943,7 +954,6 @@ msgid "Target path"
 msgstr "Zielpfad"
 
 #: src/wx/isdcf_metadata_dialog.cc:56
-#, fuzzy
 msgid "Temp version"
 msgstr "Test Version"
 
@@ -971,7 +981,7 @@ msgstr ""
 
 #: src/wx/hints_dialog.cc:97
 msgid "There are no hints: everything looks good!"
-msgstr "Keine Tipps: Alles sieht gut aus!"
+msgstr "Keine Warnungen: Alles sieht gut aus!"
 
 #: src/wx/film_viewer.cc:134
 msgid "There is not enough free memory to do that."
@@ -979,7 +989,7 @@ msgstr "Für diese Operation ist nicht genug freier Speicher verfügbar."
 
 #: src/wx/kdm_dialog.cc:537
 msgid "This is not a valid CPL file"
-msgstr ""
+msgstr "Dies ist keine gültige CPL Datei"
 
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
@@ -995,15 +1005,15 @@ msgstr "Zeit"
 
 #: src/wx/timeline_dialog.cc:32
 msgid "Timeline"
-msgstr "Timeline"
+msgstr "Zeitleiste"
 
 #: src/wx/film_editor.cc:289
 msgid "Timeline..."
-msgstr "Timeline..."
+msgstr "Zeitleiste..."
 
-#: src/wx/config_dialog.cc:756 src/wx/kdm_dialog.cc:99
-#: src/wx/timing_panel.cc:34
-msgid "Timing"
+#: src/wx/timing_panel.cc:35
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Timing"
 
 #: src/wx/video_panel.cc:110
@@ -1014,11 +1024,11 @@ msgstr "Oben beschneiden"
 msgid "Translated by"
 msgstr "Übersetzt von"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Schnitt vom Ende"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Schnitt vom Anfang"
 
@@ -1047,13 +1057,12 @@ msgid "Update"
 msgstr "Update"
 
 #: src/wx/film_editor.cc:128
-#, fuzzy
 msgid "Use ISDCF name"
-msgstr "DCI Name benutzen"
+msgstr "ISDCF Name benutzen"
 
 #: src/wx/config_dialog.cc:501
 msgid "Use all servers"
-msgstr "Alle Server benutzen"
+msgstr "Alle verfügbaren Server im Subnetz benutzen"
 
 #: src/wx/film_editor.cc:152
 msgid "Use best"
@@ -1075,13 +1084,13 @@ msgstr "VI"
 msgid "Video"
 msgstr "Bild"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Bildwiederholrate"
 
 #: src/wx/config_dialog.cc:750
 msgid "Warnings"
-msgstr ""
+msgstr "Warnungen"
 
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 3294ca37e..df5a134da 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-04-20 12:06-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -268,6 +268,11 @@ msgstr "Conversiones de color"
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Tiempo"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Continente"
@@ -308,6 +313,11 @@ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "No se pudo abrir el fichero (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "País"
@@ -510,7 +520,7 @@ msgstr "Remitente para los emails de KDM"
 msgid "Full"
 msgstr "Completo"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Duración completa"
 
@@ -588,6 +598,11 @@ msgstr "Unir"
 msgid "KDM Email"
 msgstr "Email KDM"
 
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Tiempo"
+
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
@@ -666,6 +681,7 @@ msgstr "Mis documentos"
 
 #: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
 
@@ -732,7 +748,7 @@ msgstr "Pico"
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Duración"
 
@@ -740,7 +756,7 @@ msgstr "Duración"
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Posición"
 
@@ -856,6 +872,11 @@ msgstr "Número de serie"
 msgid "Server"
 msgstr "Servidor"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Número de serie del servidor"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Número de serie del servidor"
@@ -864,7 +885,7 @@ msgstr "Número de serie del servidor"
 msgid "Servers"
 msgstr "Servidores"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Seleccionar"
 
@@ -994,9 +1015,9 @@ msgstr "Línea de tiempo"
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
-#: src/wx/config_dialog.cc:756 src/wx/kdm_dialog.cc:99
-#: src/wx/timing_panel.cc:34
-msgid "Timing"
+#: src/wx/timing_panel.cc:35
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Tiempo"
 
 #: src/wx/video_panel.cc:110
@@ -1007,11 +1028,11 @@ msgstr "Recortar arriba"
 msgid "Translated by"
 msgstr "Traducido por"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Recortar del final"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Recortar del inicio"
 
@@ -1068,7 +1089,7 @@ msgstr "VI"
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Velocidad de imagen"
 
@@ -1160,6 +1181,9 @@ msgstr "veces"
 msgid "video"
 msgstr "vídeo"
 
+#~ msgid "Timing"
+#~ msgstr "Tiempo"
+
 #~ msgid "-3dB"
 #~ msgstr "-3dB"
 
@@ -1218,9 +1242,6 @@ msgstr "vídeo"
 #~ msgid "Colour look-up table"
 #~ msgstr "Tabla de referencia de colores"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "No se pudo abrir el fichero (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "No se pudo establecer el contenido: %s"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index f7fe6c6c4..f7c81d4dd 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-06-20 16:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -268,6 +268,11 @@ msgstr "Conversions Couleurs"
 msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Durée"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Format"
@@ -308,6 +313,11 @@ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Ouverture du contenu impossible (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "Pays"
@@ -508,7 +518,7 @@ msgstr "Email expéditeur pour les envoi de KDM"
 msgid "Full"
 msgstr "Plein"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Durée totale"
 
@@ -585,6 +595,11 @@ msgstr "Ajouter"
 msgid "KDM Email"
 msgstr "e-mail KDM"
 
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Durée"
+
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Garder la vidéo"
@@ -663,6 +678,7 @@ msgstr "Mes Documents"
 
 #: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
 
@@ -728,7 +744,7 @@ msgstr "Crête"
 msgid "Play"
 msgstr "Lecture"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Durée de lecture"
 
@@ -736,7 +752,7 @@ msgstr "Durée de lecture"
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Position"
 
@@ -850,6 +866,11 @@ msgstr "Numéro de Série"
 msgid "Server"
 msgstr "Serveur"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Numéro de Série du Serveur"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Numéro de Série du Serveur"
@@ -858,7 +879,7 @@ msgstr "Numéro de Série du Serveur"
 msgid "Servers"
 msgstr "Serveurs"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Sélection"
 
@@ -988,9 +1009,9 @@ msgstr "Timeline"
 msgid "Timeline..."
 msgstr "Timeline..."
 
-#: src/wx/config_dialog.cc:756 src/wx/kdm_dialog.cc:99
-#: src/wx/timing_panel.cc:34
-msgid "Timing"
+#: src/wx/timing_panel.cc:35
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Durée"
 
 #: src/wx/video_panel.cc:110
@@ -1001,11 +1022,11 @@ msgstr "Découpe haut"
 msgid "Translated by"
 msgstr "Traduit par"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Exclure à la fin"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Exclure au début"
 
@@ -1061,7 +1082,7 @@ msgstr "VI"
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Cadence vidéo"
 
@@ -1153,6 +1174,9 @@ msgstr "fois"
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Timing"
+#~ msgstr "Durée"
+
 #~ msgid "-3dB"
 #~ msgstr "-3dB"
 
@@ -1222,9 +1246,6 @@ msgstr "vidéo"
 #~ msgid "Colour look-up table"
 #~ msgstr "Espace colorimétrique"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "Ouverture du contenu impossible (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "Sélectionner du contenu impossible : %s"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index b07e2b120..db7342be0 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -272,6 +272,10 @@ msgstr "Conversioni colore"
 msgid "Colour conversion"
 msgstr "Conversione colore"
 
+#: src/wx/config_dialog.cc:756
+msgid "Config|Timing"
+msgstr ""
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Contenitore"
@@ -312,6 +316,11 @@ msgstr "Non posso decodificare il video per guardarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Non posso aprire il file del contenuto (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr ""
@@ -518,7 +527,7 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr ""
 
@@ -597,6 +606,10 @@ msgstr ""
 msgid "KDM Email"
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:99
+msgid "KDM|Timing"
+msgstr ""
+
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Tieni i video in sequenza"
@@ -678,6 +691,7 @@ msgstr "Documenti"
 
 #: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
 
@@ -745,7 +759,7 @@ msgstr "Picco"
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr ""
 
@@ -753,7 +767,7 @@ msgstr ""
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Posizione"
 
@@ -869,6 +883,10 @@ msgstr ""
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+msgid "Server manufacturer"
+msgstr ""
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr ""
@@ -878,7 +896,7 @@ msgstr ""
 msgid "Servers"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr ""
 
@@ -1009,9 +1027,8 @@ msgstr "Timeline"
 msgid "Timeline..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:756 src/wx/kdm_dialog.cc:99
-#: src/wx/timing_panel.cc:34
-msgid "Timing"
+#: src/wx/timing_panel.cc:35
+msgid "Timing|Timing"
 msgstr ""
 
 #: src/wx/video_panel.cc:110
@@ -1022,11 +1039,11 @@ msgstr "Taglio in alto"
 msgid "Translated by"
 msgstr ""
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Taglia dalla fine"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Taglia dall'inizio"
 
@@ -1085,7 +1102,7 @@ msgstr "VI"
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Frequenza fotogrammi video"
 
@@ -1230,9 +1247,6 @@ msgstr "Video"
 #~ msgid "Colour look-up table"
 #~ msgstr "Tabella per ricerca del colore"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "Non posso aprire il file del contenuto (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "Non posso regolare il contenuto: %s"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 6b125d567..948511ddb 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-03-30 19:40+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -274,6 +274,11 @@ msgstr "Colour Conversions"
 msgid "Colour conversion"
 msgstr "Colour conversion"
 
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Timing"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Container"
@@ -314,6 +319,11 @@ msgstr "Kan video niet decoderen voor preview (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kan geen DCP maken: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Kan video niet decoderen voor preview (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "Land"
@@ -515,7 +525,7 @@ msgstr "Van adres voor KDM emails"
 msgid "Full"
 msgstr "Volledig"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Volledige lengte"
 
@@ -593,6 +603,11 @@ msgstr "Samenvoegen"
 msgid "KDM Email"
 msgstr "KDM Email"
 
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Timing"
+
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
 msgstr "Behoud video in tijdlijn"
@@ -671,6 +686,7 @@ msgstr "Mijn documenten"
 
 #: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Naam"
 
@@ -739,7 +755,7 @@ msgstr "Piek"
 msgid "Play"
 msgstr "Afspelen"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Afspeellengte"
 
@@ -747,7 +763,7 @@ msgstr "Afspeellengte"
 msgid "Please wait; audio is being analysed..."
 msgstr "Een ogenblik geduld, het audio wordt geanalyseerd..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Positie"
 
@@ -862,6 +878,11 @@ msgstr "Serie nummer"
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+#, fuzzy
+msgid "Server manufacturer"
+msgstr "Server serie nummer"
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr "Server serie nummer"
@@ -870,7 +891,7 @@ msgstr "Server serie nummer"
 msgid "Servers"
 msgstr "Servers"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Instellen"
 
@@ -1001,9 +1022,9 @@ msgstr "Tijdlijn"
 msgid "Timeline..."
 msgstr "Tijdlijn..."
 
-#: src/wx/config_dialog.cc:756 src/wx/kdm_dialog.cc:99
-#: src/wx/timing_panel.cc:34
-msgid "Timing"
+#: src/wx/timing_panel.cc:35
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Timing"
 
 #: src/wx/video_panel.cc:110
@@ -1014,11 +1035,11 @@ msgstr "Top crop"
 msgid "Translated by"
 msgstr "Vertaald door"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Trim vanaf einde"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Trim vanaf begin"
 
@@ -1075,7 +1096,7 @@ msgstr "VI"
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Video frame rate"
 
@@ -1166,5 +1187,8 @@ msgstr "tijden"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Timing"
+#~ msgstr "Timing"
+
 #~ msgid "-3dB"
 #~ msgstr "-3dB"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 116bfdb21..68e193c02 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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: 2014-06-20 11:11+0100\n"
+"POT-Creation-Date: 2014-06-21 14:51+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -276,6 +276,12 @@ msgstr "Färgkonverteringar"
 msgid "Colour conversion"
 msgstr "Färgkonvertering"
 
+# Svengelska
+#: src/wx/config_dialog.cc:756
+#, fuzzy
+msgid "Config|Timing"
+msgstr "Tajming"
+
 #: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Innehåll"
@@ -316,6 +322,11 @@ msgstr "Kunde inte avkoda video för visning (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
+#: src/wx/screen_dialog.cc:95
+#, fuzzy
+msgid "Could not read certificate file (%1)"
+msgstr "Kunde inte öppna innehållsfilen (%s)"
+
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr ""
@@ -523,7 +534,7 @@ msgstr "Avsändare för KDM-mejl"
 msgid "Full"
 msgstr "Full"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Full längd"
 
@@ -602,6 +613,12 @@ msgstr "Anslut"
 msgid "KDM Email"
 msgstr "KDM mejl"
 
+# Svengelska
+#: src/wx/kdm_dialog.cc:99
+#, fuzzy
+msgid "KDM|Timing"
+msgstr "Tajming"
+
 # "sekvens" eller "ordning"?
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
@@ -683,6 +700,7 @@ msgstr "Mina Dokument"
 
 #: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/screen_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
 
@@ -751,7 +769,7 @@ msgstr "Topp"
 msgid "Play"
 msgstr "Spela"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Spellängd"
 
@@ -759,7 +777,7 @@ msgstr "Spellängd"
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Position"
 
@@ -876,6 +894,10 @@ msgstr ""
 msgid "Server"
 msgstr "Server"
 
+#: src/wx/screen_dialog.cc:41
+msgid "Server manufacturer"
+msgstr ""
+
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
 msgstr ""
@@ -885,7 +907,7 @@ msgstr ""
 msgid "Servers"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Sätt"
 
@@ -1020,9 +1042,9 @@ msgid "Timeline..."
 msgstr "Tidslinje..."
 
 # Svengelska
-#: src/wx/config_dialog.cc:756 src/wx/kdm_dialog.cc:99
-#: src/wx/timing_panel.cc:34
-msgid "Timing"
+#: src/wx/timing_panel.cc:35
+#, fuzzy
+msgid "Timing|Timing"
 msgstr "Tajming"
 
 #: src/wx/video_panel.cc:110
@@ -1033,11 +1055,11 @@ msgstr "Övre beskärning"
 msgid "Translated by"
 msgstr "Översatt av"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Trimma från slut"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Trimma från start"
 
@@ -1097,7 +1119,7 @@ msgstr "VI"
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
@@ -1189,6 +1211,10 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
+# Svengelska
+#~ msgid "Timing"
+#~ msgstr "Tajming"
+
 #~ msgid "-3dB"
 #~ msgstr "-3dB"
 
@@ -1250,9 +1276,6 @@ msgstr "video"
 #~ msgid "Colour look-up table"
 #~ msgstr "Färguppslagningstabell"
 
-#~ msgid "Could not open content file (%s)"
-#~ msgstr "Kunde inte öppna innehållsfilen (%s)"
-
 #~ msgid "Could not set content: %s"
 #~ msgstr "Kunde inte fastställa innehåll: %s"
 
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index b702ae0ad..7d795ec44 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -35,10 +35,10 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
 	: TableDialog (parent, std_to_wx (title), 2, true)
 	, _certificate (certificate)
 {
-	add ("Name", true);
+	add (_("Name"), true);
 	_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
 
-	add ("Server manufacturer", true);
+	add (_("Server manufacturer"), true);
 	_manufacturer = add (new wxChoice (this, wxID_ANY));
 
 	add (_("Certificate"), true);
@@ -92,7 +92,7 @@ ScreenDialog::load_certificate (boost::filesystem::path file)
 		_certificate.reset (new libdcp::Certificate (file));
 		_certificate_text->SetValue (_certificate->certificate ());
 	} catch (libdcp::MiscError& e) {
-		error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+		error_dialog (this, String::compose (_("Could not read certificate file (%1)"), e.what()));
 	}
 }
 
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 6d9bf4539..5d21d0a02 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -31,7 +31,8 @@ using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 TimingPanel::TimingPanel (FilmEditor* e)
-	: FilmEditorPanel (e, _("Timing"))
+	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
+	: FilmEditorPanel (e, S_("Timing|Timing"))
 {
 	wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
 	_sizer->Add (grid, 0, wxALL, 8);
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index b73cd490d..218a786b2 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -319,3 +319,21 @@ run_gui_loop ()
 		wxTheApp->Dispatch ();
 	}
 }
+
+/** @param s String of the form Context|String
+ *  @return translation, or String if no translation is available.
+ */
+wxString
+context_translation (wxString s)
+{
+	wxString t = wxGetTranslation (s);
+	if (t == s) {
+		/* No translation; strip the context */
+		int c = t.Find (wxT ("|"));
+		if (c != wxNOT_FOUND) {
+			t = t.Mid (c + 1);
+		}
+	}
+
+	return t;
+}
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 12a7115d5..6dfc0bf5c 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -17,6 +17,10 @@
 
 */
 
+/** @file src/wx/wx_util.h
+ *  @brief Some utility functions and classes.
+ */
+
 #ifndef DCPOMATIC_WX_UTIL_H
 #define DCPOMATIC_WX_UTIL_H
 
@@ -46,9 +50,11 @@ class wxGridBagSizer;
 #define DCPOMATIC_BUTTON_STACK_GAP 0
 #endif
 
-/** @file src/wx/wx_util.h
- *  @brief Some utility functions and classes.
+/** i18n macro to support strings like Context|String
+ *  so that `String' can be translated to different things
+ *  in different contexts.
  */
+#define S_(x) context_translation(x)
 
 extern void error_dialog (wxWindow *, wxString);
 extern bool confirm_dialog (wxWindow *, wxString);
@@ -58,6 +64,7 @@ extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
 extern void run_gui_loop ();
+extern wxString context_translation (wxString);
 
 /** @class ThreadedStaticText
  *