diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index cd26cab267..de7604a9b9 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -445,8 +445,8 @@ ARDOUR_UI::setup_transport ()
 	/* and widget text */
 	auto_return_button.set_text(_("Auto Return"));
 	follow_edits_button.set_text(_("Follow Range"));
-	punch_in_button.set_text (_("In"));
-	punch_out_button.set_text (_("Out"));
+	punch_in_button.set_text (S_("Punch|In"));
+	punch_out_button.set_text (S_("Punch|Out"));
 
 	record_mode_selector.AddMenuElem (MenuElem (record_mode_strings[(int)RecLayered], sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_record_mode), RecLayered)));
 	record_mode_selector.AddMenuElem (MenuElem (record_mode_strings[(int)RecNonLayered], sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_record_mode), RecNonLayered)));
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 1e21da18d3..e1a7a286c1 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -470,11 +470,11 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch In"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch_in));
-	act->set_short_label (_("In"));
+	act->set_short_label (S_("Punch|In"));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchOut"), _("Punch Out"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch_out));
-	act->set_short_label (_("Out"));
+	act->set_short_label (S_("Punch|Out"));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunch"), _("Punch In/Out"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_punch));
diff --git a/gtk2_ardour/audio_region_properties_box.cc b/gtk2_ardour/audio_region_properties_box.cc
index ee8b4d7fb3..5a63697d2c 100644
--- a/gtk2_ardour/audio_region_properties_box.cc
+++ b/gtk2_ardour/audio_region_properties_box.cc
@@ -163,9 +163,9 @@ AudioRegionPropertiesBox::AudioRegionPropertiesBox ()
 
 	label = manage (new Gtk::Label (_("Fades:")));
 	label->set_alignment (1.0, 0.5);
-	fade_in_enable_button.set_text (_("In"));
+	fade_in_enable_button.set_text (S_("Fade|In"));
 	fade_in_enable_button.set_name ("generic button");
-	fade_out_enable_button.set_text (_("Out"));
+	fade_out_enable_button.set_text (S_("Fade|Out"));
 	fade_out_enable_button.set_name ("generic button");
 	audio_t->attach (*label,                 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK);
 	audio_t->attach (fade_in_enable_button,  1, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK);
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 056ca0c480..d6f4004d3c 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1498,24 +1498,24 @@ MixerStrip::meter_point_string (MeterPoint mp)
 	case Wide:
 		switch (mp) {
 		case MeterInput:
-			return _("In");
+			return S_("MeterWide|In");
 			break;
 
 		case MeterPreFader:
-			return _("Pre");
+			return S_("MeterWide|Pre");
 			break;
 
 		case MeterPostFader:
-			return _("Post");
+			return S_("MeterWide|Post");
 			break;
 
 		case MeterOutput:
-			return _("Out");
+			return S_("MeterWide|Out");
 			break;
 
 		case MeterCustom:
 		default:
-			return _("Custom");
+			return S_("MeterWide|Custom");
 			break;
 		}
 		break;
@@ -1694,8 +1694,8 @@ MixerStrip::set_button_names ()
 	switch (_width) {
 	case Wide:
 		mute_button->set_text (_("Mute"));
-		monitor_input_button->set_text (_("In"));
-		monitor_disk_button->set_text (_("Disk"));
+		monitor_input_button->set_text (S_("Monitor|In"));
+		monitor_disk_button->set_text (S_("Monitor|Disk"));
 		if (monitor_section_button) {
 			monitor_section_button->set_text (_("Mon"));
 		}
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e67148334e..88f81bb1f3 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -237,13 +237,13 @@ RouteUI::init ()
 
 	monitor_input_button = new ArdourButton (ArdourButton::default_elements);
 	monitor_input_button->set_name ("monitor button");
-	monitor_input_button->set_text (_("In"));
+	monitor_input_button->set_text (S_("Monitor|In"));
 	UI::instance()->set_tip (monitor_input_button, _("Monitor input"), "");
 	monitor_input_button->set_no_show_all (true);
 
 	monitor_disk_button = new ArdourButton (ArdourButton::default_elements);
 	monitor_disk_button->set_name ("monitor button");
-	monitor_disk_button->set_text (_("Disk"));
+	monitor_disk_button->set_text (S_("Monitor|Disk"));
 	UI::instance()->set_tip (monitor_disk_button, _("Monitor playback"), "");
 	monitor_disk_button->set_no_show_all (true);
 
diff --git a/gtk2_ardour/track_record_axis.cc b/gtk2_ardour/track_record_axis.cc
index 392c0a6adb..e9ac4370d1 100644
--- a/gtk2_ardour/track_record_axis.cc
+++ b/gtk2_ardour/track_record_axis.cc
@@ -256,8 +256,8 @@ TrackRecordAxis::set_button_names ()
 	monitor_input_button->set_text (S_("MonitorInput|I"));
 	monitor_disk_button->set_text (S_("MonitorDisk|D"));
 #else
-	monitor_input_button->set_text (_("In"));
-	monitor_disk_button->set_text (_("Disk"));
+	monitor_input_button->set_text (S_("Monitor|In"));
+	monitor_disk_button->set_text (S_("Monitor|Disk"));
 #endif
 
 	/* Solo/Listen is N/A */
diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc
index 31844c16b7..5bc71db878 100644
--- a/gtk2_ardour/trigger_strip.cc
+++ b/gtk2_ardour/trigger_strip.cc
@@ -338,8 +338,8 @@ void
 TriggerStrip::set_button_names ()
 {
 	mute_button->set_text (_("Mute"));
-	monitor_input_button->set_text (_("In"));
-	monitor_disk_button->set_text (_("Disk"));
+	monitor_input_button->set_text (S_("Monitor|In"));
+	monitor_disk_button->set_text (S_("Monitor|Disk"));
 
 	if (!Config->get_solo_control_is_listen_control ()) {
 		solo_button->set_text (_("Solo"));