X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=1cbad576c07fc1475039b5f20b44774f36484b14;hp=1d90c216ed5c54490d5b5250aea35c73e7650a71;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=920cc20f2edb3d3558c899fe4c00356d5531d9e2

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 1d90c216e..1cbad576c 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -162,6 +163,7 @@ private:
 		_language = new wxChoice (_panel, wxID_ANY);
 		vector<pair<string, string> > languages;
 		languages.push_back (make_pair ("Čeština", "cs_CZ"));
+		languages.push_back (make_pair ("汉语/漢語", "zh_CN"));
 		languages.push_back (make_pair ("Dansk", "da_DK"));
 		languages.push_back (make_pair ("Deutsch", "de_DE"));
 		languages.push_back (make_pair ("English", "en_GB"));
@@ -199,7 +201,7 @@ private:
 		table->Add (_cinemas_file, wxGBPosition (r, 1));
 		++r;
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 		_analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio"));
 		table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2));
 		++r;
@@ -238,7 +240,7 @@ private:
 		_num_local_encoding_threads->SetRange (1, 128);
 		_num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 		_analyse_ebur128->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::analyse_ebur128_changed, this));
 #endif
 		_automatic_audio_analysis->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::automatic_audio_analysis_changed, this));
@@ -280,7 +282,7 @@ private:
 		checked_set (_language, lang);
 
 		checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ());
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 		checked_set (_analyse_ebur128, config->analyse_ebur128 ());
 #endif
 		checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ());
@@ -319,7 +321,7 @@ private:
 		}
 	}
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	void analyse_ebur128_changed ()
 	{
 		Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ());
@@ -365,7 +367,7 @@ private:
 	wxChoice* _language;
 	wxSpinCtrl* _num_local_encoding_threads;
 	FilePickerCtrl* _cinemas_file;
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	wxCheckBox* _analyse_ebur128;
 #endif
 	wxCheckBox* _automatic_audio_analysis;
@@ -751,6 +753,13 @@ private:
 		if (d->ShowModal() == wxID_OK) {
 			try {
 				dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
+				if (c.extra_data ()) {
+					message_dialog (
+						this,
+						_("This file contains other certificates (or other data) after its first certificate. "
+						  "Only the first certificate will be used.")
+						);
+				}
 				_chain->add (c);
 				_set (_chain);
 				update_certificate_list ();
@@ -911,8 +920,11 @@ private:
 		if (d->ShowModal() == wxID_OK) {
 			try {
 				boost::filesystem::path p (wx_to_std (d->GetPath ()));
-				if (boost::filesystem::file_size (p) > 1024) {
-					error_dialog (this, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ())));
+				if (boost::filesystem::file_size (p) > 8192) {
+					error_dialog (
+						this,
+						wxString::Format (_("Could not read key file; file is too long (%s)"), std_to_wx (p.string ()))
+						);
 					return;
 				}
 
@@ -1384,6 +1396,7 @@ private:
 			t->Add (_log_warning, 1, wxEXPAND | wxALL);
 			_log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors"));
 			t->Add (_log_error, 1, wxEXPAND | wxALL);
+			/// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
 			_log_timing = new wxCheckBox (_panel, wxID_ANY, S_("Config|Timing"));
 			t->Add (_log_timing, 1, wxEXPAND | wxALL);
 			_log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode"));