enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

gtk2_ardour/about.cc

@@ -36,7 +36,7 @@
 #include "configinfo.h"
 #include "rgb_macros.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef WAF_BUILD
 #include "gtk2ardour-version.h"

gtk2_ardour/actions.cc

@@ -37,7 +37,7 @@
 #include "gtkmm2ext/actions.h"
 
 #include "actions.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/add_route_dialog.cc

@@ -43,7 +43,7 @@
 #include "add_route_dialog.h"
 #include "route_group_dialog.h"
 #include "tooltips.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;

gtk2_ardour/add_video_dialog.cc

@@ -35,7 +35,7 @@
 
 #include "add_video_dialog.h"
 #include "utils_videotl.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace std;

gtk2_ardour/ambiguous_file_dialog.cc

@@ -20,7 +20,7 @@
 #include <gtkmm/label.h>
 #include "pbd/compose.h"
 #include "ambiguous_file_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/analysis_window.cc

@@ -36,7 +36,7 @@
 #include "selection.h"
 #include "audio_region_view.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/ardour_button.cc

@@ -39,7 +39,7 @@
 #include "tooltips.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define BASELINESTRETCH (1.25)
 #define TRACKHEADERBTNW (3.10)

gtk2_ardour/ardour_display.cc

@@ -37,7 +37,7 @@
 
 #include "ardour_display.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gdk;

gtk2_ardour/ardour_dropdown.cc

@@ -35,7 +35,7 @@
 
 #include "ardour_dropdown.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define REFLECTION_HEIGHT 2
 

gtk2_ardour/ardour_knob.cc

@@ -43,7 +43,7 @@
 #include "canvas/colors.h"
 #include "canvas/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gdk;

gtk2_ardour/ardour_ui.cc

@@ -177,7 +177,7 @@ typedef uint64_t microseconds_t;
 #include "add_video_dialog.h"
 #include "transcode_video_dialog.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/ardour_ui2.cc

@@ -60,7 +60,7 @@
 #include "rc_option_editor.h"
 #include "time_info_box.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/ardour_ui_dependents.cc

@@ -46,7 +46,7 @@
 #include "opts.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace PBD;

gtk2_ardour/ardour_ui_dialogs.cc

@@ -70,7 +70,7 @@
 #include "time_info_box.h"
 #include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/ardour_ui_ed.cc

@@ -68,7 +68,7 @@
 
 #include "control_protocol/control_protocol.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/ardour_ui_mixer.cc

@@ -30,7 +30,7 @@
 #include "mixer_ui.h"
 #include "meterbridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/ardour_ui_options.cc

@@ -38,7 +38,7 @@
 #include "public_editor.h"
 #include "main_clock.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;

gtk2_ardour/audio_clock.cc

@@ -42,7 +42,7 @@
 #include "keyboard.h"
 #include "gui_thread.h"
 #include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/audio_region_editor.cc

@@ -33,7 +33,7 @@
 #include "audio_region_view.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/audio_region_view.cc

@@ -62,7 +62,7 @@
 #include "gui_thread.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define MUTED_ALPHA 48
 

gtk2_ardour/audio_streamview.cc

@@ -49,7 +49,7 @@
 #include "gui_thread.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/audio_time_axis.cc

@@ -55,7 +55,7 @@
 #include "audio_streamview.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/automation_controller.cc

@@ -36,7 +36,7 @@
 #include "note_select_dialog.h"
 #include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;

gtk2_ardour/automation_line.cc

@@ -63,7 +63,7 @@
 #include "ardour/session.h"
 #include "ardour/value_as_string.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/automation_region_view.cc

@@ -38,7 +38,7 @@
 #include "public_editor.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*                  parent,
                                             AutomationTimeAxisView&                   time_axis,

gtk2_ardour/automation_streamview.cc

@@ -41,7 +41,7 @@
 #include "selection.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/automation_time_axis.cc

@@ -52,7 +52,7 @@
 #include "item_counts.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/axis_view.cc

@@ -37,7 +37,7 @@
 #include "gui_object.h"
 #include "axis_view.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/big_clock_window.cc

@@ -27,7 +27,7 @@
 #include "public_editor.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::min;
 using std::string;

gtk2_ardour/bundle_env_cocoa.cc

@@ -38,7 +38,7 @@
 
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <asl.h>
 #include <Carbon/Carbon.h>

gtk2_ardour/bundle_env_linux.cc

@@ -38,7 +38,7 @@
 
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

gtk2_ardour/bundle_env_mingw.cc

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string>
 #include "bundle_env.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <glibmm.h>
 #include <fontconfig/fontconfig.h>

gtk2_ardour/bundle_env_msvc.cc

@@ -18,7 +18,7 @@
 */
 
 #include "bundle_env.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <shlobj.h>
 #include <stdlib.h>

gtk2_ardour/bundle_manager.cc

@@ -29,7 +29,7 @@
 #include "ardour/user_bundle.h"
 #include "bundle_manager.h"
 #include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;

gtk2_ardour/color_theme_manager.cc

@@ -46,7 +46,7 @@
 #include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/configinfo.cc

@@ -22,7 +22,7 @@
 #include "ardour/ardour.h"
 
 #include "configinfo.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 ConfigInfoDialog::ConfigInfoDialog ()
 	: ArdourDialog (_("Build Configuration"))

gtk2_ardour/control_point.cc

@@ -24,7 +24,7 @@
 
 #include "canvas/rectangle.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/control_point_dialog.cc

@@ -20,7 +20,7 @@
 #include "control_point_dialog.h"
 #include "control_point.h"
 #include "automation_line.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <gtkmm/stock.h>
 
 /**

gtk2_ardour/control_slave_ui.cc

@@ -35,7 +35,7 @@
 #include "control_slave_ui.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;

gtk2_ardour/duplicate_routes_dialog.cc

@@ -26,7 +26,7 @@
 #include "duplicate_routes_dialog.h"
 #include "selection.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;

gtk2_ardour/edit_note_dialog.cc

@@ -26,7 +26,7 @@
 #include "midi_region_view.h"
 #include "note_base.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/editing.cc

@@ -22,7 +22,7 @@
 
 #include "editing.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

gtk2_ardour/editor.cc

@@ -139,7 +139,7 @@
 #include "vca_time_axis.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_actions.cc

@@ -41,7 +41,7 @@
 #include "time_axis_view.h"
 #include "ui_config.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "audio_time_axis.h"
 #include "editor_group_tabs.h"
 #include "editor_routes.h"

gtk2_ardour/editor_audio_import.cc

@@ -58,7 +58,7 @@
 #include "mouse_cursors.h"
 #include "editor_cursors.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_audiotrack.cc

@@ -29,7 +29,7 @@
 #include "selection.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/editor_canvas.cc

@@ -54,7 +54,7 @@
 #include "ui_config.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_canvas_events.cc

@@ -51,7 +51,7 @@
 #include "ui_config.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_drag.cc

@@ -44,7 +44,7 @@
 #include "canvas/scroll_group.h"
 
 #include "editor.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "keyboard.h"
 #include "audio_region_view.h"
 #include "automation_region_view.h"

gtk2_ardour/editor_export_audio.cc

@@ -53,7 +53,7 @@
 #include "time_axis_view.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_group_tabs.cc

@@ -32,7 +32,7 @@
 #include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_keys.cc

@@ -32,7 +32,7 @@
 #include "selection.h"
 #include "time_axis_view.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/editor_locations.cc

@@ -20,7 +20,7 @@
 #include "editor_locations.h"
 #include "location_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;

gtk2_ardour/editor_markers.cc

@@ -40,7 +40,7 @@
 #include "prompter.h"
 #include "editor_drag.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_mixer.cc

@@ -46,7 +46,7 @@
 #include "selection.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtkmm2ext;

gtk2_ardour/editor_mouse.cc

@@ -71,7 +71,7 @@
 #include "verbose_cursor.h"
 #include "note.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_ops.cc

@@ -102,7 +102,7 @@
 #include "transform_dialog.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_pt_import.cc

@@ -60,7 +60,7 @@
 #include "mouse_cursors.h"
 #include "editor_cursors.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_regions.cc

@@ -52,7 +52,7 @@
 #include "tooltips.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_route_groups.cc

@@ -48,7 +48,7 @@
 #include "tooltips.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_routes.cc

@@ -57,7 +57,7 @@
 #include "vca_time_axis.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_rulers.cc

@@ -53,7 +53,7 @@
 #include "editor_cursors.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/editor_selection.cc

@@ -43,7 +43,7 @@
 #include "midi_region_view.h"
 #include "sfdb_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_snapshots.cc

@@ -35,7 +35,7 @@
 
 #include "editor_snapshots.h"
 #include "ardour_ui.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 #include "prompter.h"
 

gtk2_ardour/editor_tempodisplay.cc

@@ -51,7 +51,7 @@
 #include "tempo_lines.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_timefx.cc

@@ -49,7 +49,7 @@
 using namespace RubberBand;
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/editor_videotimeline.cc

@@ -35,7 +35,7 @@
 #include "interthread_progress_window.h"
 
 #include "pbd/openuri.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

gtk2_ardour/engine_dialog.cc

@@ -53,7 +53,7 @@
 #include "engine_dialog.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/export_channel_selector.cc

@@ -34,7 +34,7 @@
 #include "export_channel_selector.h"
 #include "route_sorter.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Glib;

gtk2_ardour/export_dialog.cc

@@ -33,7 +33,7 @@
 #include "gui_thread.h"
 #include "nag.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/export_file_notebook.cc

@@ -24,7 +24,7 @@
 
 #include "gui_thread.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/export_filename_selector.cc

@@ -23,7 +23,7 @@
 #include "pbd/openuri.h"
 #include "export_filename_selector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

gtk2_ardour/export_format_dialog.cc

@@ -24,7 +24,7 @@
 #include "export_format_dialog.h"
 #include "gui_thread.h"
 #include "tooltips.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

gtk2_ardour/export_format_selector.cc

@@ -25,7 +25,7 @@
 #include "ardour/export_format_specification.h"
 #include "ardour/export_profile_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 ExportFormatSelector::ExportFormatSelector () :
   edit_button (Gtk::Stock::EDIT),

gtk2_ardour/export_preset_selector.cc

@@ -22,7 +22,7 @@
 
 #include "ardour/export_preset.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 ExportPresetSelector::ExportPresetSelector () :
   label (_("Preset"), Gtk::ALIGN_LEFT),

gtk2_ardour/export_report.cc

@@ -47,7 +47,7 @@
 #include "logmeter.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace ARDOUR;

gtk2_ardour/export_timespan_selector.cc

@@ -32,7 +32,7 @@
 #include <sstream>
 #include <iomanip>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Glib;
 using namespace ARDOUR;

gtk2_ardour/export_video_dialog.cc

@@ -55,7 +55,7 @@
 #include "opts.h"
 #include "export_video_dialog.h"
 #include "utils_videotl.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace std;

gtk2_ardour/export_video_infobox.cc

@@ -22,7 +22,7 @@
 #undef interface
 #endif
 #include "export_video_infobox.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace std;

gtk2_ardour/fft_graph.cc

@@ -41,7 +41,7 @@ using std::min; using std::max;
 #include "analysis_window.h"
 #include "public_editor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/floating_text_entry.cc

@@ -25,7 +25,7 @@
 #include "gtkmm2ext/doi.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents)
 	: Gtk::Window (Gtk::WINDOW_POPUP)

gtk2_ardour/gain_meter.cc

@@ -52,7 +52,7 @@
 #include "ardour/midi_track.h"
 #include "ardour/dB.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/generic_pluginui.cc

@@ -54,7 +54,7 @@
 #include "tooltips.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/global_port_matrix.cc

@@ -28,7 +28,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/group_tabs.cc

@@ -31,7 +31,7 @@
 #include "route_group_dialog.h"
 #include "group_tabs.h"
 #include "keyboard.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "ardour_ui.h"
 #include "rgb_macros.h"
 #include "ui_config.h"

gtk2_ardour/gui_object.cc

@@ -21,7 +21,7 @@
 #include <sstream>
 
 #include "gui_object.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::string;
 

gtk2_ardour/insert_remove_time_dialog.cc

@@ -23,7 +23,7 @@
 #include <gtkmm/alignment.h>
 #include "insert_remove_time_dialog.h"
 #include "audio_clock.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Editing;

gtk2_ardour/instrument_selector.cc

@@ -20,7 +20,7 @@
 #include "gtkmm2ext/gui_thread.h"
 #include "instrument_selector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace ARDOUR;

gtk2_ardour/interthread_progress_window.cc

@@ -22,7 +22,7 @@
 #include "gtkmm2ext/utils.h"
 #include "ardour/import_status.h"
 #include "interthread_progress_window.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/io_selector.cc

@@ -33,7 +33,7 @@
 #include "io_selector.h"
 #include "utils.h"
 #include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/keyboard.cc

@@ -30,7 +30,7 @@
 #include "opts.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/keyeditor.cc

@@ -50,7 +50,7 @@
 #include "keyboard.h"
 #include "keyeditor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/latency_gui.cc

@@ -27,7 +27,7 @@
 
 #include "latency_gui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Gtk;

gtk2_ardour/level_meter.cc

@@ -32,7 +32,7 @@
 #include "public_editor.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/location_ui.cc

@@ -37,7 +37,7 @@
 #include "tooltips.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

gtk2_ardour/lua_script_manager.cc

@@ -20,7 +20,7 @@
 
 #include "lua_script_manager.h"
 #include "script_selector.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

gtk2_ardour/luainstance.cc

@@ -40,7 +40,7 @@
 #include "selection.h"
 #include "script_selector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace LuaCairo {
 /** wrap RefPtr< Cairo::ImageSurface >

gtk2_ardour/luawindow.cc

@@ -51,7 +51,7 @@
 #include "utils.h"
 #include "utils_videotl.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;

gtk2_ardour/lv2_plugin_ui.cc

@@ -31,7 +31,7 @@
 #include <lilv/lilv.h>
 #include <suil/suil.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;

gtk2_ardour/main.cc

@@ -58,7 +58,7 @@
 #include "enums.h"
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'