Some label copy-editing and more manual work.

16 files changed, 95 insertions, 6 deletions

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 9e74b4dff..cb8c9bc01 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -9,7 +9,7 @@ DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg timecode.svg
 SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-content-file.png \
                still-select-content-file.png examine-thumbs.png examine-content.png timing-tab.png \
                calculate-audio-gain.png add-file.png dcp-tab.png colour-conversion.png \
-               prefs-kdm-email.png prefs-colour-conversions.png prefs-metadata.png prefs-general.png prefs-tms.png \
+               prefs-kdm-email.png prefs-general.png prefs-tms.png \
                prefs-advanced.png prefs-defaults.png prefs-servers.png prefs-keys.png \
                making-dcp.png filters.png video-tab.png audio-tab.png subtitles-tab.png timing-tab.png \
                audio-plot.png audio-map-eg1.png audio-map-eg2.png audio-map-eg3.png kdm.png \
diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index 1b9418c78..1ee817b5d 100644
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -2769,10 +2769,37 @@ Note that for this to work on Doremi servers you will need to set the
 
 <!-- ============================================================== -->
 <section>
+<title>Email</title>
+
+<para>
+The Email tab is shown in <xref linkend="fig-prefs-email"/>.
+</para>
+
+<figure id="fig-prefs-email">
+  <title>Email preferences</title>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="screenshots/prefs-email&scs;"/>
+    </imageobject>
+  </mediaobject>
+</figure>
+
+<para>
+These settings are used when DCP-o-matic sends emails.
+</para>
+
+<para>
+  <guilabel>Outgoing mail server</guilabel> should be the host name of a mail (SMTP) server that DCP-o-matic can use.  You can also specify the port that DCP-o-matic should use.  <guilabel>User name</guilabel> and <guilabel>Password</guilabel> are the credentials that are required to send email through the server you have specified.
+</para>
+
+</section>
+
+<!-- ============================================================== -->
+<section>
 <title>KDM email</title>
 
 <para>
-The KDM email is shown in <xref linkend="fig-prefs-kdm-email"/>.
+The KDM email tab is shown in <xref linkend="fig-prefs-kdm-email"/>.
 </para>
 
 <figure id="fig-prefs-kdm-email">
@@ -2823,6 +2850,68 @@ The <guilabel>Reset to default text</guilabel> will replace the current KDM emai
 
 <!-- ============================================================== -->
 <section>
+<title>Accounts</title>
+
+<para>
+The Accounts tab is shown in <xref linkend="fig-prefs-accounts"/>.
+</para>
+
+<figure id="fig-prefs-accounts">
+  <title>Accounts preferences</title>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="screenshots/prefs-accounts&scs;"/>
+    </imageobject>
+  </mediaobject>
+</figure>
+
+<para>
+DCP-o-matic can download projector certificates from the Barco and
+Christie websites if you have the appropriate credentials.  Enter your
+usernames and passwords.
+</para>
+
+</section>
+
+
+<!-- ============================================================== -->
+<section>
+<title>Notifications</title>
+
+<para>
+The Notifications tab is shown in <xref linkend="fig-prefs-notifications"/>.
+</para>
+
+<figure id="fig-prefs-notifications">
+  <title>Notifications preferences</title>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="screenshots/prefs-notifications&scs;"/>
+    </imageobject>
+  </mediaobject>
+</figure>
+
+<para>
+DCP-o-matic can notify the user when jobs have completed.  These
+notifications can be either or both of a message box on-screen (if
+<guilabel>Message box</guilabel> is ticked) and email (if
+<guilabel>Email</guilabel> is ticked).  If you enable email
+notifications you can fill in the details of the emails you want to
+send.
+</para>
+
+<para>
+The bottom box in the tab is the contents of the email that should
+be sent.  DCP-o-matic will replace the &lsquo;magic&rsquo; strings
+<code>$JOB_NAME</code> and <code>$JOB_STATUS</code> in the with the
+details of the job that has completed.
+</para>
+
+</section>
+
+
+<!-- ============================================================== -->
+<section>
 <title>Cover sheet</title>
 
 <para>
diff --git a/doc/manual/screenshots/prefs-accounts.png b/doc/manual/screenshots/prefs-accounts.png
index e9ab53780..e919e6abf 100644
--- a/doc/manual/screenshots/prefs-accounts.png
+++ b/doc/manual/screenshots/prefs-accounts.png
diff --git a/doc/manual/screenshots/prefs-advanced.png b/doc/manual/screenshots/prefs-advanced.png
index 538dfc1c0..2bc76a24e 100644
--- a/doc/manual/screenshots/prefs-advanced.png
+++ b/doc/manual/screenshots/prefs-advanced.png
diff --git a/doc/manual/screenshots/prefs-colour-conversions.png b/doc/manual/screenshots/prefs-colour-conversions.png
deleted file mode 100644
index 93b0dcf76..000000000
--- a/doc/manual/screenshots/prefs-colour-conversions.png
+++ /dev/null
diff --git a/doc/manual/screenshots/prefs-cover-sheet.png b/doc/manual/screenshots/prefs-cover-sheet.png
index c1103a5c5..b6daa26e0 100644
--- a/doc/manual/screenshots/prefs-cover-sheet.png
+++ b/doc/manual/screenshots/prefs-cover-sheet.png
diff --git a/doc/manual/screenshots/prefs-defaults.png b/doc/manual/screenshots/prefs-defaults.png
index 476db859b..a1e95594b 100644
--- a/doc/manual/screenshots/prefs-defaults.png
+++ b/doc/manual/screenshots/prefs-defaults.png
diff --git a/doc/manual/screenshots/prefs-email.png b/doc/manual/screenshots/prefs-email.png
index 122540f98..5fd7f5c80 100644
--- a/doc/manual/screenshots/prefs-email.png
+++ b/doc/manual/screenshots/prefs-email.png
diff --git a/doc/manual/screenshots/prefs-general.png b/doc/manual/screenshots/prefs-general.png
index b726df1b7..211c4ce5e 100644
--- a/doc/manual/screenshots/prefs-general.png
+++ b/doc/manual/screenshots/prefs-general.png
diff --git a/doc/manual/screenshots/prefs-kdm-email.png b/doc/manual/screenshots/prefs-kdm-email.png
index 6627c2ee4..b23d7971b 100644
--- a/doc/manual/screenshots/prefs-kdm-email.png
+++ b/doc/manual/screenshots/prefs-kdm-email.png
diff --git a/doc/manual/screenshots/prefs-keys.png b/doc/manual/screenshots/prefs-keys.png
index d9b1387a4..2cb66446d 100644
--- a/doc/manual/screenshots/prefs-keys.png
+++ b/doc/manual/screenshots/prefs-keys.png
diff --git a/doc/manual/screenshots/prefs-metadata.png b/doc/manual/screenshots/prefs-metadata.png
deleted file mode 100644
index c2492c7f3..000000000
--- a/doc/manual/screenshots/prefs-metadata.png
+++ /dev/null
diff --git a/doc/manual/screenshots/prefs-notifications.png b/doc/manual/screenshots/prefs-notifications.png
index 79b45f55e..3988a33c7 100644
--- a/doc/manual/screenshots/prefs-notifications.png
+++ b/doc/manual/screenshots/prefs-notifications.png
diff --git a/doc/manual/screenshots/prefs-servers.png b/doc/manual/screenshots/prefs-servers.png
index f50227c99..15bab4f4f 100644
--- a/doc/manual/screenshots/prefs-servers.png
+++ b/doc/manual/screenshots/prefs-servers.png
diff --git a/doc/manual/screenshots/prefs-tms.png b/doc/manual/screenshots/prefs-tms.png
index 4e0ba556e..2ebb22d10 100644
--- a/doc/manual/screenshots/prefs-tms.png
+++ b/doc/manual/screenshots/prefs-tms.png
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 2f1db11c2..4a1561b85 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -769,11 +769,11 @@ private:
 			table->Add (s, 1, wxEXPAND | wxALL);
 		}
 
-		add_label_to_sizer (table, _panel, _("Mail user name"), true);
+		add_label_to_sizer (table, _panel, _("User name"), true);
 		_user = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_user, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("Mail password"), true);
+		add_label_to_sizer (table, _panel, _("Password"), true);
 		_password = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_password, 1, wxEXPAND | wxALL);
 
@@ -965,7 +965,7 @@ public:
 		table->AddGrowableCol (1, 1);
 		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
 
-		add_label_to_sizer (table, _panel, _("certificates.barco.com username"), true);
+		add_label_to_sizer (table, _panel, _("certificates.barco.com user name"), true);
 		_barco_username = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_barco_username, 1, wxEXPAND | wxALL);
 
@@ -973,7 +973,7 @@ public:
 		_barco_password = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_barco_password, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("certificates.christiedigital.com username"), true);
+		add_label_to_sizer (table, _panel, _("certificates.christiedigital.com user name"), true);
 		_christie_username = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_christie_username, 1, wxEXPAND | wxALL);