diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-14 14:44:52 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-14 14:45:23 -0400 |
| commit | cf52d6e4b40111eb04b244ec054055a4ec15dbe0 (patch) | |
| tree | 2cb873af8afa79fcce46b82832da82de500666a2 /gtk2_ardour | |
| parent | 2b262dbfdd25808471244ddc0edede34f8230231 (diff) | |
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
Diffstat (limited to 'gtk2_ardour')
214 files changed, 213 insertions, 256 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 01eab82b88..72bccfd2d4 100644 --- a/gtk2_ardour/about.cc +++ b/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" diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 11b7f13f1c..1edbcafaa4 100644 --- a/gtk2_ardour/actions.cc +++ b/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; diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index d01a2a80d6..90ccff58f7 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/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; diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc index 31cb7432cb..126c161812 100644 --- a/gtk2_ardour/add_video_dialog.cc +++ b/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; diff --git a/gtk2_ardour/ambiguous_file_dialog.cc b/gtk2_ardour/ambiguous_file_dialog.cc index 98d0eaec39..900ab4e4e2 100644 --- a/gtk2_ardour/ambiguous_file_dialog.cc +++ b/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; diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc index cfacf57990..506e129781 100644 --- a/gtk2_ardour/analysis_window.cc +++ b/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; diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index 6390449adb..56854880d8 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/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) diff --git a/gtk2_ardour/ardour_display.cc b/gtk2_ardour/ardour_display.cc index 17f3dc5dde..a682833706 100644 --- a/gtk2_ardour/ardour_display.cc +++ b/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; diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc index 5c0e25fd24..3b04e1063b 100644 --- a/gtk2_ardour/ardour_dropdown.cc +++ b/gtk2_ardour/ardour_dropdown.cc @@ -35,7 +35,7 @@ #include "ardour_dropdown.h" -#include "i18n.h" +#include "pbd/i18n.h" #define REFLECTION_HEIGHT 2 diff --git a/gtk2_ardour/ardour_knob.cc b/gtk2_ardour/ardour_knob.cc index 1bb3671578..cf9eaced57 100644 --- a/gtk2_ardour/ardour_knob.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 96df17a5f9..9c627dcb01 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 8184ae47cf..00a1bde046 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 68e29f57f8..8490643487 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 406bf223ce..e372c1e7fd 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 5882e45afb..9a8fc904e6 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc index 921cd7bc57..4f5614e32a 100644 --- a/gtk2_ardour/ardour_ui_mixer.cc +++ b/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; diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index d313fb7082..98ede1dc3f 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/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; diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index ee28f138e2..16b4151a81 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/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; diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index a5890a656a..15186f2b8a 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/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; diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 974dcaebad..a70dcaae0b 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/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 diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 511b4296eb..c7adcfce7e 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/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; diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 6a9a32eac5..4459afa799 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/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; diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index cd76163c6c..03054fa98b 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/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; diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index eb53ebce17..a422bf9723 100644 --- a/gtk2_ardour/automation_line.cc +++ b/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; diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index f1f9d68b98..963fe63c01 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/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, diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index be72459980..8cb19c2e39 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/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; diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index ed55ce1a69..e2b74dae97 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/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; diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc index d877687039..016e57945f 100644 --- a/gtk2_ardour/axis_view.cc +++ b/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; diff --git a/gtk2_ardour/big_clock_window.cc b/gtk2_ardour/big_clock_window.cc index 56fe34feac..3d85e463a7 100644 --- a/gtk2_ardour/big_clock_window.cc +++ b/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; diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc index 14e6f51d15..d63057408e 100644 --- a/gtk2_ardour/bundle_env_cocoa.cc +++ b/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> diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc index 2586ad5dcd..e553213ec0 100644 --- a/gtk2_ardour/bundle_env_linux.cc +++ b/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; diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc index c2547bed44..6ee1e0f7a2 100644 --- a/gtk2_ardour/bundle_env_mingw.cc +++ b/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> diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc index 3c8f98d029..9932a19027 100644 --- a/gtk2_ardour/bundle_env_msvc.cc +++ b/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> diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 8302e6dc2b..234a603cbb 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/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; diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc index df0a0ddd4c..e038493c96 100644 --- a/gtk2_ardour/color_theme_manager.cc +++ b/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; diff --git a/gtk2_ardour/configinfo.cc b/gtk2_ardour/configinfo.cc index 67f13a1f5b..f7a3211d3d 100644 --- a/gtk2_ardour/configinfo.cc +++ b/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")) diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc index b906e639d5..2a457c52f1 100644 --- a/gtk2_ardour/control_point.cc +++ b/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; diff --git a/gtk2_ardour/control_point_dialog.cc b/gtk2_ardour/control_point_dialog.cc index 9cb71cbb2c..06ef2ce1f5 100644 --- a/gtk2_ardour/control_point_dialog.cc +++ b/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> /** diff --git a/gtk2_ardour/control_slave_ui.cc b/gtk2_ardour/control_slave_ui.cc index dcb62971cf..55705cf590 100644 --- a/gtk2_ardour/control_slave_ui.cc +++ b/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; diff --git a/gtk2_ardour/duplicate_routes_dialog.cc b/gtk2_ardour/duplicate_routes_dialog.cc index b69d17c602..05bb878f2c 100644 --- a/gtk2_ardour/duplicate_routes_dialog.cc +++ b/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; diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index 08cfbadec2..39a3fa4e78 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/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; diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc index 486808065e..10181d56ff 100644 --- a/gtk2_ardour/editing.cc +++ b/gtk2_ardour/editing.cc @@ -22,7 +22,7 @@ #include "editing.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 20547e8e18..4edf3a5693 100644 --- a/gtk2_ardour/editor.cc +++ b/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; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index f2b742804c..79900b3517 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/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" diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 9ab03d0842..237fb6776d 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/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; diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc index b6ba2074d4..4693ea8790 100644 --- a/gtk2_ardour/editor_audiotrack.cc +++ b/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; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 40ca1dbf22..4fbe0d8444 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/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; diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index c26e4b96dc..30e2504edc 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/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; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 5a0695134f..a3b6664e57 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/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" diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 2bd607f108..795091fb41 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/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; diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc index 04446c7ce7..04f88542ba 100644 --- a/gtk2_ardour/editor_group_tabs.cc +++ b/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; diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index 1edcd16c9e..e1562dbe05 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/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; diff --git a/gtk2_ardour/editor_locations.cc b/gtk2_ardour/editor_locations.cc index 03509ac023..0c0066c3a5 100644 --- a/gtk2_ardour/editor_locations.cc +++ b/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; diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 71b4744d95..d20404916a 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/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; diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 029f6d966d..0c0348383f 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/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; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index b7ddbb5c7f..8a8a9518cf 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/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; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index cdb0b5bd6a..c83e96d67f 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/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; diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc index d0bfdec27d..2b659e0369 100644 --- a/gtk2_ardour/editor_pt_import.cc +++ b/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; diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 5c65df73ba..845e56fdec 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/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; diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 7d3f0e2ccd..3cfa1eeafa 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/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; diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index d2514c9bb4..6ea6a1d724 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/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; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 596f4f26b9..868b006900 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/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; diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index ea6c40f1b2..c5ba764af8 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/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; diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index f79a442481..b90737cd08 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/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" diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index ba73a01f0b..722490c26e 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/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; diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 1560f93dea..067cfef899 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/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; diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 65c4fc75ab..e5f5db3465 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/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; diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 4d3898182c..cf1d3b0d36 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/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; diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index 59720ecb3e..acbed62030 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/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; diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 26e2b9a688..59985a0459 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/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; diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc index 0ebee83a68..8e37356d0d 100644 --- a/gtk2_ardour/export_file_notebook.cc +++ b/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; diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc index 317e52b605..e16f527a9c 100644 --- a/gtk2_ardour/export_filename_selector.cc +++ b/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; diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index ae69551ca4..862401f704 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/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; diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc index 407465605e..c77a09cdec 100644 --- a/gtk2_ardour/export_format_selector.cc +++ b/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), diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc index 3e3b0d0b15..018beae39a 100644 --- a/gtk2_ardour/export_preset_selector.cc +++ b/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), diff --git a/gtk2_ardour/export_report.cc b/gtk2_ardour/export_report.cc index 5d3e664d45..942e1ddd42 100644 --- a/gtk2_ardour/export_report.cc +++ b/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; diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index 9a294aff1b..ad9470af32 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/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; diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 5038339b7d..c1589909b2 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/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; diff --git a/gtk2_ardour/export_video_infobox.cc b/gtk2_ardour/export_video_infobox.cc index 15ecc1a30c..f886bee078 100644 --- a/gtk2_ardour/export_video_infobox.cc +++ b/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; diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc index d9c8c10b15..6a448ac52c 100644 --- a/gtk2_ardour/fft_graph.cc +++ b/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; diff --git a/gtk2_ardour/floating_text_entry.cc b/gtk2_ardour/floating_text_entry.cc index c78c41e4d9..571969d2dc 100644 --- a/gtk2_ardour/floating_text_entry.cc +++ b/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) diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 53968d7e8c..4b72a25de8 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/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; diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 829eb5e2ce..637eca0bbf 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/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; diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 706b4b6727..9a6db259dc 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/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; diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 6f57f3c525..f81cc585f8 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/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" diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc index 34d32a5b31..3f6b79c8c6 100644 --- a/gtk2_ardour/gui_object.cc +++ b/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; diff --git a/gtk2_ardour/i18n.h b/gtk2_ardour/i18n.h deleted file mode 100644 index 4b75d34315..0000000000 --- a/gtk2_ardour/i18n.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2000-2007 Paul Davis - - This program 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, - 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. - -*/ - -#ifndef __i18n_h__ -#define __i18n_h__ - -#include "pbd/compose.h" -#include "pbd/convert.h" -#include "gettext.h" - -#include <vector> -#include <string> - -#define _(Text) dgettext (PACKAGE,Text) -#define N_(Text) gettext_noop (Text) -#define X_(Text) Text -#define I18N(Array) PBD::internationalize (PACKAGE, Array) -/** Use this to translate strings that have different meanings in different places. - * Text should be of the form Context|Message. - */ -#define S_(Text) PBD::sgettext (PACKAGE, Text) - -/** Use this to translate strings with plural forms - */ -#define P_(Singular,Plural,HowMany) dngettext (PACKAGE, (Singular), (Plural), (HowMany)) - -#endif // __i18n_h__ diff --git a/gtk2_ardour/insert_remove_time_dialog.cc b/gtk2_ardour/insert_remove_time_dialog.cc index 8620ba18e5..0aeca1e2df 100644 --- a/gtk2_ardour/insert_remove_time_dialog.cc +++ b/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; diff --git a/gtk2_ardour/instrument_selector.cc b/gtk2_ardour/instrument_selector.cc index d4f89e2f63..ffd11ccf70 100644 --- a/gtk2_ardour/instrument_selector.cc +++ b/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; diff --git a/gtk2_ardour/interthread_progress_window.cc b/gtk2_ardour/interthread_progress_window.cc index 136d77eda0..c74f12914f 100644 --- a/gtk2_ardour/interthread_progress_window.cc +++ b/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; diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 574b3cd0ca..6d0ede316c 100644 --- a/gtk2_ardour/io_selector.cc +++ b/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; diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 729337ed11..6341071451 100644 --- a/gtk2_ardour/keyboard.cc +++ b/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; diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 36b0c0bd49..b19b6d5fc0 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/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; diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc index d21a055d9e..dbb3e08cd7 100644 --- a/gtk2_ardour/latency_gui.cc +++ b/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; diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 114c28c708..2ab2cf567c 100644 --- a/gtk2_ardour/level_meter.cc +++ b/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; diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 7dfc2ecbce..76111a49e7 100644 --- a/gtk2_ardour/location_ui.cc +++ b/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; diff --git a/gtk2_ardour/lua_script_manager.cc b/gtk2_ardour/lua_script_manager.cc index 279cd50e67..c33dea3e55 100644 --- a/gtk2_ardour/lua_script_manager.cc +++ b/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; diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index eb755c2087..5893c15fd9 100644 --- a/gtk2_ardour/luainstance.cc +++ b/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 > diff --git a/gtk2_ardour/luawindow.cc b/gtk2_ardour/luawindow.cc index 79220dff24..e8ab438a15 100644 --- a/gtk2_ardour/luawindow.cc +++ b/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; diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index c9950fa527..75b3ff0bb8 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/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; diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 0fa6f53fe1..33e30c2c15 100644 --- a/gtk2_ardour/main.cc +++ b/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' diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index 6c5a48f570..9a7360b41f 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -22,7 +22,7 @@ #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "ardour/tempo.h" diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index c018ba54e7..312c98bbf9 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -47,7 +47,7 @@ #include <gtkmm2ext/utils.h> -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index f3f2073a45..ab6b9446d3 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -30,7 +30,7 @@ #include "meter_patterns.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 3ab26d92bc..db96a3cb7f 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -45,7 +45,7 @@ #include "meter_strip.h" #include "meter_patterns.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 07553ced18..02350c92bf 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -54,7 +54,7 @@ #include "meter_patterns.h" #include "timers.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/midi_automation_line.cc b/gtk2_ardour/midi_automation_line.cc index c76a35a069..9a40ebbac3 100644 --- a/gtk2_ardour/midi_automation_line.cc +++ b/gtk2_ardour/midi_automation_line.cc @@ -25,7 +25,7 @@ #include "midi_automation_line.h" #include "midi_time_axis.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/midi_channel_dialog.cc b/gtk2_ardour/midi_channel_dialog.cc index d39853e209..6d79306e38 100644 --- a/gtk2_ardour/midi_channel_dialog.cc +++ b/gtk2_ardour/midi_channel_dialog.cc @@ -20,7 +20,7 @@ #include "midi_channel_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; diff --git a/gtk2_ardour/midi_channel_selector.cc b/gtk2_ardour/midi_channel_selector.cc index d76a5d5ff2..1da8fd9c00 100644 --- a/gtk2_ardour/midi_channel_selector.cc +++ b/gtk2_ardour/midi_channel_selector.cc @@ -38,7 +38,7 @@ #include "midi_channel_selector.h" #include "rgb_macros.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/midi_export_dialog.cc b/gtk2_ardour/midi_export_dialog.cc index 3e91ca4f9f..9fd02397d7 100644 --- a/gtk2_ardour/midi_export_dialog.cc +++ b/gtk2_ardour/midi_export_dialog.cc @@ -27,7 +27,7 @@ #include "midi_export_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc index 7771dc50cd..731f8b11da 100644 --- a/gtk2_ardour/midi_list_editor.cc +++ b/gtk2_ardour/midi_list_editor.cc @@ -39,7 +39,7 @@ #include "note_player.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/midi_port_dialog.cc b/gtk2_ardour/midi_port_dialog.cc index cbf2ca571b..20904faa59 100644 --- a/gtk2_ardour/midi_port_dialog.cc +++ b/gtk2_ardour/midi_port_dialog.cc @@ -26,7 +26,7 @@ #include "midi_port_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 14e39dd625..79933b94d6 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -82,7 +82,7 @@ #include "sys_ex.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 6bd6775618..301e9ddcb4 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -47,7 +47,7 @@ #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index ac39c557ae..57cde4af0d 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -89,7 +89,7 @@ #include "ardour/midi_track.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc index 3d5e6ac796..2f97e5b6d5 100644 --- a/gtk2_ardour/midi_tracer.cc +++ b/gtk2_ardour/midi_tracer.cc @@ -34,7 +34,7 @@ #include "midi_tracer.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/midi_velocity_dialog.cc b/gtk2_ardour/midi_velocity_dialog.cc index 5b21e566e4..4c0e42f913 100644 --- a/gtk2_ardour/midi_velocity_dialog.cc +++ b/gtk2_ardour/midi_velocity_dialog.cc @@ -20,7 +20,7 @@ #include "midi_velocity_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc index 9fe1258432..47e6948412 100644 --- a/gtk2_ardour/missing_file_dialog.cc +++ b/gtk2_ardour/missing_file_dialog.cc @@ -25,7 +25,7 @@ #include "gtkmm2ext/utils.h" #include "missing_file_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/missing_plugin_dialog.cc b/gtk2_ardour/missing_plugin_dialog.cc index 1e216c349f..1f2a4f060f 100644 --- a/gtk2_ardour/missing_plugin_dialog.cc +++ b/gtk2_ardour/missing_plugin_dialog.cc @@ -18,7 +18,7 @@ #include <gtkmm/label.h> #include "missing_plugin_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 25dbae4484..63bb1a091f 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -33,7 +33,7 @@ #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index eaf3aeb096..b5ae269c7f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -71,7 +71,7 @@ #include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index cd2304e7f7..4c5317a389 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -71,7 +71,7 @@ #include "ui_config.h" #include "vca_master_strip.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index eb131a7d3c..2fcc5812b7 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -49,7 +49,7 @@ #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/monitor_selector.cc b/gtk2_ardour/monitor_selector.cc index 5f71a79b6f..0a6d731f3e 100644 --- a/gtk2_ardour/monitor_selector.cc +++ b/gtk2_ardour/monitor_selector.cc @@ -33,7 +33,7 @@ #include "monitor_selector.h" #include "utils.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 0dd54ef6ac..da98fcb120 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -44,7 +44,7 @@ #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/mono_panner_editor.cc b/gtk2_ardour/mono_panner_editor.cc index 5a9a0927c5..5561a308ce 100644 --- a/gtk2_ardour/mono_panner_editor.cc +++ b/gtk2_ardour/mono_panner_editor.cc @@ -24,7 +24,7 @@ #include "pbd/controllable.h" #include "mono_panner_editor.h" #include "mono_panner.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc index 61a8e1a9a4..d553efd197 100644 --- a/gtk2_ardour/nag.cc +++ b/gtk2_ardour/nag.cc @@ -30,7 +30,7 @@ #include "ardour/rc_configuration.h" #include "nag.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; diff --git a/gtk2_ardour/new_plugin_preset_dialog.cc b/gtk2_ardour/new_plugin_preset_dialog.cc index cc5c4b9b61..70926f5a37 100644 --- a/gtk2_ardour/new_plugin_preset_dialog.cc +++ b/gtk2_ardour/new_plugin_preset_dialog.cc @@ -20,7 +20,7 @@ #include <gtkmm/stock.h> #include "new_plugin_preset_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/normalize_dialog.cc b/gtk2_ardour/normalize_dialog.cc index 308328538c..0ebab122f7 100644 --- a/gtk2_ardour/normalize_dialog.cc +++ b/gtk2_ardour/normalize_dialog.cc @@ -23,7 +23,7 @@ #include <gtkmm/stock.h> #include <gtkmm/progressbar.h> #include "normalize_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; diff --git a/gtk2_ardour/note_select_dialog.cc b/gtk2_ardour/note_select_dialog.cc index 14d45ccf5a..203213eced 100644 --- a/gtk2_ardour/note_select_dialog.cc +++ b/gtk2_ardour/note_select_dialog.cc @@ -21,7 +21,7 @@ #include "note_select_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" static void _note_on_event_handler(GtkWidget* /*widget*/, int note, gpointer arg) diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 1088d1d9b4..f19babaae4 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -36,7 +36,7 @@ #include "option_editor.h" #include "public_editor.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index 68220fa7c1..98e72de788 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -31,7 +31,7 @@ #include "opts.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 4212456f75..9697cb3a60 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -43,7 +43,7 @@ #include "public_editor.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/panner_editor.cc b/gtk2_ardour/panner_editor.cc index 0a1d9e8fa2..6e04d9fce8 100644 --- a/gtk2_ardour/panner_editor.cc +++ b/gtk2_ardour/panner_editor.cc @@ -18,7 +18,7 @@ */ #include "panner_editor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/panner_interface.cc b/gtk2_ardour/panner_interface.cc index 91c2d1772f..dcbb36487b 100644 --- a/gtk2_ardour/panner_interface.cc +++ b/gtk2_ardour/panner_interface.cc @@ -23,7 +23,7 @@ #include "panner_interface.h" #include "panner_editor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 2df7a819ad..0818833767 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -36,7 +36,7 @@ #include "mono_panner.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index 1c0d824321..9bb339fdd4 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -33,7 +33,7 @@ #include "patch_change_dialog.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index 35a64f38dd..cc92d5d2be 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -31,7 +31,7 @@ #include "route_ui.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index a005f74673..104b9a09f8 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -46,7 +46,7 @@ #include "ardour_ui.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc index 3062dc1a69..24a4fec4f4 100644 --- a/gtk2_ardour/plugin_pin_dialog.cc +++ b/gtk2_ardour/plugin_pin_dialog.cc @@ -43,7 +43,7 @@ #include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 08046143f5..3a0fed0d67 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -42,7 +42,7 @@ #include "gui_thread.h" #include "tooltips.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/plugin_setup_dialog.cc b/gtk2_ardour/plugin_setup_dialog.cc index 3398f8bb83..5feb76aefe 100644 --- a/gtk2_ardour/plugin_setup_dialog.cc +++ b/gtk2_ardour/plugin_setup_dialog.cc @@ -21,7 +21,7 @@ #include <gtkmm/label.h> #include "plugin_setup_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace Gtk; diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index d3f984b0a6..711b1f555f 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -70,7 +70,7 @@ #include "new_plugin_preset_dialog.h" #include "tooltips.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 2691b46a7b..96db6f73e7 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -43,7 +43,7 @@ #include "time_axis_view.h" #include "public_editor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc index a742740e5a..0bf8653299 100644 --- a/gtk2_ardour/port_insert_ui.cc +++ b/gtk2_ardour/port_insert_ui.cc @@ -29,7 +29,7 @@ #include "port_insert_ui.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace Gtk; diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index a580327988..1b588511fd 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -37,7 +37,7 @@ #include "port_matrix_body.h" #include "port_matrix_component.h" #include "ardour_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "gui_thread.h" #include "utils.h" diff --git a/gtk2_ardour/port_matrix_body.cc b/gtk2_ardour/port_matrix_body.cc index 83864a607c..24fb575d39 100644 --- a/gtk2_ardour/port_matrix_body.cc +++ b/gtk2_ardour/port_matrix_body.cc @@ -28,7 +28,7 @@ #include "port_matrix_row_labels.h" #include "port_matrix_grid.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index cf591f8ff8..4cf12b58b3 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -26,7 +26,7 @@ #include "port_matrix.h" #include "port_matrix_body.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index 507e9fc254..c6b02eb488 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -27,7 +27,7 @@ #include "port_matrix_row_labels.h" #include "port_matrix.h" #include "port_matrix_body.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index ee7cfa8dff..c70dc9078a 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -86,7 +86,7 @@ #include "tooltips.h" #include "new_plugin_preset_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef AUDIOUNIT_SUPPORT class AUPluginUI; diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc index 11f823e0ff..6ac0ba358b 100644 --- a/gtk2_ardour/public_editor.cc +++ b/gtk2_ardour/public_editor.cc @@ -19,7 +19,7 @@ #include "public_editor.h" -#include "i18n.h" +#include "pbd/i18n.h" PublicEditor* PublicEditor::_instance = 0; diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc index 05c8d1e940..591d80195f 100644 --- a/gtk2_ardour/quantize_dialog.cc +++ b/gtk2_ardour/quantize_dialog.cc @@ -25,7 +25,7 @@ #include "quantize_dialog.h" #include "public_editor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 8b4c795cbb..97b81d8c1d 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -66,7 +66,7 @@ #include "keyboard.h" #include "theme_manager.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index 725e5c33dd..596f6009aa 100644 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -36,7 +36,7 @@ #include "public_editor.h" #include "tooltips.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc index dc1c14e437..fd09119bd2 100644 --- a/gtk2_ardour/region_gain_line.cc +++ b/gtk2_ardour/region_gain_line.cc @@ -32,7 +32,7 @@ #include "editor.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc index 92c7207263..e58c7c9768 100644 --- a/gtk2_ardour/region_layering_order_editor.cc +++ b/gtk2_ardour/region_layering_order_editor.cc @@ -31,7 +31,7 @@ #include "region_layering_order_editor.h" #include "region_view.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 1e848cf339..27e161176b 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -48,7 +48,7 @@ #include "rgb_macros.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index 301ecdab31..a6b27f7af7 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -28,7 +28,7 @@ #include "gui_thread.h" #include "timers.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index d73b376439..4d39232d8c 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -33,7 +33,7 @@ #include "editor.h" #include "time_axis_view.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc index b1a75794ce..d7fb115e9f 100644 --- a/gtk2_ardour/route_group_dialog.cc +++ b/gtk2_ardour/route_group_dialog.cc @@ -30,7 +30,7 @@ #include "group_tabs.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; diff --git a/gtk2_ardour/route_group_menu.cc b/gtk2_ardour/route_group_menu.cc index 2cbd472fa7..5ccafaec39 100644 --- a/gtk2_ardour/route_group_menu.cc +++ b/gtk2_ardour/route_group_menu.cc @@ -29,7 +29,7 @@ #include "route_group_menu.h" #include "route_group_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 024627f068..a8ddc02c1f 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -48,7 +48,7 @@ #include "send_ui.h" #include "timers.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index ed993fdc86..729032e637 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -26,7 +26,7 @@ #include "route_processor_selection.h" #include "route_ui.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index c6c8b39000..9bf84f8b13 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -83,7 +83,7 @@ #include "ardour/track.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 5b6217af4a..e06355637e 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -71,7 +71,7 @@ #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; diff --git a/gtk2_ardour/ruler_dialog.cc b/gtk2_ardour/ruler_dialog.cc index ce34d70ad3..cee831f78d 100644 --- a/gtk2_ardour/ruler_dialog.cc +++ b/gtk2_ardour/ruler_dialog.cc @@ -22,7 +22,7 @@ #include "actions.h" #include "ruler_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" RulerDialog::RulerDialog () : ArdourDialog (_("Rulers")) diff --git a/gtk2_ardour/save_as_dialog.cc b/gtk2_ardour/save_as_dialog.cc index ee14e3a831..eaee07764c 100644 --- a/gtk2_ardour/save_as_dialog.cc +++ b/gtk2_ardour/save_as_dialog.cc @@ -23,7 +23,7 @@ #include "save_as_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/script_selector.cc b/gtk2_ardour/script_selector.cc index 31cea38338..4a26973e64 100644 --- a/gtk2_ardour/script_selector.cc +++ b/gtk2_ardour/script_selector.cc @@ -19,7 +19,7 @@ #include "gtkmm2ext/utils.h" #include "script_selector.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc index 9aea617812..925b9834cb 100644 --- a/gtk2_ardour/search_path_option.cc +++ b/gtk2_ardour/search_path_option.cc @@ -21,7 +21,7 @@ #include "pbd/shortpath.h" #include "search_path_option.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index feb7b3b1a5..f7eb676d96 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -41,7 +41,7 @@ #include "public_editor.h" #include "control_point.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/selection_memento.cc b/gtk2_ardour/selection_memento.cc index ffce0790f8..f122de3a9b 100644 --- a/gtk2_ardour/selection_memento.cc +++ b/gtk2_ardour/selection_memento.cc @@ -22,7 +22,7 @@ #include "editing.h" #include "public_editor.h" -#include "i18n.h" +#include "pbd/i18n.h" SelectionMemento::SelectionMemento () { diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index 7f87f2dea8..364e44c7b0 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -29,7 +29,7 @@ #include "timers.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index fe8a1bdd4c..225b02df84 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -54,7 +54,7 @@ #include "session_dialog.h" #include "opts.h" #include "engine_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "tooltips.h" #include "ui_config.h" #include "utils.h" diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 5783c8376e..b528f91b6c 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -33,7 +33,7 @@ #include "gui_thread.h" #include "prompter.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc index 88720edc74..a4cfee2b10 100644 --- a/gtk2_ardour/session_metadata_dialog.cc +++ b/gtk2_ardour/session_metadata_dialog.cc @@ -30,7 +30,7 @@ #include "ardour/session.h" #include "ardour/session_utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Glib; diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 4fd0feb2c2..baadcef795 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -22,7 +22,7 @@ #include "gui_thread.h" #include "session_option_editor.h" #include "search_path_option.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc index 94e0058c17..74290df0a3 100644 --- a/gtk2_ardour/sfdb_freesound_mootcher.cc +++ b/gtk2_ardour/sfdb_freesound_mootcher.cc @@ -50,7 +50,7 @@ #include <glib.h> #include "pbd/gstdio_compat.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "ardour/audio_library.h" #include "ardour/rc_configuration.h" diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 7cbd74c75d..f94c584019 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -21,7 +21,7 @@ #include "gtk2ardour-config.h" #endif -#include "i18n.h" +#include "pbd/i18n.h" #include <map> #include <cerrno> diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc index c423c21679..938ba08c51 100644 --- a/gtk2_ardour/shuttle_control.cc +++ b/gtk2_ardour/shuttle_control.cc @@ -36,7 +36,7 @@ #include "shuttle_control.h" #include "tooltips.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/soundcloud_export_selector.cc b/gtk2_ardour/soundcloud_export_selector.cc index 524c462efd..e7e43adea0 100644 --- a/gtk2_ardour/soundcloud_export_selector.cc +++ b/gtk2_ardour/soundcloud_export_selector.cc @@ -32,7 +32,7 @@ #include <iostream> #include "pbd/gstdio_compat.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; diff --git a/gtk2_ardour/speaker_dialog.cc b/gtk2_ardour/speaker_dialog.cc index 3578682422..3831094c5d 100644 --- a/gtk2_ardour/speaker_dialog.cc +++ b/gtk2_ardour/speaker_dialog.cc @@ -24,7 +24,7 @@ #include "speaker_dialog.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc index 407bdec2d2..1784ac8164 100644 --- a/gtk2_ardour/splash.cc +++ b/gtk2_ardour/splash.cc @@ -34,7 +34,7 @@ #include "gui_thread.h" #include "splash.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Glib; diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index ed0cd885cb..58c1cfc7ad 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -51,7 +51,7 @@ #include "startup.h" #include "opts.h" #include "engine_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "utils.h" using namespace std; diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index f49ce44813..855766b1c8 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -33,7 +33,7 @@ #include "tooltips.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 304300fcdb..d528cb1993 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -45,7 +45,7 @@ #include "utils.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/stereo_panner_editor.cc b/gtk2_ardour/stereo_panner_editor.cc index 477a6650a4..9154b3732d 100644 --- a/gtk2_ardour/stereo_panner_editor.cc +++ b/gtk2_ardour/stereo_panner_editor.cc @@ -25,7 +25,7 @@ #include "pbd/controllable.h" #include "stereo_panner_editor.h" #include "stereo_panner.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 02aa5168df..bcab05b9c8 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -45,7 +45,7 @@ #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index cd41950924..87125b2298 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -32,7 +32,7 @@ #include "strip_silence_dialog.h" #include "region_view.h" #include "rgb_macros.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "logmeter.h" using namespace ARDOUR; diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 2d71bdf5ab..214686e8ff 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -31,7 +31,7 @@ #include "audio_time_axis.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/tempo_curve.cc b/gtk2_ardour/tempo_curve.cc index 4771205263..db675c9c5f 100644 --- a/gtk2_ardour/tempo_curve.cc +++ b/gtk2_ardour/tempo_curve.cc @@ -16,7 +16,7 @@ #include <gtkmm2ext/utils.h> -#include "i18n.h" +#include "pbd/i18n.h" PBD::Signal1<void,TempoCurve*> TempoCurve::CatchDeletion; diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 68a781a54f..436acfaa67 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -26,7 +26,7 @@ #include "tempo_dialog.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 6089bd6d38..aa9088519a 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -41,7 +41,7 @@ #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 6a2d80e0eb..8ddc2e51ca 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -58,7 +58,7 @@ #include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index cc38d12855..61ac728307 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -43,7 +43,7 @@ #include "utils.h" #include "rgb_macros.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Editing; diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc index caf1191835..be2140d9d3 100644 --- a/gtk2_ardour/time_fx_dialog.cc +++ b/gtk2_ardour/time_fx_dialog.cc @@ -45,7 +45,7 @@ using namespace RubberBand; #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc index eccb470062..d0d6871cbb 100644 --- a/gtk2_ardour/time_info_box.cc +++ b/gtk2_ardour/time_info_box.cc @@ -36,7 +36,7 @@ #include "control_point.h" #include "automation_line.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc index 8545a345eb..2f40dcb8e4 100644 --- a/gtk2_ardour/time_selection.cc +++ b/gtk2_ardour/time_selection.cc @@ -24,7 +24,7 @@ #include "time_selection.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 2883f87866..6b66123aae 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -31,7 +31,7 @@ #include "utils_videotl.h" #include "video_tool_paths.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace VideoUtils; diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index 146ca0c56a..50e4740cc0 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -44,7 +44,7 @@ #include "opts.h" #include "transcode_video_dialog.h" #include "utils_videotl.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/transform_dialog.cc b/gtk2_ardour/transform_dialog.cc index 0c21de1a43..7199b2a2f7 100644 --- a/gtk2_ardour/transform_dialog.cc +++ b/gtk2_ardour/transform_dialog.cc @@ -23,7 +23,7 @@ #include "transform_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/gtk2_ardour/transpose_dialog.cc b/gtk2_ardour/transpose_dialog.cc index 0913102469..b5f17ab3dc 100644 --- a/gtk2_ardour/transpose_dialog.cc +++ b/gtk2_ardour/transpose_dialog.cc @@ -22,7 +22,7 @@ #include <gtkmm/label.h> #include <gtkmm/stock.h> #include "transpose_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 05b1470dc9..301ed5740d 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -55,7 +55,7 @@ #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index ef61fe5e59..7ddccc0f7e 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -52,7 +52,7 @@ #include "public_editor.h" #include "keyboard.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "rgb_macros.h" #include "gui_thread.h" #include "ui_config.h" diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index b62ac9433c..2d859b692a 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -37,7 +37,7 @@ #ifndef ARDOUR_CURL_TIMEOUT #define ARDOUR_CURL_TIMEOUT (60) #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index da3a3503f7..8363f6d67d 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -38,7 +38,7 @@ #include "utils.h" #include "vca_master_strip.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc index fbc57c5eaa..f98cda008c 100644 --- a/gtk2_ardour/vca_time_axis.cc +++ b/gtk2_ardour/vca_time_axis.cc @@ -33,7 +33,7 @@ #include "ui_config.h" #include "vca_time_axis.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc index aac476408d..bf11733b6d 100644 --- a/gtk2_ardour/verbose_cursor.cc +++ b/gtk2_ardour/verbose_cursor.cc @@ -34,7 +34,7 @@ #include "ardour_ui.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index 8399d0b802..7480468cc7 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -28,7 +28,7 @@ #include <gtkmm2ext/utils.h> #include <pthread.h> -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc index 0ad90d4520..1fe8f97f09 100644 --- a/gtk2_ardour/video_monitor.cc +++ b/gtk2_ardour/video_monitor.cc @@ -28,7 +28,7 @@ #include "editor.h" #include "video_monitor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index 2bd814b7ac..29872fc975 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -36,7 +36,7 @@ #include "video_server_dialog.h" #include "utils_videotl.h" #include "video_tool_paths.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef PLATFORM_WINDOWS #include <windows.h> diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 74c64ab7c1..0e109f32d4 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -37,7 +37,7 @@ #include <pthread.h> #include <curl/curl.h> -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/video_tool_paths.cc b/gtk2_ardour/video_tool_paths.cc index df273cd3e5..012690205a 100644 --- a/gtk2_ardour/video_tool_paths.cc +++ b/gtk2_ardour/video_tool_paths.cc @@ -29,7 +29,7 @@ #include "pbd/file_utils.h" #include "ui_config.h" #include "video_tool_paths.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; diff --git a/gtk2_ardour/visibility_group.cc b/gtk2_ardour/visibility_group.cc index 9a59e613eb..d0ef1dd635 100644 --- a/gtk2_ardour/visibility_group.cc +++ b/gtk2_ardour/visibility_group.cc @@ -27,7 +27,7 @@ #include "visibility_group.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc index c9c8d78b6a..b3960b0b50 100644 --- a/gtk2_ardour/window_manager.cc +++ b/gtk2_ardour/window_manager.cc @@ -32,7 +32,7 @@ #include "window_manager.h" #include "processor_box.h" -#include "i18n.h" +#include "pbd/i18n.h" using std::string; using namespace WM; |