Various markup and tweaks.

5 files changed, 16 insertions, 17 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 07e32a457..bf97d0d3a 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	_reference_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::reference_scaler_changed), 0, this);
 
 	pair<string, string> p = Filter::ffmpeg_strings (config->reference_filters ());
-	_reference_filters->SetLabel (std_to_wx (p.first + " " + p.second));
+	_reference_filters->SetLabel (std_to_wx (p.first + N_(" ") + p.second));
 	_reference_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_reference_filters_clicked), 0, this);
 
 	vector<ServerDescription*> servers = config->servers ();
@@ -313,7 +313,7 @@ ConfigDialog::reference_filters_changed (vector<Filter const *> f)
 {
 	Config::instance()->set_reference_filters (f);
 	pair<string, string> p = Filter::ffmpeg_strings (Config::instance()->reference_filters ());
-	_reference_filters->SetLabel (std_to_wx (p.first + " " + p.second));
+	_reference_filters->SetLabel (std_to_wx (p.first + N_(" ") + p.second));
 }
 
 void
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 68291a812..b328f04c9 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -162,7 +162,7 @@ FilmEditor::make_film_panel ()
 		_still_duration = new wxSpinCtrl (_film_panel);
 		still_control (_still_duration);
 		s->Add (_still_duration, 1, wxEXPAND);
-		/* TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time */
+		/// TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 		still_control (add_label_to_sizer (s, _film_panel, _("s")));
 		grid->Add (s);
 	}
@@ -320,7 +320,7 @@ FilmEditor::make_audio_panel ()
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_audio_delay = new wxSpinCtrl (_audio_panel);
 		s->Add (video_control (_audio_delay), 1);
-		/* TRANSLATORS: this is an abbreviation for milliseconds, the unit of time */
+		/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
 		video_control (add_label_to_sizer (s, _audio_panel, _("ms")));
 		grid->Add (s);
 	}
@@ -342,9 +342,8 @@ FilmEditor::make_audio_panel ()
 
 	assert (MAX_AUDIO_CHANNELS == 6);
 
-	/* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
-	   enhancement channel (sub-woofer)./
-	*/
+	/// TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
+	/// enhancement channel (sub-woofer).
 	wxString const channels[] = {
 		_("Left"),
 		_("Right"),
@@ -617,9 +616,9 @@ FilmEditor::film_changed (Film::Property p)
 		break;
 	case Film::LENGTH:
 		if (_film->frames_per_second() > 0 && _film->length()) {
-			s << _film->length().get() << " frames; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
+			s << _film->length().get() << " " << _("frames") << "; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
 		} else if (_film->length()) {
-			s << _film->length().get() << " frames";
+			s << _film->length().get() << " " << _("frames");
 		} 
 		_length->SetLabel (std_to_wx (s.str ()));
 		if (_film->length()) {
@@ -754,7 +753,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	if (_film) {
 		FileChanged (_film->directory ());
 	} else {
-		FileChanged ("");
+		FileChanged (N_(""));
 	}
 	
 	film_changed (Film::NAME);
@@ -1132,11 +1131,11 @@ FilmEditor::setup_audio_details ()
 	} else {
 		stringstream s;
 		if (_film->audio_stream()->channels() == 1) {
-			s << "1 channel";
+			s << _("1 channel");
 		} else {
-			s << _film->audio_stream()->channels () << " channels";
+			s << _film->audio_stream()->channels () << " " << _("channels");
 		}
-		s << ", " << _film->audio_stream()->sample_rate() << "Hz";
+		s << ", " << _film->audio_stream()->sample_rate() << _("Hz");
 		_audio->SetLabel (std_to_wx (s.str ()));
 	}
 }
@@ -1169,7 +1168,7 @@ FilmEditor::setup_dcp_name ()
 {
 	string s = _film->dcp_name (true);
 	if (s.length() > 28) {
-		_dcp_name->SetLabel (std_to_wx (s.substr (0, 28) + "..."));
+		_dcp_name->SetLabel (std_to_wx (s.substr (0, 28) + N_("...")));
 		_dcp_name->SetToolTip (std_to_wx (s));
 	} else {
 		_dcp_name->SetLabel (std_to_wx (s));
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 96656ce09..3705f38bb 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -51,7 +51,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	: wxPanel (p)
 	, _panel (new wxPanel (this))
 	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
-	, _play_button (new wxToggleButton (this, wxID_ANY, wxT ("Play")))
+	, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
 	, _display_frame_x (0)
 	, _got_frame (false)
 	, _clear_required (false)
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a57aaf5b9..e93d06dbe 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -54,7 +54,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 		_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
 		double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length().get() / (_film->frames_per_second () * 1073741824);
 		stringstream s;
-		s << fixed << setprecision (1) << disk << "Gb";
+		s << fixed << setprecision (1) << disk << _("Gb");
 		_disk->SetLabel (std_to_wx (s.str ()));
 	} else {
 		_frames->SetLabel (_("unknown"));
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 1b5b71dc9..46e3f7127 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -27,7 +27,7 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
 	if (server) {
 		_server = server;
 	} else {
-		_server = new ServerDescription ("localhost", 1);
+		_server = new ServerDescription (N_("localhost"), 1);
 	}
 		
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4);