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

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 01eab82b88b8f8b3e1212546248ff8070806545a..72bccfd2d43008ff53b7c9a37b5fdda4fe7051f3 100644 (file)
--- 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 11b7f13f1c31d498be2de157b1d3080fec7d71f1..1edbcafaa4e663184b82306d3bef13c0a5211dfa 100644 (file)
--- 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 d01a2a80d60cc1614c17592f0f2340f000406a49..90ccff58f77d23b7254c18085df146ebd957f3ca 100644 (file)
--- 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 31cb7432cbaaeee9557705840b2a0275d77d8379..126c1618126d9b10a18a30d2992227f4d891db79 100644 (file)
--- 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 98d0eaec3991380132c01de664f31e17c3273821..900ab4e4e20808685d7c513db754b4d71f0c97bf 100644 (file)
--- 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 cfacf57990015e28016340730cc57fd4698b410c..506e12978183c9e4dc144b981a5e8cdf743a8cf0 100644 (file)
--- 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 6390449adb7f889b474e0c7c636b0565d20cf1b0..56854880d851c69285d5008e4099cfc67c99c132 100644 (file)
--- 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 17f3dc5dde171b101aedc71ae37108ac4a423dd0..a682833706fe4cd562160845275f5db54291a6f4 100644 (file)
--- 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 5c0e25fd2459b280257df469fc92a7f5737cb6a0..3b04e1063b8b1a854de648504a0222b8c3be0b8b 100644 (file)
--- 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 1bb3671578b01c1f9573e95c5b0dcf017a25b8a0..cf9eaced57a5def2ad0df9e0ae7dbc367e99934f 100644 (file)
--- 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 96df17a5f99013de61d629337595dc43f95deb52..9c627dcb01a52491ae0a926cc12338c4b306a692 100644 (file)
--- 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 8184ae47cf88c13941ed9d5355625599819d09bb..00a1bde046977aabdfdcf71c6c9c2bb67dd2827c 100644 (file)
--- 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 68e29f57f818163996df01fad3d8d68727020aa1..8490643487ccf6753c35b6909b7baf8f6c26a895 100644 (file)
--- 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 406bf223cef14ff93cac3d4d86ad9d4991f7098f..e372c1e7fdf59f3b106fd1825f8b490b827cee0a 100644 (file)
--- 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 5882e45afbd8ad854ebdd2a504a405352627c808..9a8fc904e67b1f87dfb50691f62da430fefe4223 100644 (file)
--- 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 921cd7bc57dedec2d0ab6d343cdf17547ac5256a..4f5614e32a0e278ffb9879673833eae5424103e8 100644 (file)
--- 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 d313fb7082c1bbef46b6b9171224cfeba0e0ae7f..98ede1dc3fbcd1742264fad39eee1aa3a8e3bd44 100644 (file)
--- 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 ee28f138e2edd342847aed60838f5d1dfee18281..16b4151a81840a380c46cf45404ecafcfef46db6 100644 (file)
--- 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 a5890a656a8b4673491dcb2ef7f217a611483ef1..15186f2b8af4a9889ec8721986160974d6669af7 100644 (file)
--- 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 974dcaebadd722ca42d7c5444eee53101c70f60a..a70dcaae0be3f0148e23915350399494a6542ec7 100644 (file)
--- 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 511b4296ebcaa24ffbed7d33d47c74fd56784e12..c7adcfce7ee259b9f60c8ed49964b967f705db1d 100644 (file)
--- 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 6a9a32eac5d9295b0e5972574e883a0374ebbd96..4459afa799a2aefc35cd0134228032cd2a2c0c93 100644 (file)
--- 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 cd76163c6c0baf78c324bff03d1e1c7ff94720ee..03054fa98b60ae073eb7b4e3a646c598d6aabbc3 100644 (file)
--- 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 eb53ebce178e6769d944b64d9fd0a59f7ceac25b..a422bf972331c5e284510b31a8200b481684ff60 100644 (file)
--- 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 f1f9d68b987f8af60b3df5c067dea5cb9e643bf8..963fe63c01caf99dee30a4b10cc4066c3f3975b3 100644 (file)
--- 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 be724599801da0cf42279807e686db26299796af..8cb19c2e3980d0e95f123730f114c341b346b55c 100644 (file)
--- 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 ed55ce1a6959c24658ea18a7190ba98cffbc9e35..e2b74dae97898c93cb92184a76e5e2dbb2657b9a 100644 (file)
--- 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 d87768703973d30c758e4a1b39d673a9b5e4bdf0..016e57945f65d07e88384a1966c85a9a92736d71 100644 (file)
--- 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 56fe34feac463433c1069285217eb8e313c98ecb..3d85e463a72b6026f149347e1f196d877ab6b12d 100644 (file)
--- 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 14e6f51d15a82c6d3ee2a36b16f0e048dceabdc4..d63057408e2aba0f3908b9e4f717ca738a806095 100644 (file)
--- 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 2586ad5dcd79a12de819d650660372b5e9272ad0..e553213ec0417fb1f053e865075a797d0eec9b07 100644 (file)
--- 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 c2547bed444122592883406e1dc5b5248ab9b36d..6ee1e0f7a24be27c66b9346e9fb51965ad761ded 100644 (file)
--- 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 3c8f98d0297d5976e28cb053364a397957849cad..9932a190275afa08a0a263645375130cc0615cdd 100644 (file)
--- 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 8302e6dc2b98b7556eaf0cc91fe80843d942860a..234a603cbb6fd37cb047e237e076dfc26aa3392a 100644 (file)
--- 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 df0a0ddd4cf5f3db62850fee0999bcd5422c1d55..e038493c96ce57216317a8625d237293fd1dcd95 100644 (file)
--- 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 67f13a1f5ba6612058682730e08ff2a9fe4f1617..f7a3211d3d91c36a52e86e5c766057b8b796c7cd 100644 (file)
--- 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 b906e639d53b286305105addf4bada41f003a498..2a457c52f1ec487a19fcb06c375ccdb5d5644859 100644 (file)
--- 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 9cb71cbb2cdcd21a69071106bdc36671924a92ab..06ef2ce1f52e079c0711696bf18d1bb2a773bec1 100644 (file)
--- 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 dcb62971cf3951b9b3ee9faef976e2500bed0e32..55705cf590cc6f47aa98091506b575525dae65b6 100644 (file)
--- 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 b69d17c602962c51b4b2864ee978aabce1685b50..05bb878f2c8306241eb97df28ef276ac9ace46cd 100644 (file)
--- 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 08cfbadec2cf7cf602244c48149224257d21a51a..39a3fa4e789ad354e6f56fe4e20c0ecc5edf0232 100644 (file)
--- 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 486808065e28ed9b11b0de10d415ca837346a100..10181d56ff7879a7bf6e830233b903f37966d962 100644 (file)
--- 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 20547e8e18ba8df8d342b0021f13ba5fe695ef24..4edf3a5693f5c36e6da277691542cc0c92e1f940 100644 (file)
--- 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 f2b742804c06753cde9192811af20ce08a8c8c09..79900b35174c3db546564b035700bc9c7a596b1f 100644 (file)
--- 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 9ab03d08426168cb8c675054fb471089131ade40..237fb6776d99d36940340b8f34e22501a55142bc 100644 (file)
--- 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 b6ba2074d46606fad6f9652dddf0f84aca228faf..4693ea8790246f959b7a69ac8b74e5c9f13d8ef9 100644 (file)
--- 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 40ca1dbf22fd8880104fdbde8b17df2b67088457..4fbe0d844404746c3d6b531578f8b1b4a36668a4 100644 (file)
--- 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 c26e4b96dc091e321e4371130a438e24e7daec3f..30e2504edc927c70bcc20bbf77eb9538f94386a3 100644 (file)
--- 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 5a0695134febc34a21e4a46671a54695dc212531..a3b6664e57f4aeb5af57e62e6818861ef3dd4334 100644 (file)
--- 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 2bd607f10871a9a833aced746997eed9b4bccb61..795091fb4142e846753dd1013bd83e7b272925a4 100644 (file)
--- 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 04446c7ce759e0e82e8a09b2907be6c51f6f9ed8..04f88542bafd180d893d229f4b11d0380ce86120 100644 (file)
--- 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 1edcd16c9e017f4221cb479c375c67c742711905..e1562dbe053ae78031185d82f478453c0604fd33 100644 (file)
--- 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 03509ac0238c858095b5d450eee149ae354cedfa..0c0066c3a537545d44e54009cce6b6923d5a2f8f 100644 (file)
--- 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 71b4744d95ba03c71e90a70836c4eaa56dbd28a4..d20404916ac666d69879ae8026d9481134babd1a 100644 (file)
--- 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 029f6d966da8021a67c050fab700b2574f49317e..0c0348383f2a577a3423dc9144acbbc63eec6476 100644 (file)
--- 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 b7ddbb5c7f679839e437465526a800de20993907..8a8a9518cf02b9ee912a2cbcf744dd97cda600f8 100644 (file)
--- 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 cdb0b5bd6a2cb86031e7a292f761e5ef94bd6e64..c83e96d67f15a269d77d3d561e7227c30e31d830 100644 (file)
--- 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 d0bfdec27d49e5e6028b9c01977f7de348390214..2b659e0369d509417f7a6ffe179acaaeb08a79d0 100644 (file)
--- 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 5c65df73ba42c9b9d1f48c2954c9025b5e0e2907..845e56fdec5cb00e852a04b61123c0dde6f089bb 100644 (file)
--- 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 7d3f0e2ccd020223a6ab1258cc06e061a303ebd7..3cfa1eeafaf7c45ea4bd43c065f6253c4089f87e 100644 (file)
--- 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 d2514c9bb41a03681f1bc24b1502699d25783406..6ea6a1d724a02bd6f806198c2603899d2c059ac7 100644 (file)
--- 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 596f4f26b9bcd2bb499c47a4cf8aedfeac5576d6..868b00690083be3eca49a8b14ed4049d79a65a9e 100644 (file)
--- 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 ea6c40f1b29a7a8a3bf9bb96a42fd0db55e2c142..c5ba764af8a5f32d11389edc005b47615f07b393 100644 (file)
--- 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 f79a442481a75f15a49d6c910cb3acf87d87d9c5..b90737cd08dd28b8ba5952fbb885407e215b28c8 100644 (file)
--- 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 ba73a01f0bd09e43357febe8f8cbccea5fa09c85..722490c26e030844c6c6ce34cf86096b49ba3690 100644 (file)
--- 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 1560f93dea26b576e70bcdacde90d10891e7012c..067cfef8991a5bb40f7cf2a564b7f7fc19c1d31b 100644 (file)
--- 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 65c4fc75ab9ebc1ac42c768527d65fe0ac6614d4..e5f5db34653ec38189c89418b748485de9d078c5 100644 (file)
--- 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 4d3898182c21573524db1c6ac5313064db033483..cf1d3b0d36eee0ee1efd76140d6ecc28744b228a 100644 (file)
--- 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 59720ecb3e6b56a60997f339db5c9749bcabe0eb..acbed62030a7396ddb91d403f5d2f334ff8ee3d1 100644 (file)
--- 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 26e2b9a68887628f64560848f7f491f453784ffc..59985a04590eecf29202fc02cd1794b00fa3c770 100644 (file)
--- 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 0ebee83a680006dc19d65c850346da72dac0e6d2..8e37356d0d7be6fbe112aeeacba60d690251ed0c 100644 (file)
--- 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 317e52b6051b4a0a88952f85cbe392d0dc0a6ce4..e16f527a9ce553ccaa44be0302af9f616f77767c 100644 (file)
--- 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 ae69551ca4e07f79d1df3f2566cea17699afc257..862401f7043c9bf8e5aea1eb04d5e376a27f72cb 100644 (file)
--- 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 407465605eb6d9664843396eb57d2eb0f3cc38d6..c77a09cdec08e1248e24afe6fb7cf879fd0ba649 100644 (file)
--- 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 3e3b0d0b1546f09396887d8dfd0537bd9a6d53ec..018beae39ac04bfb2511d14adde015cab8d23ef8 100644 (file)
--- 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 5d3e664d45c5d482a22d5912a0d053c0838e9a7f..942e1ddd4229c8986268217cc7765c78520a17ba 100644 (file)
--- 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 9a294aff1baa35312b962778d39074a894a08b68..ad9470af32c6e0ce2d6591b17cd2e774ec9a7f69 100644 (file)
--- 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 5038339b7dd6676795327c5095792e92c1b7b807..c1589909b2c0f38ec7591138f90f5be8bed7011e 100644 (file)
--- 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 15ecc1a30cc7a7ca29c17f9a8f3708f7d62e9dc5..f886bee078b29279ed68e8536f2284ed3020f795 100644 (file)
--- 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 d9c8c10b15213747ffad7022b30453c05aa4d9e6..6a448ac52ca298535a224d38c0e7aae6c73b2acc 100644 (file)
--- 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 c78c41e4d9ef992c7e583f4eff2d55d8270042f4..571969d2dcc12559676d848f9679cae21e04cf97 100644 (file)
--- 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 53968d7e8c69b600133affc765c96089719c4517..4b72a25de834c9f778385c9126e8efeb47dcbef6 100644 (file)
--- 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 829eb5e2ce490d339f884eca207a2d567cb11104..637eca0bbf8305174826b71a5d11c1067886f461 100644 (file)
--- 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 706b4b672752038e893703b3cd71d5968cbff890..9a6db259dcb44f9f4ddfdcb95630ad3d13bea143 100644 (file)
--- 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 6f57f3c5252b197e0c547b67b12093af7bec9fac..f81cc585f8fb10c7ce4b3e727202be5fcbfc7850 100644 (file)
--- 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 34d32a5b31c3048ada2c768691949e164e758687..3f6b79c8c677468b293b38f890331baad475ed63 100644 (file)
--- 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 (file)
index 4b75d34..0000000
--- 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 8620ba18e5fba69d9dfbcd27a860b698dc6ae990..0aeca1e2df37fc42f0b0e6b2b1756dcbfbcd6363 100644 (file)
--- 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 d4f89e2f63ec7fb125e198f4745d4d55d737969c..ffd11ccf7015ad867702bd9d20a810e2cab4138b 100644 (file)
--- 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 136d77eda015deb5179cfd91a8181d4bedddca90..c74f12914f3d37a62720e16edee0f44d6af56d09 100644 (file)
--- 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 574b3cd0ca23897dd02bc09c6ece99c846e2a9ba..6d0ede316c7a4240e1b0ebc1f57d39259d3701d3 100644 (file)
--- 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 729337ed1152bbfb9c99c112b1ff6549e3620aaa..6341071451f94d3b5e99b72169e8405652ff53e2 100644 (file)
--- 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 36b0c0bd49acd2705c2a116e45d1bc98529155bf..b19b6d5fc009611b321026bac56e61bf0d1aecfe 100644 (file)
--- 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 d21a055d9e88875c1d68b871ce9545238f622a55..dbb3e08cd7c86e0ee89d8caa146a955b83568159 100644 (file)
--- 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 114c28c708756e27d152edf060fb60fa4e776523..2ab2cf567c2d65dd085db7f6832708705a122c44 100644 (file)
--- 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 7dfc2ecbce5dfe6fb16cd60a6a1aa4c5f06f6f56..76111a49e767b8d779e5537beee4a3c4184c73bb 100644 (file)
--- 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 279cd50e67e7b88cb6b1e6dcec2bf003e735f0a7..c33dea3e5554f67f40fd88aac382a699ddecbcf3 100644 (file)
--- 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 eb755c2087014f9886b9b26bddf560094f580d2b..5893c15fd942d7e31be0dfccc366d310a2bb698b 100644 (file)
--- 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 79220dff24c8aa4baf6781d11adb219217ea3183..e8ab438a15d490704fdcaec1d00319cd089e2354 100644 (file)
--- 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 c9950fa527c4d7207b242d3d33dc6ffc01dc08f6..75b3ff0bb89f7823e97f855972335611b8513f80 100644 (file)
--- 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 0fa6f53fe1542bd982d04e26784480212b3aeeae..33e30c2c15876f01644140b4246f4a0f62fde3ae 100644 (file)
--- 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 6c5a48f5701a86a86258523ec3e5032e9669f347..9a7360b41f4502f767619dd7a575e577224907b6 100644 (file)
--- 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 c018ba54e7198b81abe8b4b877003d675b2d261d..312c98bbf9cbeca35da4d19c126652fadbd11ee8 100644 (file)
--- 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 f3f2073a457a27ed8ba24fcbee6f8aae167d49b9..ab6b9446d3dd82e10481a4b53d876f21194719d0 100644 (file)
--- 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 3ab26d92bc2c08e4c16269019e5f6746ad42aee9..db96a3cb7f7fcc7799e52efcf827d6a922b81f57 100644 (file)
--- 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 07553ced18283aea4af08ade83fb0c68bc2c7686..02350c92bf114345012bfc95a092c4b30a1b5219 100644 (file)
--- 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 c76a35a069b89c7712243d815803fa01fedfb5fe..9a40ebbac3bea154c23a414e98f458e817b382ee 100644 (file)
--- 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 d39853e20984d6ec40ccada8f6a400c157dbac89..6d79306e38b6001aa6ffb6f54f48cdbec8300491 100644 (file)
--- 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 d76a5d5ff22aacd97e458f4efc62ee2fad8d4ec8..1da8fd9c0059dfcc9e5179a067d0dde9c8a02014 100644 (file)
--- 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 3e91ca4f9f77189289c1f1e189170a419c014a5b..9fd02397d7655d3d6a5b64c6ffd55f3912a500d9 100644 (file)
--- 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 7771dc50cd463aae831d36a2926a05857c4a8602..731f8b11da2c31cc220d7fe1b9a3134abfcc2520 100644 (file)
--- 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 cbf2ca571b146d0295bb03958a735202cbd409c4..20904faa59dadea727921305321118c0a1767fde 100644 (file)
--- 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 14e39dd625fbcfaed84c417bfb0b9e441e2ecc05..79933b94d6cdb58afb0877c796720801733885c3 100644 (file)
--- 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 6bd6775618de498d2c34d4b4235863a02b8d78a9..301e9ddcb401f51eb959ccc6f9008eed3d0bff89 100644 (file)
--- 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 ac39c557aecf9567462c1fe49976e7d3fb9b1728..57cde4af0dd43f57ae6e6dc8cb41fe7e6b7f0b99 100644 (file)
--- 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 3d5e6ac796c81d95133fc940a6ecf0d8529548f1..2f97e5b6d5076a59136a78ce420bf794fc692ae0 100644 (file)
--- 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 5b21e566e4a3033650543f3f6fc15981684792e2..4c0e42f913a8b474f617cc2c127ad2ed3815466c 100644 (file)
--- 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 9fe125843279424fe860926f0839f307c82b4dec..47e694841286f66f4702691d769d38d66e8ade16 100644 (file)
--- 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 1e216c349f245f6ccb6e718d4a701b8972d5ecb8..1f2a4f060f47d2c076cab3db12fe7a63d64ac2c1 100644 (file)
--- 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 25dbae44843a23b6450616c94f3ba9fe569d5e98..63bb1a091f5f6cda414a797d3056977a3438c38d 100644 (file)
--- 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 eaf3aeb0961ee59e937229a1c51983e9152f5276..b5ae269c7fb65864bd16f60df36bd108496bf0ab 100644 (file)
--- 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 cd2304e7f77ca594dbbe45f23810a77b4d9ef289..4c5317a389e3fe833691af1c0b14dd249b9489fd 100644 (file)
--- 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 eb131a7d3c9731066dfb2c9d4a40c30c3fa185fd..2fcc5812b7d049494d30275283a10b7acd252059 100644 (file)
--- 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 5f71a79b6f4fea7bdfc0aea2963258c6d81984d7..0a6d731f3e3896e568576c8397f53bb1215963aa 100644 (file)
--- 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 0dd54ef6ac4501c660be24e4e73aa746f1778087..da98fcb120611687b2ea43502079acac204c5cdf 100644 (file)
--- 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 5a9a0927c533fdc3c13c92adc4f775dfd92dc15d..5561a308ce1c271a8f909c89851c1606f7b838bf 100644 (file)
--- 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 61a8e1a9a475036f839e32b42b6c8aa7266d4e24..d553efd1979220bf97629d596ad98e4a75ddaca5 100644 (file)
--- 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 cc5c4b9b612d3b87849c26442f2b37b013de6742..70926f5a378ff051f2a3b944e9ac0d6cfd4652fd 100644 (file)
--- 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 308328538cac2cf18ed654efe4258109c0f47bf4..0ebab122f78bb199a59d4c89d657b92e10972339 100644 (file)
--- 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 14d45ccf5a2a7d2993e93cb9c0e4832d5c9a1dc9..203213eced5a54d83a4d54b4457b212e4be79d00 100644 (file)
--- 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 1088d1d9b4f27708f75e1a2f2c09ebba51882d46..f19babaae46b37ae126b58d328be77bfa15a9c83 100644 (file)
--- 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 68220fa7c168d3c8e85f629c470a83e04fbada9a..98e72de7884235c3062e3e72868ff132d82c7c0d 100644 (file)
--- 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 4212456f750e6ed8f25d0bfdd203406143602b0f..9697cb3a6091d83e46824e82a3f17d61cbdf043f 100644 (file)
--- 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 0a1d9e8fa21ba823e25a27c7ecbb209224271ea3..6e04d9fce8603d3dd19424ac03e3b0d98b13688c 100644 (file)
--- 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 91c2d1772f89e8ead76f4c761dd006da39a042b8..dcbb36487b03e2cf64d8ea266f0261536711ec66 100644 (file)
--- 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 2df7a819ada7f3fc9bc5a04e2727ade68436d02d..08188337674612562c65c1ea27454e4d1907b87a 100644 (file)
--- 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 1c0d824321b5c86af0c879f39f043834e2c90694..9bb339fdd43f2a0e0d01869333c2aedc6c34734a 100644 (file)
--- 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 35a64f38dd79b4fb485ead5e4d082246e152cf67..cc92d5d2befa267141e460f84f52deb38da70708 100644 (file)
--- 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 a005f7467362ee5fc1e2bb5a2e58467c56a724e1..104b9a09f86896e99b9b2c593a7df0815dd4539c 100644 (file)
--- 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 3062dc1a690b9103a432984edbc0e5d556923ca6..24a4fec4f4cc071c6f93ccdc315bec2db064d3db 100644 (file)
--- 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 08046143f5539414acd060080d3d1f6e5a2ebc20..3a0fed0d67851e0e1effdb6bde010903ec70d3be 100644 (file)
--- 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 3398f8bb8318cc4563587100cc0f7fb671d02515..5feb76aefe7a550072c10c2a1fdcfd22c295cb30 100644 (file)
--- 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 d3f984b0a64b766be1f37fe512564e55f78e3b96..711b1f555fc1d430bf53cec56192135f1a7f6c87 100644 (file)
--- 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 2691b46a7b8239d085f56e8e135a0702e9cc397a..96db6f73e718a5ce36c45d286ad0f1aa12203fef 100644 (file)
--- 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 a742740e5a607148ef3f84b53a466b516d2082b6..0bf86532995e0d4f15c205b51e29694cdb76bce7 100644 (file)
--- 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 a580327988f282406680ee9586412fefe2cb1975..1b588511fdc47c7555555b634b9d70befc4544cc 100644 (file)
--- 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 83864a607c690bb74dc3c699bb8b6b38071ded82..24fb575d3995af970273b60d68d2ab2576a07100 100644 (file)
--- 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 cf591f8ff8494058f4d93ea5256db5269889e31a..4cf12b58b3fce1c89f4d7fc3ccc6ca1825c467ee 100644 (file)
--- 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 507e9fc254c24d43e79b7e9b4ce07f14bd2c711b..c6b02eb488cc3ca85e298dc7baf070034172d61b 100644 (file)
--- 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 ee7cfa8dffb1212d7a24b5f65964fcd43b550bda..c70dc9078a96b1b015f25612e5b4e1b75d3e3fa3 100644 (file)
--- 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 11f823e0ff1a0ac965c9dfb182cd64bd0192fa2a..6ac0ba358b9bc116ff020e9d90f210ca858c7f26 100644 (file)
--- 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 05c8d1e940e392af9b5dfba273a28e5afe3db77d..591d80195f6132865e1475ca5d0a938c56ed3db0 100644 (file)
--- 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 8b4c795cbb1bf3896b122a44a6a6cfe3848398ad..97b81d8c1dff958ef41000a2c1fecf6cddb3a347 100644 (file)
--- 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 725e5c33ddf7932833d8d7c9f66cad6446ad2871..596f6009aad5a6ded0263eec68e772aae707e583 100644 (file)
--- 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 dc1c14e43759ef3c6e7dd071f1b6729ee18f2c98..fd09119bd294c5749fe89ad1991cfc9e3247370c 100644 (file)
--- 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 92c7207263ae2f40737a422328386969fe6abdf1..e58c7c9768f2402ba6b5f6869e14c9cc98529904 100644 (file)
--- 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 1e848cf33903655efdb1f23c3ae2cbc94f787bf4..27e161176bd77a24ef81bf48992f31fa11e7804f 100644 (file)
--- 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 301ecdab312fb2b684f289efd9f6faab7689caf3..a6b27f7af7eef67a509e97bbd814ec071e80f37c 100644 (file)
--- 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 d73b376439f61720eff0f030c521d6f80b1ba27f..4d39232d8c734f713d8eb97394470acabc43683a 100644 (file)
--- 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 b1a75794ce00328d98f7be8f0f4e6c53ff54459b..d7fb115e9fcd4b847041dd3b65afc82567cb555a 100644 (file)
--- 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 2cbd472fa7279d98b8fdfba0e371863be79a59c6..5ccafaec398c70467c9313d65c8943ccd4449126 100644 (file)
--- 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 024627f068f5ad5c6f936fb3ed0d2b2c62ba63b0..a8ddc02c1f9bef62c8560dae48620861d670f369 100644 (file)
--- 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 ed993fdc86bfe01fe1d77de5eb7ff10ee31865de..729032e637fde74e8df417b98261e329c85471c9 100644 (file)
--- 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 c6c8b3900063c07a74909f31ba748a3d3b4b579f..9bf84f8b13e0ce4ce80e05146bbbe54a20821cf9 100644 (file)
--- 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 5b6217af4a85bb086865e5c6ac53be7b6b13bc61..e06355637e9251afd3d61a13fead54137ed31b52 100644 (file)
--- 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 ce34d70ad3287ceba0e684c4c1e50baf04e7b5a3..cee831f78d16144c623d4f667d22948e0207359b 100644 (file)
--- 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 ee14e3a83118f958e77052ee074f2091e36e28a2..eaee07764cd7f54c1f9332e3c776d2807dbf1272 100644 (file)
--- 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 31cea38338a807da236ff8fb1b075857090c3654..4a26973e648bd50c701c9f46df20668a8edd4bf2 100644 (file)
--- 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 9aea6178120fe71aaa6bffe2e8655bfbf56d8066..925b9834cbd4ba12f8c09361f29f158879fae625 100644 (file)
--- 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 feb7b3b1a578b7680f13b05f3ad35a25a59690a0..f7eb676d9693adeeca9c1388c6da76d51d30675f 100644 (file)
--- 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 ffce0790f865d910824ec29b53817daaf524af7c..f122de3a9b8732b0333c158bef024acab0810841 100644 (file)
--- 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 7f87f2dea852c3c2b3e4984d2cabe3363d6effa0..364e44c7b0113b43495830a4a6150a1bff84bd2e 100644 (file)
--- 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 fe8a1bdd4c4bfe204e48cd0db389b76eb81a0050..225b02df84ba3d42eab0748bacff1f232778db26 100644 (file)
--- 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 5783c8376ea189ee27fd2a2c7a98f521c480a775..b528f91b6c325f2f69fdd65fc9b26d511a570b88 100644 (file)
--- 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 88720edc7460c7352c007fb58ee7b8ec67a5a5a2..a4cfee2b1047ff33aa78eca0955fb3419553cdfa 100644 (file)
--- 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 4fd0feb2c2868050892bd48895944366805c89d8..baadcef795ff625c66f48bf26898358f3361e70c 100644 (file)
--- 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 94e0058c176fbc3fdd2c9801108b3dd30e4dd313..74290df0a3dad079d0b72aff297f14ac1943e00c 100644 (file)
--- 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 7cbd74c75d4cb9357a931cbcd5c55e1b1840b0f7..f94c584019393c7c1fb29f38912e317ca5c7336b 100644 (file)
--- 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 c423c21679ac332b9f2e946a49d65aa9aa8ffd1e..938ba08c51fe3a35f9a51ba094082b686514ce83 100644 (file)
--- 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 524c462efdf4e1270b39fcfee7899efa7dea470a..e7e43adea0a9b16d4f31e4cfdbc1119fb76d1c97 100644 (file)
--- 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 3578682422a0842e270c2384f249bf3eb335d401..3831094c5d8065897b08ffcc485745294b99b02f 100644 (file)
--- 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 407bdec2d2201c7d3ee3fc5caed3146878515a09..1784ac8164584d7a78b59c1ee43cb2718e178d3e 100644 (file)
--- 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 ed0cd885cb4a3f0edadf809464e681edb7db088e..58c1cfc7ad403bdf713771b12a09538ffb588ea1 100644 (file)
--- 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 f49ce44813dd0d43e2099f2826ebc5f69e41036e..855766b1c8ea9983dac0ff8227afd0d0905bb81f 100644 (file)
--- 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 304300fcdbb38912967301c3cb70a9a1c4e3943f..d528cb19935ce1a676ea64ddb473a155ebdf2f65 100644 (file)
--- 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 477a6650a44fce38fb6bf5ab7fe749bd144ae8c9..9154b3732dae740f634f507410f09b7cf0c57cf9 100644 (file)
--- 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 02aa5168dfdd607726f48f9ed2277df33a4f825f..bcab05b9c81095eb3c1041f42274fef5669c4bb8 100644 (file)
--- 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 cd41950924d37f28dfe952b6d71739de30aceffb..87125b2298b87cc0e18141ed9d1c12b53fceb32a 100644 (file)
--- 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 2d71bdf5ab90c3020bb33a0fc9dbb6cc6a60b11d..214686e8ff3dd56f39ad3172b9f2d491328f7fe5 100644 (file)
--- 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 47712052630d6543eecdf1ead8b5d612e1d7f357..db675c9c5f710116c00aed5e2594a2d6299a34e6 100644 (file)
--- 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 68a781a54f35a49e78680c6c54bf74a47d897298..436acfaa679a5b2301a65e422412772b5ae96c42 100644 (file)
--- 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 6089bd6d38c6cf0c8b395fbe64387dcd4691e6be..aa9088519aaa9f950e952aa391d64d678e9f0b55 100644 (file)
--- 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 6a2d80e0ebeec34063783efa508ad591cc6d2dd9..8ddc2e51ca6faa11757bfd09924b29ef13831a80 100644 (file)
--- 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 cc38d12855708cc312ba2c68b5e78998d26eb55b..61ac7283077a8f9c2fe69ba4e57f7a6be8ed01d4 100644 (file)
--- 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 caf1191835c52654d3b331fc74472f494b97c2ed..be2140d9d3559e8ddfe492293752940578f418bd 100644 (file)
--- 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 eccb4700629cf26814020548c1f1de1a7def9708..d0d6871cbb0c07a3626e035b12e3e9b4f986c89e 100644 (file)
--- 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 8545a345eb3950fe2520d1f80e68b1a7195c32b9..2f40dcb8e4afe0a06c80f963193fa94660bb1caf 100644 (file)
--- 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 2883f87866598405967f7589600128ac5c72b5eb..6b66123aaed96096075b4b143756957e3106a9fa 100644 (file)
--- 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 146ca0c56a5fa0f1c14100b7f001873bb525b15d..50e4740cc08276cf25ab558d5216144fab5692c8 100644 (file)
--- 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 0c21de1a43960b049a53ade0d8ad665e38fee5c6..7199b2a2f71225ed6381b492961e67cb6bd14afd 100644 (file)
--- 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 091310246917530bfef5ebedbe5370965548eea4..b5f17ab3dc977d2d71bfdfa06be7d1e64f4dd0e3 100644 (file)
--- 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 05b1470dc91646f227f7ff00cca1b976fcfd44ff..301ed5740dd6ad0fb83e354284840cbbd74e1822 100644 (file)
--- 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 ef61fe5e593170bb8eb199e47300c5de3e2a3c40..7ddccc0f7e9467c99cc2f1c1d178275644956401 100644 (file)
--- 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 b62ac9433c93813e30dfcc2831090ee93ba02191..2d859b692ad404ced8a40fd82680469c2e60b532 100644 (file)
--- 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 da3a3503f7c753b6ec6d7cdd4f017e6b5262d11a..8363f6d67d27b12aba3c03fec01d69d165673fa9 100644 (file)
--- 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 fbc57c5eaaf8ec3f279fe849cb1bfc3d3de2c5be..f98cda008c7920f923c21c83b3dc7ce855a45805 100644 (file)
--- 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 aac476408d436d4f925eb2d6482c8e2840405e11..bf11733b6d25e93e7e69b45dfa2870d2edeb89aa 100644 (file)
--- 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 8399d0b802a491cae86206246ee34eb24a4532e4..7480468cc7912377dcd0790cdf969cd35676ecb2 100644 (file)
--- 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 0ad90d45208089d2691b80328ae0b2a1e4c4ff5f..1fe8f97f0918fcfbe1c19d248d87a20db579ac28 100644 (file)
--- 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 2bd814b7ac124a9d31436c7df027beefe0ed5b27..29872fc975b7d2886f20e11ac9218a793199fd1e 100644 (file)
--- 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 74c64ab7c1a524717ed70b1b47246748a63c55da..0e109f32d4af186c971768076e46fd4de41299d6 100644 (file)
--- 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 df273cd3e5e3beab46156c73e23d5b580b25cfdd..012690205a8a799e43dc071796cb211a3b8d0db5 100644 (file)
--- 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 9a59e613eba10edcc076c83d7e090a7599f8ecda..d0ef1dd63510a0c36b9253a4421ab724410b2d06 100644 (file)
--- 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 c9c8d78b6a4ac9389d7d5055c2dbc24c5bdf2722..b3960b0b50e19f2a08523b3396b61fbfad2e5651 100644 (file)
--- 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;

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index e4223e458613f36f4a3b0297264f79c35d596539..d86362aa0d37d19198d8a8c840441c8145d133fe 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -31,7 +31,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc
index a603e29b230cee7fbdd361d90bed458388e26a34..457291f72f51071f3cbc567fbe0bfe167d89e5eb 100644 (file)
--- a/libs/ardour/analyser.cc
+++ b/libs/ardour/analyser.cc
@@ -25,7 +25,7 @@
 
 #include "pbd/compose.h"
 #include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/analysis_graph.cc b/libs/ardour/analysis_graph.cc
index 53966fdfca9b79d1c1c837a85e0170cb53e06e20..a1e8807d57bbef81e32eede3278efdd5d2730188 100644 (file)
--- a/libs/ardour/analysis_graph.cc
+++ b/libs/ardour/analysis_graph.cc
@@ -29,7 +29,7 @@
 #include "audiographer/general/analyser.h"
 #include "audiographer/general/peak_reader.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace AudioGrapher;

diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index 7204bc33c87193d42b34720cde56346df96375a7..80e51232d09b05bad9e931b8490a57cf31678a77 100644 (file)
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -34,7 +34,7 @@
 #include "ardour/types.h"
 #include "pbd/signals.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace AudioGrapher {
        class BroadcastInfo;

diff --git a/libs/ardour/audio_backend.cc b/libs/ardour/audio_backend.cc
index c3e88e76691ef898ab1273104476833f494b2ada..930eb416bd0dd9239493712bca93690c901492ad 100644 (file)
--- a/libs/ardour/audio_backend.cc
+++ b/libs/ardour/audio_backend.cc
@@ -19,7 +19,7 @@
 
 #include "ardour/audio_backend.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index 6d8b2aa55f6d6aa8b3b6eb52e69da7c8ad11eef6..89e210c7728a7c323e8bc3940264a71fcae6c2fd 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -22,7 +22,7 @@
 #include "pbd/error.h"
 #include "pbd/malign.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index e5ba4e8dcdd0e632b834914b8264e0573460a94a..330b9d582acda0367d509993f54c0b1b2b98e339 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -56,7 +56,7 @@
 #include "ardour/types.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc
index a1643c88c55b6c8c3cb12fe2e9b712947554f3c5..2f09a37633062d55fc13f0be90c864c08a3be54c 100644 (file)
--- a/libs/ardour/audio_library.cc
+++ b/libs/ardour/audio_library.cc
@@ -40,7 +40,7 @@
 #include "ardour/audio_library.h"
 #include "ardour/filesystem_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 80ec1cb5f13bf20c9c85f2b966203bd1f3ca9c73..b00252df7412de461b073557d4bc974462ebde2f 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -28,7 +28,7 @@
 #include "ardour/region_sorters.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc
index f24777c68d5c96395a3adf5027ed55341d70dc4e..c1afdfe535e1862b24481f0bd4a77eef6c21cbe5 100644 (file)
--- a/libs/ardour/audio_playlist_importer.cc
+++ b/libs/ardour/audio_playlist_importer.cc
@@ -31,7 +31,7 @@
 #include "ardour/playlist_factory.h"
 #include "ardour/session_playlists.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc
index 98df5c1835316cdab9ec0f885d6b9d23c71d9d83..f77c8b526fe1280582f464495f742e7f4a3107fb 100644 (file)
--- a/libs/ardour/audio_playlist_source.cc
+++ b/libs/ardour/audio_playlist_source.cc
@@ -35,7 +35,7 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc
index 615ec4c0d70b6f6f2112944858a57427011f0928..8fc5c53d6d4ecc6704db1e074aefd68c0fa4d907 100644 (file)
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -33,7 +33,7 @@
 #include "ardour/region_factory.h"
 #include "ardour/session_directory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 8c56f90afbe1d52c9c3903efd29715f3a37d648f..8f83c19161ca6d843dcbb6b5cfa61872e532dceb 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -44,7 +44,7 @@
 #include "ardour/source.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index 5280216d1b0c14c0335c9477284b2c9e8b6c5103..dd77cb370e4cce491e9a17a425f0801d6df6bd07 100644 (file)
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index c9c5565e3bbad09009520ba85a91d11f1b3f0cfa..88cc197d60d5b50023d047dfd56db65f7edf258d 100644 (file)
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -71,7 +71,7 @@
 #define ArdourFindNext AudioComponentFindNext
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index 7013d3446f515447d703ef28f84bf234856a2d5f..f90edd380a094d2840daa7af61c87f814180fcc0 100644 (file)
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -33,7 +33,7 @@
 
 #include <cstring>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Vamp;

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 84bfab11f8b18bf4e390ede04ca2f2a107915b67..30c2113c06ad39fe7e23d3f695e985c3586e7db1 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -55,7 +55,7 @@
 #include "ardour/process_thread.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index bb3c18f810470ed3b33853da73b2dece1d0ba686..bb0b4da77446235869ecb83cb3f43e7659bcbbd5 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -61,7 +61,7 @@
 #include <AudioToolbox/AudioFormat.h>
 #endif // HAVE_COREAUDIO
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 2917f155d3ceb482a1801d23f5d4e7f805e5befc..391dcfb2d381bb6802688607b05d3a63b119d143 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -55,7 +55,7 @@
 #include "ardour/coreaudiosource.h"
 #endif // HAVE_COREAUDIO
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 7b3f424663ab78b8ce879c8ba4531dd3dc21a2c9..123bc229180d9d70fa8e2fc7e4a95b54d3df76bd 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -58,7 +58,7 @@
 #include "ardour/runtime_functions.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "ardour/debug.h"
 

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 0c7ba0bc1c15b81c4c335ad2430df2a9d5c3485f..aa81c3aa927383313ddc2abecb46e0b4e7c5a89d 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -43,7 +43,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 Auditioner::Auditioner (Session& s)
        : Track (s, "auditioner", PresentationInfo::Auditioner)

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index dfc7be417ab06ac36899112ff083531f7002deb3..10d2565c90c4be3ce7f96e965e42856cf59ac8f7 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -40,7 +40,7 @@
 #include "ardour/uri_map.h"
 #include "ardour/value_as_string.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 0d5c2ecc2d23cf90910ca4225d42e4524c6b29aa..e27da6ab08797f30badbec995de59bb33a57b136 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -31,7 +31,7 @@
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef COMPILER_MSVC
 #include <float.h>

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 3bc3f7e3d81d285ed11c8d699607141759345808..4b23378cacd1275e0d170fb660682ac177bca556 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -31,7 +31,7 @@
 #include "pbd/stacktrace.h"
 #include "pbd/enumwriter.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc
index 99340839d2bc080bdc6a6ce5acf8f04b82b303ea..c27905e2cf4b9ee9a19302e64dc255119c31dc2e 100644 (file)
--- a/libs/ardour/bundle.cc
+++ b/libs/ardour/bundle.cc
@@ -23,7 +23,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/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 62f3a525ea82582c8dc866a627d0ef715a0de2e3..228188621a80ba47226bbeaa65844a50729520ab 100644 (file)
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -35,7 +35,7 @@
 #include "ardour/track.h"
 #include "ardour/auditioner.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 

diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc
index 751e74cbcf3e406c696c141c867dd3861dd122b5..b9bd20ddc3126acffc9d53116efb2275f36dae13 100644 (file)
--- a/libs/ardour/caimportable.cc
+++ b/libs/ardour/caimportable.cc
@@ -21,7 +21,7 @@
 #include <sndfile.h>
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/capturing_processor.cc b/libs/ardour/capturing_processor.cc
index 8951bee4875b211d78e7714a47f2baa8124ab287..b94288325068575eb346d8c9e17f0656de8ca2e2 100644 (file)
--- a/libs/ardour/capturing_processor.cc
+++ b/libs/ardour/capturing_processor.cc
@@ -22,7 +22,7 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 

diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc
index 3cef0f6f908d84b2b572c9ca06f10ec4272b10de..42f9994ae31395a27be18892443876d0570547bc 100644 (file)
--- a/libs/ardour/chan_count.cc
+++ b/libs/ardour/chan_count.cc
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include "ardour/chan_count.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 static const char* state_node_name = "Channels";
 

diff --git a/libs/ardour/chan_mapping.cc b/libs/ardour/chan_mapping.cc
index ca422b5bced2fc260da5e726a061a08f4962b73d..f6f0e092c8065acd309bfe7d92c1cf73fb7be600 100644 (file)
--- a/libs/ardour/chan_mapping.cc
+++ b/libs/ardour/chan_mapping.cc
@@ -23,7 +23,7 @@
 #include <iostream>
 #include "ardour/chan_mapping.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 static const char* state_node_name = "Channelmap";
 

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 9f6216062adb6a54bdf3758db5d84577a7cdf68e..2b0a4dce4cd71e5fb8ddb822cdbbbb9d718e35d6 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -38,7 +38,7 @@ using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 ControlProtocolManager* ControlProtocolManager::_instance = 0;
 const string ControlProtocolManager::state_node_name = X_("ControlProtocols");

diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 3bb00f731a1c160f951421ccaf9c4e1fb81d2fcb..90ab07b86d5df7ac1f5104b7cfea6b44ef9f8131 100644 (file)
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -34,7 +34,7 @@
 
 #include <glibmm/fileutils.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <AudioToolbox/AudioFormat.h>
 

diff --git a/libs/ardour/cycle_timer.cc b/libs/ardour/cycle_timer.cc
index a86124c5555901b4f4e1f413222c6ff07dac4928..4742d9617403c7095577a42641a23584943eb5f7 100644 (file)
--- a/libs/ardour/cycle_timer.cc
+++ b/libs/ardour/cycle_timer.cc
@@ -24,7 +24,7 @@
 
 #include "ardour/libardour_visibility.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/data_type.cc b/libs/ardour/data_type.cc
index 4a43009faf259cfe8f19e8b88ffa832165752a93..c72c17342593d2ca848b57388789cc57348e74cb 100644 (file)
--- a/libs/ardour/data_type.cc
+++ b/libs/ardour/data_type.cc
@@ -18,7 +18,7 @@
 */
 
 #include "ardour/data_type.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 const char *
 ARDOUR::DataType::to_i18n_string () const

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 89719e42595eb76a6e1779c4c8ecbc21f9bf5bfd..e051ce6fb14a88fb92567026ad91ea3bbc768e53 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -34,7 +34,7 @@
 #include "ardour/port.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR { class Panner; }
 

diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index a8108e9a39da8b7ed7e2c1a45dd7e998a04bdde5..5d138505fb107fd36f9e8349e0ff2b03ad36d708 100644 (file)
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -19,7 +19,7 @@
 
 #include "ardour/directory_names.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 6eac0c1cd94d4c1631d7f4da32756315c1dafb93..ebd11a1887d1e9c71991908e0fa23ee23561ffb8 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -46,7 +46,7 @@
 #include "ardour/session.h"
 #include "ardour/track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/ebur128_analysis.cc b/libs/ardour/ebur128_analysis.cc
index 3788e0207ebde7a248d4183c060af2e27ccfb4e7..a329f877c1dd601ff96a4b2638e4d959319ed72b 100644 (file)
--- a/libs/ardour/ebur128_analysis.cc
+++ b/libs/ardour/ebur128_analysis.cc
@@ -22,7 +22,7 @@
 
 #include "ardour/ebur128_analysis.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Vamp;
 using namespace ARDOUR;

diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc
index d1a67da2c4d25650750ddeee2c4185091f4bc646..7bd7d0104f70b9e6bb208e44c54a9c9676261220 100644 (file)
--- a/libs/ardour/element_importer.cc
+++ b/libs/ardour/element_importer.cc
@@ -26,7 +26,7 @@
 #include "pbd/convert.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/engine_state_controller.cc b/libs/ardour/engine_state_controller.cc
index 67cdc7d086b329204eb52203773a949ae092e734..06a4f465b2aaf6407c73aeb7147f2272ffae819d 100644 (file)
--- a/libs/ardour/engine_state_controller.cc
+++ b/libs/ardour/engine_state_controller.cc
@@ -26,7 +26,7 @@
 
 #include "pbd/pthread_utils.h"
 #include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 
 using namespace ARDOUR;

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 26f5a7bb28611543ffb4711a8d20b7919b4b4fc6..cc388531df32fb96cb10a3ca9965f0bffb5d73dd 100644 (file)
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -30,7 +30,7 @@
 
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/ardour/export_failed.cc b/libs/ardour/export_failed.cc
index 97f2ee56ac01c4565b52cad21e0e2240faf5d261..6de3c9f8b77b0cba86614aa12f47b095bc71fe17 100644 (file)
--- a/libs/ardour/export_failed.cc
+++ b/libs/ardour/export_failed.cc
@@ -21,7 +21,7 @@
 #include "pbd/error.h"
 #include "ardour/export_failed.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index efeb3398e52127ce412daf07ba6c9fe3fd6ef26a..177d515028b013a9ad6d778e7a9a69b495acde9c 100644 (file)
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -37,7 +37,7 @@
 #include "ardour/export_timespan.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Glib;

diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index 65544122739c7f0e08dfafd6d2efc50fd8b5b62a..e5d291a1b4b449f4af7d951f769625ec0a3105f7 100644 (file)
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -23,7 +23,7 @@
 #include "ardour/export_format_specification.h"
 #include "ardour/export_format_compatibility.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::string;
 

diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc
index aef49cc28f8c750ef3bd7bbdfe0e2a6821a008ee..07bd911e989affbdf80e6a6cbcd33ea019f1da17 100644 (file)
--- a/libs/ardour/export_format_specification.cc
+++ b/libs/ardour/export_format_specification.cc
@@ -31,7 +31,7 @@
 #include "pbd/enumwriter.h"
 #include "pbd/convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR
 {

diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc
index 47f68fe4646b0161a5517c0a00d943854df610f2..642f05a2280a2f20e63ad75ab8d9d500b97ed069 100644 (file)
--- a/libs/ardour/export_formats.cc
+++ b/libs/ardour/export_formats.cc
@@ -20,7 +20,7 @@
 
 #include "ardour/export_formats.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 2dddd5240123e0629def5996f95fea5b8d7e5bad..8ca73788dd24b416d3935571de1177d5e3d56813 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -40,7 +40,7 @@
 #include "pbd/basename.h"
 #include "ardour/session_metadata.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index fd6e6de1c50c16887ec3d2621bff8ddc421c2a74..f924ed17e5a45021a023dcaa4c748d2c0575094c 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -48,7 +48,7 @@
 #include "ardour/session.h"
 #include "ardour/broadcast_info.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Glib;

diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index c148c6dd82e8fa87b707e52dede1ea3183e8dd14..c05a0a4bb92826bebc876b62778c510a7c5e6c9d 100644 (file)
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -44,7 +44,7 @@
 #include "ardour/source.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/filename_extensions.cc b/libs/ardour/filename_extensions.cc
index fa6ca07fdea9eb0510e84c47e4c8259e36076fdf..c575f1295e9a7d667c425c4582a3bdb5c44ffbbd 100644 (file)
--- a/libs/ardour/filename_extensions.cc
+++ b/libs/ardour/filename_extensions.cc
@@ -19,7 +19,7 @@
 
 #include "ardour/filename_extensions.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index fcdf42cbbef8db57425bee1170a0cc83e99be407..47b9994cc6c9229e6090e0f5128d98d50872e455 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -29,7 +29,7 @@
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include "shlobj.h"

diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc
index 36a74da0f50756375ecb5490c85deb39a84c5682..6ebf23102ab0ff13db88e51a23d299296e2a2acb 100644 (file)
--- a/libs/ardour/filter.cc
+++ b/libs/ardour/filter.cc
@@ -32,7 +32,7 @@
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc
index c470ef7f3e9a0ace591f02f2db84a456355e9d01..af39a475277a940ae6d0fc95d5b4cb8c8d49de3a 100644 (file)
--- a/libs/ardour/find_session.cc
+++ b/libs/ardour/find_session.cc
@@ -35,7 +35,7 @@
 #include "ardour/utils.h"
 #include "ardour/session_utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc
index ef560085cc960137d0e997e76dfdab9b59856d55..8910c9a98c6b4fafac48905d420e24f4febeec35 100644 (file)
--- a/libs/ardour/gain_control.cc
+++ b/libs/ardour/gain_control.cc
@@ -27,7 +27,7 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 7d4730d290fe0c31c263a5bbdb97458e136908a4..cdfd4e036dadc42d7c6eb12e158c64945879ce55 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -119,7 +119,7 @@
        #include <Carbon/Carbon.h> // For Gestalt
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 ARDOUR::RCConfiguration* ARDOUR::Config = 0;
 ARDOUR::RuntimeProfile* ARDOUR::Profile = 0;

diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc
index 3cf0eaea1602e6c6b8ad669eeddf1269a7ef098b..563c882efec76706c6b6c2032a10e343ecc56af9 100644 (file)
--- a/libs/ardour/graph.cc
+++ b/libs/ardour/graph.cc
@@ -32,7 +32,7 @@
 #include "ardour/process_thread.h"
 #include "ardour/audioengine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/i18n.h b/libs/ardour/i18n.h
deleted file mode 100644 (file)
index b04c96d..0000000
--- a/libs/ardour/i18n.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#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/libs/ardour/import.cc b/libs/ardour/import.cc
index fd5d3bf98a18c36da7cf5c29abe3c73d2cc0c2ff..b2b9403e0ea9a8e383046abac3fa8b7b397815a5 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -67,7 +67,7 @@
 #include "ardour/caimportable.h"
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/instrument_info.cc b/libs/ardour/instrument_info.cc
index a3b48ee79009318a1e829244449aa6386cb4b330..b8c026bd029e2ee0e79f565ea4e1cc361eba164a 100644 (file)
--- a/libs/ardour/instrument_info.cc
+++ b/libs/ardour/instrument_info.cc
@@ -29,7 +29,7 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/rc_configuration.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace MIDI::Name;

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 67b0a06b79780aca7251e302500ca1ad811a59ee..1746b00847e49a739f19293de18269fa3fb4ed62 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -30,7 +30,7 @@
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR { class MuteMaster; class Pannable; }
 

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 2931e8d23ad3a93ad76555b01c086f4bd3eb0a0f..f7e2b95eb381bd2bed3328719b8b1ffa0afb30bd 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -43,7 +43,7 @@
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define BLOCK_PROCESS_CALLBACK() Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock())
 

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 3af3d67de4b36a3a69279dbbf52022f67aaa2586..61bb97f0ad82a392721a4c6100dc562a697a6af6 100644 (file)
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -32,7 +32,7 @@
 #include "ardour/session_object.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index cfff3a5ee66dba53be5cfa6b9bf8c1b534cdc736..7ca6929112d12417e41304c230ef55c994270009 100644 (file)
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -51,7 +51,7 @@
 
 #include "pbd/stl_delete.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/linux_vst_support.cc b/libs/ardour/linux_vst_support.cc
index 0bdc89600c888377c674357f921e5d2f00974994..9f2ab0ab3babf75cb45d587f942bb842df8a8041 100644 (file)
--- a/libs/ardour/linux_vst_support.cc
+++ b/libs/ardour/linux_vst_support.cc
@@ -37,7 +37,7 @@
 #include "pbd/basename.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 /***********************************************************/
 /* VSTFX - A set of modules for managing linux VST plugins */

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index d827d0f2b606dfccd064c90c8771861795c84fb6..0a48b43d0eb71a1b85dfd40e4cdc85d032e7d56f 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -36,7 +36,7 @@
 #include "ardour/audiofilesource.h"
 #include "ardour/tempo.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc
index 281e045ae3d09c9b24c6d83460c3a81c7e1a9ca0..87c304ff9e264238fa9dfa9e29016cdafccf6b5b 100644 (file)
--- a/libs/ardour/location_importer.cc
+++ b/libs/ardour/location_importer.cc
@@ -27,7 +27,7 @@
 #include "pbd/convert.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/ltc_file_reader.cc b/libs/ardour/ltc_file_reader.cc
index b07b320f8558b5f36325c93214c07ff875673779..8ca97ee5b6d93ce6952e09df3a34f270a3eb2199 100644 (file)
--- a/libs/ardour/ltc_file_reader.cc
+++ b/libs/ardour/ltc_file_reader.cc
@@ -32,7 +32,7 @@
 #include "timecode/time.h"
 #include "ardour/ltc_file_reader.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index ab84cf6201b11aa4153b82561a019446d7f7af70..6167c6bda226b55bef0803e276d50ada6e7d0806 100644 (file)
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -32,7 +32,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/audio_port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc
index edee3a34a94b3ac4507948bd1534330f7f09d5fc..890e268c59681a7468a0f536a6c1183e25349ad7 100644 (file)
--- a/libs/ardour/lua_api.cc
+++ b/libs/ardour/lua_api.cc
@@ -30,7 +30,7 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc
index b48c3100fbdaa2f78816e56edd62bf5c4af8c782..54427a2ddb8ea76b62aa55ca14422bd519684f82 100644 (file)
--- a/libs/ardour/luaproc.cc
+++ b/libs/ardour/luaproc.cc
@@ -37,7 +37,7 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/luascripting.cc b/libs/ardour/luascripting.cc
index 25c139d26a7f15e84c764bb672d75e66801ad8a6..815711f039f992699e3d57bda0325a15f8f1fad1 100644 (file)
--- a/libs/ardour/luascripting.cc
+++ b/libs/ardour/luascripting.cc
@@ -32,7 +32,7 @@
 #include "lua/luastate.h"
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "sha1.c"
 
 using namespace ARDOUR;

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index c850cb6fe7de6d64129437eab8c824c280ecf0f7..daf781e4f5d097eb11ff11780e5db921f336fcdd 100644 (file)
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -52,7 +52,7 @@
 #include "ardour/worker.h"
 #include "ardour/search_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 #include <lilv/lilv.h>

diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc
index 4b32e47bb5672e12874be7e9b7a1b4feadf59da6..3939048ad443e7ceca3ccaebb7227b7db66c6e3b 100644 (file)
--- a/libs/ardour/lxvst_plugin.cc
+++ b/libs/ardour/lxvst_plugin.cc
@@ -25,7 +25,7 @@
 #include "ardour/session.h"
 #include "ardour/lxvst_plugin.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 9743327ec6146c7331435dafe333016385e7c57d..f2dc4f9abb9fea1dc35f449ff8a3e107a8bdd148 100644 (file)
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -35,7 +35,7 @@
 #include "ardour/slave.h"
 #include "ardour/tempo.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 5baeb32263d0e4c9096e3264117b1583178c287c..4d3dd4e5a7784c31cd97ec38671da2efd6ff7a14 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -58,7 +58,7 @@
 
 #include "midi++/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index b5e93ae494e829a719a9b4e0a48496c5920ded1f..7f2b7fb863f31a6b55aa2f02f314b4667dd8d358 100644 (file)
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -40,7 +40,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index 133f4ee7f81946e8f93ba10897d2ae8c2577aa7d..8a6d8dfd100a5a88be14a8bfc47b6cb076b5e250 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -29,7 +29,7 @@
 
 #include "ardour/search_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 5402664ed1fcd3b045911d8e4af02a85cf47e6e8..e3274c77b193c44d52f9c911e6d720616673eeea 100644 (file)
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -36,7 +36,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/midi_playlist_source.cc b/libs/ardour/midi_playlist_source.cc
index 3d9c5b1e9f58a37bb0e492427dc546f8a5d112c7..65c2794947dd5ae53da549bb0d79e15b57e4dd96 100644 (file)
--- a/libs/ardour/midi_playlist_source.cc
+++ b/libs/ardour/midi_playlist_source.cc
@@ -25,7 +25,7 @@
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_playlist_source.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 14b29eb6d40b7daa7593ed942717183320d3376c..4c678c04e0d818f961a451c760857a6ab03d36a4 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -44,7 +44,7 @@
 #include "ardour/tempo.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/midi_scene_change.cc b/libs/ardour/midi_scene_change.cc
index 9304a6432322539acf417fbabca6e169ec57d219..969dadbf7596cc66d70c427457c551614c863d38 100644 (file)
--- a/libs/ardour/midi_scene_change.cc
+++ b/libs/ardour/midi_scene_change.cc
@@ -23,7 +23,7 @@
 #include "ardour/midi_port.h"
 #include "ardour/midi_scene_change.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc
index 7f6c865922cf720602bbb8d9f7d59c7a3ae65222..07eb549e664fb3848ea43bed71d899e229ca959a 100644 (file)
--- a/libs/ardour/midi_scene_changer.cc
+++ b/libs/ardour/midi_scene_changer.cc
@@ -30,7 +30,7 @@
 #include "ardour/midi_scene_changer.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 70364b684166f1e0acee9408c74413f85b376474..5b671b4a2606eca00843d2f0db1ff50384847ad6 100644 (file)
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -48,7 +48,7 @@
 #include "ardour/session_directory.h"
 #include "ardour/source_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR { template <typename T> class MidiRingBuffer; }
 

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 7258f49a1ccdab471f65f15f1c7e79810fb7fa23..70f44e19c1561c727ac465353565241f326302d1 100644 (file)
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -26,7 +26,7 @@
 #include "ardour/midi_stretch.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index e9efb2fc17d992f688534e8149715594ef51fd21..c96254eeb20bae7f90fb0987efbe904cf5da1939 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -54,7 +54,7 @@
 #include "ardour/session_playlists.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 class InterThreadInfo;

diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index c11f96c071a0a693f7b852f1d1ad64296c7a03a2..eaacde2969f3cb5cc077f8d5ee383610154f8570 100644 (file)
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -37,7 +37,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 MidiControlUI* MidiControlUI::_instance = 0;
 

diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
index 5b97b4090ae6a95a06e1e88022b05c5ac42b8ce8..7f5dee4c6402818d8ca3b0b80754df72f56fc974 100644 (file)
--- a/libs/ardour/midiport_manager.cc
+++ b/libs/ardour/midiport_manager.cc
@@ -22,7 +22,7 @@
 #include "ardour/midiport_manager.h"
 #include "ardour/rc_configuration.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/monitor_control.cc b/libs/ardour/monitor_control.cc
index c16de3b7c1fbe9d8c105f5297a089e0fefeb2d62..907a7473d7e56e6c07b13a7d2ef927809a6a1368 100644 (file)
--- a/libs/ardour/monitor_control.cc
+++ b/libs/ardour/monitor_control.cc
@@ -18,7 +18,7 @@
 
 #include "ardour/monitor_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/monitor_processor.cc b/libs/ardour/monitor_processor.cc
index f9bff99c19bb5797fdb6f0a22571fdcc8c8775e2..811d5a15b34effa8d61a8fc46d5df4dfc659355d 100644 (file)
--- a/libs/ardour/monitor_processor.cc
+++ b/libs/ardour/monitor_processor.cc
@@ -28,7 +28,7 @@
 #include "ardour/monitor_processor.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 25aa93db9d47797454fe737ac9eaaac32b5c43fc..102694e7ac7d9a9ab637871f2e085eede99bc400 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -34,7 +34,7 @@
 
 #include <glibmm/timer.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/mute_control.cc b/libs/ardour/mute_control.cc
index 7e9815f32663aadb3211cf3cd104a4eb6f7239e6..5b38547366778081b9a479abf216780f1d869fca 100644 (file)
--- a/libs/ardour/mute_control.cc
+++ b/libs/ardour/mute_control.cc
@@ -22,7 +22,7 @@
 #include "ardour/session.h"
 #include "ardour/mute_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 32f50bd573ffed4e33f8e117e130c0c00f575cad..29a2fe914337fb66f6ace750a04dc5de1387dfcc 100644 (file)
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -26,7 +26,7 @@
 #include "ardour/mute_master.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc
index eb64a774333304976cb0a4285ee5762c20f4b4d0..7658bd86e8211c9db60f3018b530376cead8692d 100644 (file)
--- a/libs/ardour/onset_detector.cc
+++ b/libs/ardour/onset_detector.cc
@@ -20,7 +20,7 @@
 #include <cmath>
 #include "ardour/onset_detector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Vamp;
 using namespace ARDOUR;

diff --git a/libs/ardour/operations.cc b/libs/ardour/operations.cc
index 1b4796d3511ea67fabaaf186c1d9f61afce60377..5c5fe411d5b1816983d5bda35690916b0b5b6a2b 100644 (file)
--- a/libs/ardour/operations.cc
+++ b/libs/ardour/operations.cc
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include "ardour/operations.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 GQuark Operations::capture;
 GQuark Operations::paste;

diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index 754e8fc5d25f4f7dde879b5e0d3e9cc6895410c0..d77c8a0e7fb0511acb30e56717abec7afdd30f57 100644 (file)
--- a/libs/ardour/pannable.cc
+++ b/libs/ardour/pannable.cc
@@ -30,7 +30,7 @@
 #include "ardour/pan_controllable.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index d132850af000d1dadac2240bab6928e64fcf4875..59e4e2e977952841f98d7d68601899483597f184 100644 (file)
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -22,7 +22,7 @@
 #include "ardour/panner.h"
 #include "ardour/pannable.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 906e979862a45e1b3a30b5edf0c4f6a11d4c4dc1..c6b73b40775fbdac0ce8d58bd9ed723d600b0573 100644 (file)
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -32,7 +32,7 @@
 
 #include "ardour/search_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index afc34c358a29410d5d30ede10c1a3b86841ff0af..6c3ae0021cf1c80da7b118e445109ecb01c9a315 100644 (file)
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -53,7 +53,7 @@
 #include "ardour/session.h"
 #include "ardour/speakers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/mathfix.h"
 

diff --git a/libs/ardour/parameter_descriptor.cc b/libs/ardour/parameter_descriptor.cc
index 3a7eff9d1447e7d6c13a043c805f8720fb1e3394..bf0c9b7af153fc18c79c90371a1135100e7c7a3f 100644 (file)
--- a/libs/ardour/parameter_descriptor.cc
+++ b/libs/ardour/parameter_descriptor.cc
@@ -24,7 +24,7 @@
 #include "ardour/types.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 

diff --git a/libs/ardour/phase_control.cc b/libs/ardour/phase_control.cc
index bc237893a00b4e7e6f9ca8198d557a1832540696..9757c104b92a95b05159167afc03b8c7ed2c935b 100644 (file)
--- a/libs/ardour/phase_control.cc
+++ b/libs/ardour/phase_control.cc
@@ -19,7 +19,7 @@
 #include "ardour/phase_control.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index de13d0eeb1275b4ddef86d1416dcdc411ce73928..70744429f9416bff8cc93ad214133d403312a75b 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -40,7 +40,7 @@
 #include "ardour/session_playlists.h"
 #include "ardour/source_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index 79bbfb02f36b35199137d00c52d8038ba33ab67f..46f9910738d1c4562d52b7617cfb156804d0b731 100644 (file)
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -25,7 +25,7 @@
 #include "ardour/midi_playlist.h"
 #include "ardour/playlist_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/playlist_source.cc b/libs/ardour/playlist_source.cc
index 8dc2bce418dbb0dc6b9aa1215dcbf95bdf8bcee5..07f72331bb8f136798760b0a744d07e7ed3c10ea 100644 (file)
--- a/libs/ardour/playlist_source.cc
+++ b/libs/ardour/playlist_source.cc
@@ -34,7 +34,7 @@
 #include "ardour/playlist_source.h"
 #include "ardour/playlist_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 81982c156d6baf2f47c2113e7615a8ec6934bff4..884ac0d53efbfc8b0f2607a2e55453483045219a 100644 (file)
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -65,7 +65,7 @@
 
 #include "pbd/stl_delete.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 11117e720c445588940df9f39059d51c86fca3c6..7fb799d4923e22cbf24c0f606b744702d0ddf588 100644 (file)
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -57,7 +57,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 49d72f65d6016a36a2d579fb4037206a8f4c0f13..23515a2e2e67867556cc4e167501358408fab5db 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -95,7 +95,7 @@
 #include "pbd/error.h"
 #include "pbd/stl_delete.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "ardour/debug.h"
 

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 61313f371cb965004063b33e65b2e965dbcd10d6..33b41f5c046e40dd05a23a97ea1afd494a712378 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -30,7 +30,7 @@
 #include "ardour/port.h"
 #include "ardour/port_engine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index d38279c08c44858be43b6e9a4d6655bc585d3c8f..3b53454289422033e32cb7ff880e0c70320fa964 100644 (file)
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -30,7 +30,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc
index 1eafca0574934935002c7a0710a9553ce6339406..ec8e3024eafd668fc9027ead4b44c6f0eba4e795 100644 (file)
--- a/libs/ardour/port_manager.cc
+++ b/libs/ardour/port_manager.cc
@@ -30,7 +30,7 @@
 #include "ardour/profile.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/presentation_info.cc b/libs/ardour/presentation_info.cc
index fe094dae6bb667d5a41311b2d690fe2d9a66cb4a..b335f549042fd808e41ddf0dd3e45ede9517d509 100644 (file)
--- a/libs/ardour/presentation_info.cc
+++ b/libs/ardour/presentation_info.cc
@@ -30,7 +30,7 @@
 
 #include "ardour/presentation_info.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index f13edb516532c7bfa84cf79d2422e8d495884dee..60a23376b6c4c5d15bcd2002dc74899aa349f836 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -42,7 +42,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index f484a1602a817b6ca3d22855fd44a0df17678a20..b60b63dcf40176e1117055950251274ea3da40d5 100644 (file)
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -23,7 +23,7 @@
 #include "ardour/quantize.h"
 #include "ardour/midi_model.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc
index 9ae909780ae005f5fb553f233df15bbbff4a0a8c..bc127e2d816f025727653ebf4e163dbe881212f7 100644 (file)
--- a/libs/ardour/rb_effect.cc
+++ b/libs/ardour/rb_effect.cc
@@ -32,7 +32,7 @@
 #include "ardour/stretch.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index f6366b54638f9bdfb1970082bfda01858366b2f1..100e73678d5e4ed64935534f24b1c769fe4309e5 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -36,7 +36,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session_metadata.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index 39d517cff8ec57f4028b1b59c22cea7bf6e2cb4b..fd0b9b1b1d3127f84ae0edd9210e285ca04786a2 100644 (file)
--- a/libs/ardour/recent_sessions.cc
+++ b/libs/ardour/recent_sessions.cc
@@ -31,7 +31,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/record_enable_control.cc b/libs/ardour/record_enable_control.cc
index 67375e74317325863676ba9e976b9bff95dccd7d..f3512c3204dcc15bde71b44f196fd06347514c5c 100644 (file)
--- a/libs/ardour/record_enable_control.cc
+++ b/libs/ardour/record_enable_control.cc
@@ -19,7 +19,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/record_enable_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/record_safe_control.cc b/libs/ardour/record_safe_control.cc
index b820ad3e49f0b3ce2273f2f3609b746a9424875b..f3036e04ea3e735d5c99b6517140844139dce551 100644 (file)
--- a/libs/ardour/record_safe_control.cc
+++ b/libs/ardour/record_safe_control.cc
@@ -19,7 +19,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/record_safe_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 039ecbe691d129670346b2b043dc098f30a90170..ca2914764a91dd468c1ba69242d24692b86579f5 100644 (file)
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -38,7 +38,7 @@
 #include "ardour/tempo.h"
 #include "ardour/transient_detector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 6578e89837c2346c91049b8af6985d428457b7c0..16a9e02e378cf0f6835fe81bb973e4b5e8892c34 100644 (file)
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -30,7 +30,7 @@
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc
index 04eecf0dee9eebadd93a1991aff0e5fbe5d09694..9a406c549f4d16d5873c4161f79fe87ed71d638a 100644 (file)
--- a/libs/ardour/resampled_source.cc
+++ b/libs/ardour/resampled_source.cc
@@ -21,7 +21,7 @@
 #include "ardour/resampled_source.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index cb61b0767aa025a2d2e569de509b79db6f58bea5..5c92b9051cb2f0557deb6b6cfdb108b7bc388d18 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -30,7 +30,7 @@
 #include "ardour/return.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index fa564968edc3df5dc93c52ef146152cacea2aba2..01580456e4ca0cdf92cbfb0f9dd90cdcc9493346 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -74,7 +74,7 @@
 #include "ardour/utils.h"
 #include "ardour/vca.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/route_graph.cc b/libs/ardour/route_graph.cc
index 111033bf2319006eda0a3d40b0fd115ddde569e0..dfe61c4c331b378026ff5dc72efa752e095fa2d8 100644 (file)
--- a/libs/ardour/route_graph.cc
+++ b/libs/ardour/route_graph.cc
@@ -22,7 +22,7 @@
 #include "ardour/route_graph.h"
 #include "ardour/track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index a0ffbbc83c682ac8c336c113470a13ec3a23fa42..1a7b98050cfe8fb961bb747ecee01a3d641a5599 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -36,7 +36,7 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/scene_change.cc b/libs/ardour/scene_change.cc
index dcf83951cd2acdf6b51a0ceaca60b5d64925bee9..e9d319569487073f41c3e506bed9a0c78d8b7d07 100644 (file)
--- a/libs/ardour/scene_change.cc
+++ b/libs/ardour/scene_change.cc
@@ -19,7 +19,7 @@
 
 #include "ardour/midi_scene_change.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 2ad08736dfa1d0c26035a70029442e5bf8b64f2c..d0049ff7b243f700d4eba516b118841092d6461f 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -33,7 +33,7 @@
 #include "ardour/send.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 class AutomationControl;

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9ab82c7106acda07aa2b0853b769af4947a5436b..444989789866504a85257be2c0b044fc9ef84cc0 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -114,7 +114,7 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <glibmm/checksum.h>
 

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 613233cacbc9946258d2d7f7bd4396402725da7f..259a3a1d3d6d55c42aa3a5d0bc189624d35f3b52 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -28,7 +28,7 @@
 #include "ardour/track.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 969fdabb825dc3a7370f16c9a0c41654e98a888f..9c67ebef869c99d6d8b22101815d58f7e102b832 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -31,7 +31,7 @@
 
 #include <sndfile.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 1f78d7ed12a3496b89cd0b9f44b9c35ec50b11df..a99738a613dea2bab463323c5ee49d23012a4613 100644 (file)
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -43,7 +43,7 @@ class Command;
 using namespace PBD;
 using namespace ARDOUR;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 void Session::register_with_memento_command_factory(PBD::ID id, PBD::StatefulDestructible *ptr)
 {

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 2744831643f8ef29770ca25851c0cec0fe885715..b8814711f376a856e6fea8df430cf9ceb8a89bbe 100644 (file)
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -30,7 +30,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/session_configuration.h"
 #include "ardour/utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index 3a4d049e3a1b38ab322e50232d72ce1512268989..c52fe1aeb5c30e72389f8ac348fa643a818caae3 100644 (file)
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -30,7 +30,7 @@
 #include "ardour/session_directory.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 9d11cb0b9194859c9bebbb3fffc954f120339cb6..6e17545fc34e604e7afcf994b2be4c20302ac837 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -28,7 +28,7 @@
 #include "ardour/debug.h"
 #include "ardour/session_event.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 84342fa3d91c7914e7eecdfc846fc618fddd1944..7234411ce4ee6496ecc2c4a924f7ae8bb5da45b4 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -31,7 +31,7 @@
 #include "ardour/session.h"
 #include "ardour/track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_handle.cc b/libs/ardour/session_handle.cc
index 0cf0f6d1b12baa299e98b6dc6e299860833e6b15..2a14f8a4bc62800b2231f48a64c58bb657ed1481 100644 (file)
--- a/libs/ardour/session_handle.cc
+++ b/libs/ardour/session_handle.cc
@@ -24,7 +24,7 @@
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc
index 2cd21f9afd77b63f7ff902ae1b2a0fbf34afa7a1..945f96519e3f60a8c7ed1c7483eacf9b8d0c4e47 100644 (file)
--- a/libs/ardour/session_ltc.cc
+++ b/libs/ardour/session_ltc.cc
@@ -27,7 +27,7 @@
 #include "ardour/session.h"
 #include "ardour/slave.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 6d7fea3b266e7f62743d8c155add675f56eda7cf..fa23880b87bef6504618295f4529d8b72a738ceb 100644 (file)
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -48,7 +48,7 @@
 #include "ardour/slave.h"
 #include "ardour/ticker.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_object.cc b/libs/ardour/session_object.cc
index 39b31550d916b53cc0246cf41984c570634b2f80..683d174b1607fe75bdb220d5af48ed54b1e99b9a 100644 (file)
--- a/libs/ardour/session_object.cc
+++ b/libs/ardour/session_object.cc
@@ -22,7 +22,7 @@
 #include "ardour/debug.h"
 #include "ardour/session_object.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index 368b043ef73f335361ddf805f421d02174bbb1af..95982b6158932bfc0f0c842f7af7d79cebc2ebef 100644 (file)
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -23,7 +23,7 @@
 #include "ardour/playlist_factory.h"
 #include "ardour/session_playlists.h"
 #include "ardour/track.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "pbd/compose.h"
 #include "pbd/xml++.h"
 

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index b054d6578733e7c20bb01f599fe52415c638dc88..eaa1d055038cf48b610933f40b3ca48da356f29e 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -43,7 +43,7 @@
 
 #include "midi++/mmc.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index f1f99e369373e3dda0e9380482cae287f6001d55..5572cdce708bbe5b9643b7458e472a843357d415 100644 (file)
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -27,7 +27,7 @@
 #include "ardour/track.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 1aafd7118b4464e68a012282ecae986206af019b..76cf2d375599dfda5a8b2bddcfe9ab6a155b5370 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -129,7 +129,7 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/session_state_utils.cc b/libs/ardour/session_state_utils.cc
index 5d5c9cc8df6eefd605da55d2c7fec17add13c7c4..28cfbb2b756eb6019f4ca2bcb06f032a2cce46e2 100644 (file)
--- a/libs/ardour/session_state_utils.cc
+++ b/libs/ardour/session_state_utils.cc
@@ -30,7 +30,7 @@
 #include "ardour/session_state_utils.h"
 #include "ardour/filename_extensions.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 54770d5cc8a16b5f4e64ef757a7de6980166e56a..8f080285e2c26a09e893644bc2e5bbe8ce47c501 100644 (file)
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -35,7 +35,7 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 47c7885b85dde84780a04e06e9ea4f6cd8d91529..8771af46aa7138df63c17c386571d89a52cb982e 100644 (file)
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -47,7 +47,7 @@
 #include "ardour/slave.h"
 #include "ardour/operations.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 4cce5219ac11248a95e7ba637170764752dcdc61..7b52b3cdf49b868073574ac5c70df6228e6fc7e0 100644 (file)
--- a/libs/ardour/session_vst.cc
+++ b/libs/ardour/session_vst.cc
@@ -34,7 +34,7 @@
 #include <fst.h>
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/ardour/sidechain.cc b/libs/ardour/sidechain.cc
index 0ac1e3227b56c5cc0b6415cdde69b2522b8d811b..e759af3d5d10119989a4f1e7cc93118ef2411319 100644 (file)
--- a/libs/ardour/sidechain.cc
+++ b/libs/ardour/sidechain.cc
@@ -28,7 +28,7 @@
 #include "ardour/session.h"
 #include "ardour/sidechain.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/slavable.cc b/libs/ardour/slavable.cc
index 5cb8e8ddce1e84e14d5ab5ef721267163deb815f..10eb08437250cc372d37d5d79d74636d6ecfb839 100644 (file)
--- a/libs/ardour/slavable.cc
+++ b/libs/ardour/slavable.cc
@@ -30,7 +30,7 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 9d332b5453d72534d1e2a9cf1cd0b4cf6dd1bc12..2aae26d847156c4c9f3bc8cb5e5864757ca3788f 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -46,7 +46,7 @@
 #include "ardour/session.h"
 #include "ardour/smf_source.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Glib;

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 1b69ca2d0ac9a1f7de5c1a222deb93d599aac622..3bd54736df98f4ded212eafd7000c7b760536aca 100644 (file)
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -25,7 +25,7 @@
 #include <sndfile.h>
 #include "ardour/sndfile_helpers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::map;
 using namespace std;

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 73361c33da64553723ba8a4029045a52a6b86a13..4522e8a54dc794cd106ea0a362297625a0c932a5 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -41,7 +41,7 @@
 #include "ardour/utils.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/solo_control.cc b/libs/ardour/solo_control.cc
index a961fa0b1f7419118a22dde7bfa29fb4e6ea54fa..c31644b02665f57005e78d73b7c1945621507785 100644 (file)
--- a/libs/ardour/solo_control.cc
+++ b/libs/ardour/solo_control.cc
@@ -21,7 +21,7 @@
 #include "ardour/session.h"
 #include "ardour/solo_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/solo_isolate_control.cc b/libs/ardour/solo_isolate_control.cc
index 25bb5e723ec255abda8cea27d3b4592391b17258..e4d551168b7f1437ae1bc2162dfbfd5b95667150 100644 (file)
--- a/libs/ardour/solo_isolate_control.cc
+++ b/libs/ardour/solo_isolate_control.cc
@@ -21,7 +21,7 @@
 #include "ardour/session.h"
 #include "ardour/solo_isolate_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/solo_safe_control.cc b/libs/ardour/solo_safe_control.cc
index 6d827b815da266bd5067359fd00e08b9338e2f55..92c6c9ec206305aa9d227ae86ef2886ac1d814cc 100644 (file)
--- a/libs/ardour/solo_safe_control.cc
+++ b/libs/ardour/solo_safe_control.cc
@@ -21,7 +21,7 @@
 #include "ardour/session.h"
 #include "ardour/solo_isolate_control.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/soundcloud_upload.cc b/libs/ardour/soundcloud_upload.cc
index 68ab2fa2f6600db6051019a56e9ec20761dfb4dc..caef9570b4542d61f808da9ccd8cae34910aad9c 100644 (file)
--- a/libs/ardour/soundcloud_upload.cc
+++ b/libs/ardour/soundcloud_upload.cc
@@ -31,7 +31,7 @@
 #include <iostream>
 #include "pbd/gstdio_compat.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index ee32e508e2c46b4853f242c14527ce8bb51c5e5b..f9772ec9eddbd4c2210c486e2b1581ac91ba7bad 100644 (file)
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -40,7 +40,7 @@
 #include "ardour/source.h"
 #include "ardour/transient_detector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index db7faeddf16746726fa8ceebbdd3cd27b59b6412..834014bd1f9874d712b3f57fa9a17d4072393d56 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -44,7 +44,7 @@
 #endif
 
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/speakers.cc b/libs/ardour/speakers.cc
index 98fe63d587ff6bc36266dd37b617136a38e9df54..624ad5cee16e1299b627d4bbf8432c5c7b670757 100644 (file)
--- a/libs/ardour/speakers.cc
+++ b/libs/ardour/speakers.cc
@@ -23,7 +23,7 @@
 #include "ardour/speaker.h"
 #include "ardour/speakers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/srcfilesource.cc b/libs/ardour/srcfilesource.cc
index b9421d2c070dc74902f6c974167dd6e16eef0689..98389bf33bbf51f06a61f225a57fc435127c4f42 100644 (file)
--- a/libs/ardour/srcfilesource.cc
+++ b/libs/ardour/srcfilesource.cc
@@ -25,7 +25,7 @@
 #include "ardour/debug.h"
 #include "ardour/srcfilesource.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/st_pitch.cc b/libs/ardour/st_pitch.cc
index 8e65ea2b5639016e54b74932fbd81b938095659d..752fdd8ae51aff73bb77ed4be0aa6678677dbece 100644 (file)
--- a/libs/ardour/st_pitch.cc
+++ b/libs/ardour/st_pitch.cc
@@ -28,7 +28,7 @@
 #include "ardour/session.h"
 #include "ardour/audioregion.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/st_stretch.cc b/libs/ardour/st_stretch.cc
index b031ee28f935c96dd892cf13c397a1ad8bee7f24..d12ceed706480f198a32c851089886bc20500b80 100644 (file)
--- a/libs/ardour/st_stretch.cc
+++ b/libs/ardour/st_stretch.cc
@@ -28,7 +28,7 @@
 #include "ardour/session.h"
 #include "ardour/audioregion.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/stripable.cc b/libs/ardour/stripable.cc
index 744c103e486f86e0d19cf5e271980693921f051f..84d2bafccf90ef53b0f4bd07e66b6070e7152bf5 100644 (file)
--- a/libs/ardour/stripable.cc
+++ b/libs/ardour/stripable.cc
@@ -26,7 +26,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/stripable.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/tape_file_matcher.cc b/libs/ardour/tape_file_matcher.cc
index 0f8594d7317d477fee2f48a6d82577b9f66ae1e7..0be884c6ba7bc237031c7a763456249c38325747 100644 (file)
--- a/libs/ardour/tape_file_matcher.cc
+++ b/libs/ardour/tape_file_matcher.cc
@@ -20,7 +20,7 @@
 
 #include "ardour/tape_file_matcher.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 05d3d89c15adbc87bf7bc62c284d9f6745a3735f..0c328c0b1edbc5ac254b7b00541e9707de89eae2 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -33,7 +33,7 @@
 #include "ardour/lmath.h"
 #include "ardour/tempo.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;

diff --git a/libs/ardour/tempo_map_importer.cc b/libs/ardour/tempo_map_importer.cc
index 5a6a2a4018fad57b0bf202f22ccb45bae88e314c..91e2320337d17fdc4e18091d279d4dfb1fbc8442 100644 (file)
--- a/libs/ardour/tempo_map_importer.cc
+++ b/libs/ardour/tempo_map_importer.cc
@@ -26,7 +26,7 @@
 #include "ardour/tempo.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 0c586e4a0e0603c4c5a3000d586a5d36233dc808..71eabc5b2845ac8ed20d4e1f726bde3dd4b50ede 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -35,7 +35,7 @@
 #include "ardour/track.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index 31b5ab6a8b258956de3e49613e2ad9dd2394688a..6eed8369a777c9c0ea4c19a8d2685f37999bb301 100644 (file)
--- a/libs/ardour/transient_detector.cc
+++ b/libs/ardour/transient_detector.cc
@@ -22,7 +22,7 @@
 #include "ardour/readable.h"
 #include "ardour/transient_detector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Vamp;
 using namespace ARDOUR;

diff --git a/libs/ardour/unknown_processor.cc b/libs/ardour/unknown_processor.cc
index 1f710d4c4c6f69fe34e1757d412698f6effa79b2..8fbb1787c7457bae6a68b42eef921e10cacbed9c 100644 (file)
--- a/libs/ardour/unknown_processor.cc
+++ b/libs/ardour/unknown_processor.cc
@@ -20,7 +20,7 @@
 #include "ardour/audio_buffer.h"
 #include "ardour/unknown_processor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index aaafcb047918dc0cf70ad31d5f90c1334e19740c..dda0a6dce75ace1cdf4594496c824cf96ca6c951 100644 (file)
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -18,7 +18,7 @@
 */
 
 #include "ardour/user_bundle.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 0ae1c569c8a38c8a48591492e9aef1b3e5f54071..8e57cdeac305af0224101dab6b2612b80453d458 100644 (file)
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -57,7 +57,7 @@
 #include "ardour/utils.h"
 #include "ardour/rc_configuration.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index abc74fbdc6b06985acbc66ff4f877dc573b5f1fa..a2b16913bbb05c3bab47d43c4cbbfff78f6f4551 100644 (file)
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -27,7 +27,7 @@
 #include "ardour/session.h"
 #include "ardour/vca.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/vca_manager.cc b/libs/ardour/vca_manager.cc
index 382e350929f31923648aa981814027a76d168ed0..20e9e38ca2aaf0b7e0bc7ec73f7a15df04fee546 100644 (file)
--- a/libs/ardour/vca_manager.cc
+++ b/libs/ardour/vca_manager.cc
@@ -27,7 +27,7 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Glib::Threads;

diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc
index 68b376d8d3039614f5d14abc22a90b534d2d4588..ca2ef910adef8f803a7668ccd67b2cab117e5d5e 100644 (file)
--- a/libs/ardour/vst_info_file.cc
+++ b/libs/ardour/vst_info_file.cc
@@ -52,7 +52,7 @@
 #include "ardour/plugin_types.h"
 #include "ardour/vst_info_file.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "sha1.c"
 
 #define MAX_STRING_LEN 256

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index b517b480b6f4a504a95a0b60b07c91583723daa8..728219b0fea89e41029d342df04895fd40c76b19 100644 (file)
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -33,7 +33,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/audio_buffer.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/windows_vst_plugin.cc b/libs/ardour/windows_vst_plugin.cc
index 9dec5ea7724be2c029148398af3fde99003c7680..17cfa1eed7c4120f2070ba3080b21ceabf536ca5 100644 (file)
--- a/libs/ardour/windows_vst_plugin.cc
+++ b/libs/ardour/windows_vst_plugin.cc
@@ -26,7 +26,7 @@
 #include "ardour/windows_vst_plugin.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
index 8e34428db31c94f30c0f9dd8520d6c95eb0d4e0a..5c267d6c7f320df44b9f8cc1237b0c487599a24a 100644 (file)
--- a/libs/backends/alsa/alsa_audiobackend.cc
+++ b/libs/backends/alsa/alsa_audiobackend.cc
@@ -32,7 +32,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/port_manager.h"
 #include "ardouralsautil/devicelist.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/backends/alsa/alsa_midi.cc b/libs/backends/alsa/alsa_midi.cc
index 43c11c32651c9662051f5d0e59a68214a8051f87..76738e9db5cb77b38bb0482a466f5fcca0923d98 100644 (file)
--- a/libs/backends/alsa/alsa_midi.cc
+++ b/libs/backends/alsa/alsa_midi.cc
@@ -24,7 +24,7 @@
 #include "rt_thread.h"
 
 #include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/backends/alsa/alsa_rawmidi.cc b/libs/backends/alsa/alsa_rawmidi.cc
index 303649b9e70bcf1e6ec5c2f12439062f83d7b68d..0702c63158c8bb94f1ae32f6076058c6fabfb831 100644 (file)
--- a/libs/backends/alsa/alsa_rawmidi.cc
+++ b/libs/backends/alsa/alsa_rawmidi.cc
@@ -24,7 +24,7 @@
 #include "alsa_rawmidi.h"
 
 #include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/backends/alsa/alsa_sequencer.cc b/libs/backends/alsa/alsa_sequencer.cc
index cb77c3c48dc35022b716099c4279dd810cce579e..a9c3adf4fa1afd1ba614c264c8b09c22c65e43ae 100644 (file)
--- a/libs/backends/alsa/alsa_sequencer.cc
+++ b/libs/backends/alsa/alsa_sequencer.cc
@@ -23,7 +23,7 @@
 #include "alsa_sequencer.h"
 
 #include "pbd/error.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc
index b22049e24754b6ab3759e58f796b5233628d4f71..a0eeb3dcaae883a14862d55401cc5c81a40da99f 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_backend.cc
+++ b/libs/backends/coreaudio/coreaudio_backend.cc
@@ -31,7 +31,7 @@
 #include "pbd/file_utils.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/port_manager.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc
index 801c8045d965b28e874c8e309964f7c88a719146..6282518d9130506e04613529a27de6044f41dd86 100644 (file)
--- a/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@ -34,7 +34,7 @@
 
 #include "pbd/error.h"
 #include "ardour/port_manager.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index 32c9f203fa01fa460a1d23d1590a71c866fd19f8..8b9e4af1dda5926a62005795cbe741c092ffea2b 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -36,7 +36,7 @@
 #include "jack_utils.h"
 #include "jack_session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/backends/jack/jack_portengine.cc b/libs/backends/jack/jack_portengine.cc
index 0b25ecbe012d3692b37b443a27b8305069aafbd6..934f8b5d9e0cc583eb8686750c757f46610a2abe 100644 (file)
--- a/libs/backends/jack/jack_portengine.cc
+++ b/libs/backends/jack/jack_portengine.cc
@@ -27,7 +27,7 @@
 
 #include "ardour/port_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index 6fb3201c99802fb0b859f18646ee2d034db45c81..b26cb4036797194112457aba6ea1c4a53396773a 100644 (file)
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -55,7 +55,7 @@
 #include <CFBundle.h>
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc
index 26e3264e1f64d26f09c98638e74b2f5fa42faea3..b25a54f7a9e965e375fa92a2b509e04791bf3c7e 100644 (file)
--- a/libs/backends/portaudio/portaudio_backend.cc
+++ b/libs/backends/portaudio/portaudio_backend.cc
@@ -41,7 +41,7 @@
 
 #include "ardour/filesystem_paths.h"
 #include "ardour/port_manager.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "audio_utils.h"
 

diff --git a/libs/backends/portaudio/winmmemidi_io.cc b/libs/backends/portaudio/winmmemidi_io.cc
index aa47d9848823fbe479aa152ad65b895bb6101cf5..0c321ec704854d8ab8620349ce9de4c523e6146b 100644 (file)
--- a/libs/backends/portaudio/winmmemidi_io.cc
+++ b/libs/backends/portaudio/winmmemidi_io.cc
@@ -30,7 +30,7 @@
 #include "winmmemidi_io.h"
 #include "debug.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/canvas/i18n.h b/libs/canvas/i18n.h
deleted file mode 100644 (file)
index 43ae07c..0000000
--- a/libs/canvas/i18n.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#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)
-
-#endif // __i18n_h__

diff --git a/libs/canvas/stateful_image.cc b/libs/canvas/stateful_image.cc
index fb0abf44d18a5f138fad1e69768ad993c2b68797..5f04d9488c0929d2b6391a1643846676886d238d 100644 (file)
--- a/libs/canvas/stateful_image.cc
+++ b/libs/canvas/stateful_image.cc
@@ -11,7 +11,7 @@
 #include "canvas/stateful_image.h"
 #include "canvas/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ArdourCanvas;
 using PBD::error;

diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index a73720009ac26b9488ca9411334e0ec35c31e9e3..19a0fb140962990049444283f3d1e421666163a1 100644 (file)
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -41,7 +41,7 @@
 #include "evoral/TypeMap.hpp"
 #include "evoral/midi_util.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/evoral/src/i18n.h b/libs/evoral/src/i18n.h
deleted file mode 100644 (file)
index dcbbfcf..0000000
--- a/libs/evoral/src/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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)
-
-#endif // __i18n_h__

diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index e2abdae4f94d809ee885480d6d74f16c62cafdd5..3aa36b98db28f6c219606891ea744a2b917bb19d 100644 (file)
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -41,7 +41,7 @@
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 0c777ed9991636130bfe6cff1fb11690d9a78420..d213f22d2686d06468412034d16d4a7585b978ca 100644 (file)
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -31,7 +31,7 @@
 #include "gtkmm2ext/barcontroller.h"
 #include "gtkmm2ext/cairo_widget.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/bindable_button.cc b/libs/gtkmm2ext/bindable_button.cc
index 5c0cc3c958b6fc22a76c563b73c3b9d43eca049d..cc9695f981f9e411619c62a013b0663110d6f406 100644 (file)
--- a/libs/gtkmm2ext/bindable_button.cc
+++ b/libs/gtkmm2ext/bindable_button.cc
@@ -26,7 +26,7 @@
 #include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace std;

diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc
index dfa2b4ac7c6f32bd3b3a64e39a7ee9586aa4974c..5ba5f7eba4fde87fb873333cf3e426dff1a948fb 100644 (file)
--- a/libs/gtkmm2ext/binding_proxy.cc
+++ b/libs/gtkmm2ext/binding_proxy.cc
@@ -25,7 +25,7 @@
 
 #include <gtkmm2ext/binding_proxy.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace std;

diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc
index 617fc3a1006d2b36ec5cb0e7a13f057d6633ecc5..ff44da4b32c5487d6cf8be2e4f4d7681e4370a33 100644 (file)
--- a/libs/gtkmm2ext/bindings.cc
+++ b/libs/gtkmm2ext/bindings.cc
@@ -35,7 +35,7 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Glib;

diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc
index fe93f1eb7cc384dc72f9f72c95332b1f3ab288bc..8349a685fa4dc50340278298d7bb7c9a7a3197a3 100644 (file)
--- a/libs/gtkmm2ext/cairo_widget.cc
+++ b/libs/gtkmm2ext/cairo_widget.cc
@@ -23,7 +23,7 @@
 #include "gtkmm2ext/cairo_widget.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 static const char* has_cairo_widget_background_info = "has_cairo_widget_background_info";
 

diff --git a/libs/gtkmm2ext/cursors.cc b/libs/gtkmm2ext/cursors.cc
index f8862835f68af5680197af34d2adccf6178ffa7c..2ac0dba627fd73e4734f810f30cf02e30610f1fb 100644 (file)
--- a/libs/gtkmm2ext/cursors.cc
+++ b/libs/gtkmm2ext/cursors.cc
@@ -25,7 +25,7 @@
 
 #include "gtkmm2ext/cursors.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 

diff --git a/libs/gtkmm2ext/emscale.cc b/libs/gtkmm2ext/emscale.cc
index 5d28218bb57f0121e3f15ad6e590ffeb0e9ed07f..6d4697fe04e5156e282bac60db7d17109291aa76 100644 (file)
--- a/libs/gtkmm2ext/emscale.cc
+++ b/libs/gtkmm2ext/emscale.cc
@@ -22,7 +22,7 @@
 
 #include "gtkmm2ext/emscale.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index e220a37a280f94eb3f23bb66b631fc822843db45..c3e94c922eee2c3b5899afabc5b9eaac6d96ce8e 100644 (file)
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -46,7 +46,7 @@
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/i18n.h b/libs/gtkmm2ext/i18n.h
deleted file mode 100644 (file)
index 2f1c52a..0000000
--- a/libs/gtkmm2ext/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __i18n_h__
-#define __i18n_h__
-
-#include <pbd/compose.h>
-#include <pbd/convert.h>
-#include "gettext.h"
-
-#define _(Text) dgettext (PACKAGE, Text)
-#define N_(Text) gettext_noop (Text)
-#define X_(Text) (Text)
-/** 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)
-
-#endif // __i18n_h__

diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 1abe69f9f0617bbcbe9aeb63075670f2d7feb606..569db5e1a8bd066774c1ea913498c8a04c00595b 100644 (file)
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -43,7 +43,7 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/debug.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/pane.cc b/libs/gtkmm2ext/pane.cc
index 02a4745f8b33a1754ae7f56068db2d2edaef46fd..5926809a5518b7c7ac699650347c2bb4d7a5ab1e 100644 (file)
--- a/libs/gtkmm2ext/pane.cc
+++ b/libs/gtkmm2ext/pane.cc
@@ -20,7 +20,7 @@
 #include <gdkmm/cursor.h>
 #include "gtkmm2ext/pane.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/paths_dialog.cc b/libs/gtkmm2ext/paths_dialog.cc
index f169a5a29dc5e8cb2dd0aa64e2187cfa87bf8ac8..2f2ff0c5d896e756a8701f15cd3f4e050583d28d 100644 (file)
--- a/libs/gtkmm2ext/paths_dialog.cc
+++ b/libs/gtkmm2ext/paths_dialog.cc
@@ -18,7 +18,7 @@
 */
 #include <cstdio>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "pbd/pathexpand.h"
 #include "gtkmm2ext/paths_dialog.h"
 

diff --git a/libs/gtkmm2ext/persistent_tooltip.cc b/libs/gtkmm2ext/persistent_tooltip.cc
index 3040b0f9ac32ad9d9592335e76df0dd451003b01..d45ef01408d2be966983920f461521b70ee0be02 100644 (file)
--- a/libs/gtkmm2ext/persistent_tooltip.cc
+++ b/libs/gtkmm2ext/persistent_tooltip.cc
@@ -24,7 +24,7 @@
 
 #include "pbd/stacktrace.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/prompter.cc b/libs/gtkmm2ext/prompter.cc
index 1f5e13b923c7679659e758bc360c673989f7a08a..51628ab13d5f46137b43e20f6bf0c253bbb93487 100644 (file)
--- a/libs/gtkmm2ext/prompter.cc
+++ b/libs/gtkmm2ext/prompter.cc
@@ -25,7 +25,7 @@
 #include <gtkmm/stock.h>
 #include <gtkmm2ext/prompter.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtkmm2ext;

diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc
index f0ad19d055eb0fd0f290b7526f0c3291d91471e5..9b55efbcd1855a22351f35026821fc128da9325d 100644 (file)
--- a/libs/gtkmm2ext/slider_controller.cc
+++ b/libs/gtkmm2ext/slider_controller.cc
@@ -24,7 +24,7 @@
 #include <gtkmm2ext/slider_controller.h>
 #include "pbd/controllable.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace PBD;

diff --git a/libs/gtkmm2ext/tabbable.cc b/libs/gtkmm2ext/tabbable.cc
index 9aa1c3fe5f5d7d8954f3b901d4addff3d5f1588f..5e4752454e6cfd6c8547b56799f59399b2307165 100644 (file)
--- a/libs/gtkmm2ext/tabbable.cc
+++ b/libs/gtkmm2ext/tabbable.cc
@@ -29,7 +29,7 @@
 
 #include "pbd/stacktrace.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc
index c107bd988adb4b4a6c13d80e1395d617e6997f02..bb30e5610f64d60181b20beb73442d6eb8b41370 100644 (file)
--- a/libs/gtkmm2ext/tearoff.cc
+++ b/libs/gtkmm2ext/tearoff.cc
@@ -26,7 +26,7 @@
 #include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gtk;

diff --git a/libs/gtkmm2ext/textviewer.cc b/libs/gtkmm2ext/textviewer.cc
index 7de9b026838b537244ee4e173c933031ee9cc681..22c26aa1b772f83bcb2107bfa319095f71eac385 100644 (file)
--- a/libs/gtkmm2ext/textviewer.cc
+++ b/libs/gtkmm2ext/textviewer.cc
@@ -20,7 +20,7 @@
 #include <string>
 #include <gtkmm2ext/textviewer.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtkmm2ext;

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 3210e0e63d5503e9a4625cd3e6c9abc42c9fe31e..b1be7c9c921f1878fbc7a038d34d73fa218e18af 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -35,7 +35,7 @@
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/persistent_tooltip.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc
index d0303c972bf26a44d992c9eb1a390982fc83e9d2..1f2fa54112d55b097c325af8fbedbbdfde98d0d8 100644 (file)
--- a/libs/gtkmm2ext/window_proxy.cc
+++ b/libs/gtkmm2ext/window_proxy.cc
@@ -27,7 +27,7 @@
 #include "gtkmm2ext/window_proxy.h"
 #include "gtkmm2ext/visibility_tracker.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;

diff --git a/libs/gtkmm2ext/window_title.cc b/libs/gtkmm2ext/window_title.cc
index eaf25a9f7445bc7957d15e07fa0266020730d2a3..5cb9ed94b69f5c6d8ed741961a452e64c3e9a9f3 100644 (file)
--- a/libs/gtkmm2ext/window_title.cc
+++ b/libs/gtkmm2ext/window_title.cc
@@ -19,7 +19,7 @@
 
 #include "gtkmm2ext/window_title.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index 0c04c022d2be6f604ccb311638447b877047bf49..3dc3b53e2c4097e0998546a14db129d86c08808b 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.cc
@@ -51,7 +51,7 @@
 #include "ardour/pannable.h"
 #include "ardour/profile.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "panner_1in2out.h"
 
 #include "pbd/mathfix.h"

diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc
index c4cdf22958f3c4df6883502a80abaf6c877ae387..9105eff7134800b8294817bac5026b6f58abfcb3 100644 (file)
--- a/libs/panners/2in2out/panner_2in2out.cc
+++ b/libs/panners/2in2out/panner_2in2out.cc
@@ -51,7 +51,7 @@
 
 #include "panner_2in2out.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/mathfix.h"
 

diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc
index 6e4752bff7129ccaa5430ed349db9e251105d529..647c92ada3a36f7f31b4bea1528eab66af06eca0 100644 (file)
--- a/libs/panners/stereobalance/panner_balance.cc
+++ b/libs/panners/stereobalance/panner_balance.cc
@@ -52,7 +52,7 @@
 
 #include "panner_balance.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/mathfix.h"
 

diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index 74fcde33aa5ff3a21c3cbf2aaa578c403e241fc0..e6cbd3655ff741be3e69946cafa3664768eafd54 100644 (file)
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -42,7 +42,7 @@
 #include "vbap.h"
 #include "vbap_speakers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index d303d880c97c9853b2d77f138a8d0ecaaca44afd..f22d83264ef08b1c5d4519bd06f16d3ea79c1e71 100644 (file)
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -35,7 +35,7 @@
 #include "pbd/compose.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/debug.h"
 

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 6b92e84926332eebea63d2d7c8c7771e629e81d3..b730a42980ffa08b05b8ec3390c22690113088c5 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -23,7 +23,7 @@
 #include "pbd/error.h"
 #include "pbd/locale_guard.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace std;

diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc
index 660891076d1c908390bb9c4b0e07293ff48d7447..dd43475e6973583cc147feadc749be218afba673 100644 (file)
--- a/libs/pbd/convert.cc
+++ b/libs/pbd/convert.cc
@@ -35,7 +35,7 @@
 
 #include "pbd/convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::string;
 using std::vector;

diff --git a/libs/pbd/debug.cc b/libs/pbd/debug.cc
index 0940146aef756d7007026c7dad035fb20d49c6c0..419c5bfb379e32ec71fe3bc8511a80834d6db28a 100644 (file)
--- a/libs/pbd/debug.cc
+++ b/libs/pbd/debug.cc
@@ -28,7 +28,7 @@
 
 #include "pbd/debug.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using PBD::DebugBits;

diff --git a/libs/pbd/enumwriter.cc b/libs/pbd/enumwriter.cc
index ddc82151945e74fc84ebe0e75e123ef302a44df1..7b3aba9053bafc4b956b7b4194cec809b4e97915 100644 (file)
--- a/libs/pbd/enumwriter.cc
+++ b/libs/pbd/enumwriter.cc
@@ -31,7 +31,7 @@
 using namespace std;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 EnumWriter* EnumWriter::_instance = 0;
 map<string,string> EnumWriter::hack_table;

diff --git a/libs/pbd/event_loop.cc b/libs/pbd/event_loop.cc
index 08f3c2e1583ab54a365f54c067c8fd0dfa74fefc..ea3f7a46afb5ae2b347967169c8ace80e69afc6a 100644 (file)
--- a/libs/pbd/event_loop.cc
+++ b/libs/pbd/event_loop.cc
@@ -27,7 +27,7 @@
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace std;

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 6cf43f3fd2bfd3324895151c4b8bc4a274246b4d..26f80f971981965e61ca8f29c3ac4747993504c4 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -57,7 +57,7 @@
 #include "pbd/scoped_file_descriptor.h"
 #include "pbd/stl_delete.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc
index c72f65d303ce85e4c92e0995b9a83c4a4c10fddc..7c3e0978812e28affd3cb68e661def7adf401484 100644 (file)
--- a/libs/pbd/fpu.cc
+++ b/libs/pbd/fpu.cc
@@ -33,7 +33,7 @@
 #include "pbd/fpu.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace std;

diff --git a/libs/pbd/i18n.h b/libs/pbd/i18n.h
deleted file mode 100644 (file)
index 35516fa..0000000
--- a/libs/pbd/i18n.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __i18n_h__
-#define __i18n_h__
-
-#include "pbd/compose.h"
-#include "gettext.h"
-
-#define _(Text) dgettext (PACKAGE, Text)
-#define N_(Text) gettext_noop (Text)
-#define X_(Text) (Text)
-#define I18N(Array) PBD::internationalize (PACKAGE, Array)
-
-#endif // __i18n_h__

diff --git a/libs/pbd/malign.cc b/libs/pbd/malign.cc
index c48544d160ab294188601a5503d822f210546c33..59c6c4469ef3f5b61260e7c8e475948b7c392319 100644 (file)
--- a/libs/pbd/malign.cc
+++ b/libs/pbd/malign.cc
@@ -25,7 +25,7 @@
 #include "pbd/malign.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 

diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc
index 13383c27d1116d373f2a257bc5ef7c596300ed9b..ab0f668f26d93406dc6632fc370b01e88851e22c 100644 (file)
--- a/libs/pbd/pbd.cc
+++ b/libs/pbd/pbd.cc
@@ -42,7 +42,7 @@
 #include "pbd/windows_mmcss.h"
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 extern void setup_libpbd_enums ();
 

diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc
index 52dc3fa12aa44a901d07f1ff0d1d357b8960522a..6f03f2554e6b257e7c37f0db74f6de73a28534ab 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.cc
+++ b/libs/pbd/pbd/abstract_ui.cc
@@ -26,7 +26,7 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/debug.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef COMPILER_MSVC
 #include <ardourext/misc.h>  // Needed for 'DECLARE_DEFAULT_COMPARISONS'. Objects in an STL container can be

diff --git a/libs/pbd/pbd/i18n.h b/libs/pbd/pbd/i18n.h
new file mode 100644 (file)
index 0000000..4b75d34
--- /dev/null
+++ b/libs/pbd/pbd/i18n.h
@@ -0,0 +1,43 @@
+/*
+    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/libs/pbd/stateful.cc b/libs/pbd/stateful.cc
index 3fb11a3a509359bf6878a0c63e9849c72b94e81f..8b8219f7e2243306f201f95257b035ec20b18cf0 100644 (file)
--- a/libs/pbd/stateful.cc
+++ b/libs/pbd/stateful.cc
@@ -35,7 +35,7 @@
 #include "pbd/xml++.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 

diff --git a/libs/pbd/stateful_diff_command.cc b/libs/pbd/stateful_diff_command.cc
index f7fcd65098b2edcee522efd4946852def9606fca..5721b58fd0382d878c693d2903b551bd5f8beb41 100644 (file)
--- a/libs/pbd/stateful_diff_command.cc
+++ b/libs/pbd/stateful_diff_command.cc
@@ -20,7 +20,7 @@
 #include "pbd/stateful_diff_command.h"
 #include "pbd/property_list.h"
 #include "pbd/demangle.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/pbd/windows_timer_utils.cc b/libs/pbd/windows_timer_utils.cc
index ab45e30d80f5bcc8f05f8c9c0ce09f8aebe6a23d..0fab935b082e5f0c4709e16040fd360e16b085d7 100644 (file)
--- a/libs/pbd/windows_timer_utils.cc
+++ b/libs/pbd/windows_timer_utils.cc
@@ -25,7 +25,7 @@
 #include "pbd/debug.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define DEBUG_TIMING(msg) DEBUG_TRACE (PBD::DEBUG::Timing, msg);
 

diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index dd5e84cfd757366ecd5c44e26c691238ef76eaa8..74c2802a7aa15856bedd91d583f073c2b41cb2af 100644 (file)
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -27,7 +27,7 @@
 
 #include "control_protocol/basic_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index f1036c87a7c76d11a0307eb5ea2eb89798e6744f..6a11cadb4adfeeb15ad89878efd44a7bf658a2ad 100644 (file)
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -32,7 +32,7 @@ def build(bld):
     obj.includes     = ['.', './control_protocol']
     obj.name         = 'libardour_cp'
     obj.target       = 'ardourcp'
-    obj.use          = 'libardour'
+    obj.use          = 'libardour libpbd'
     obj.uselib       = 'GLIBMM SIGCPP XML'
     obj.install_path = bld.env['LIBDIR']
 

diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc
index 7d8bb46bf13ac6afdc474e1eb7339730c1612317..0f32b09d4b4f8b291a831112380739dced7291d3 100644 (file)
--- a/libs/surfaces/faderport/faderport.cc
+++ b/libs/surfaces/faderport/faderport.cc
@@ -61,7 +61,7 @@ using namespace PBD;
 using namespace Glib;
 using namespace std;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/abstract_ui.cc" // instantiate template
 

diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index f9179f8b8b47acc2a0eab16e732bd2c4ee50c35d..160ba0ec87fb199a8096a812671bdb4959a3eca1 100644 (file)
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -36,7 +36,7 @@
 #include "faderport.h"
 #include "gui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/surfaces/faderport/i18n.h b/libs/surfaces/faderport/i18n.h
deleted file mode 100644 (file)
index dcbbfcf..0000000
--- a/libs/surfaces/faderport/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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)
-
-#endif // __i18n_h__

diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
index f093287f507ef364185f17696bb54c9540d403f6..5799ab682a8705b8c6a9f5a2e1fba9b13d2d90b1 100644 (file)
--- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
+++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
@@ -67,7 +67,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/abstract_ui.cc"
 

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 07dc06a3bb47caa5a93b1635797ada2d063035d6..a116c4f2a179b35e26192ebc0b7187d911a17ed4 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -53,7 +53,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define midi_ui_context() MidiControlUI::instance() /* a UICallback-derived object that specifies the event loop for signal handling */
 

diff --git a/libs/surfaces/generic_midi/gmcp_gui.cc b/libs/surfaces/generic_midi/gmcp_gui.cc
index 8e861b370d92fdce645bfd5b52ad85482ccf5559..3c2479b62270af2d8ef7dfa56b2c683933917a36 100644 (file)
--- a/libs/surfaces/generic_midi/gmcp_gui.cc
+++ b/libs/surfaces/generic_midi/gmcp_gui.cc
@@ -41,7 +41,7 @@
 
 #include "generic_midi_control_protocol.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 class GMCPGUI : public Gtk::VBox
 {

diff --git a/libs/surfaces/generic_midi/i18n.h b/libs/surfaces/generic_midi/i18n.h
deleted file mode 100644 (file)
index dcbbfcf..0000000
--- a/libs/surfaces/generic_midi/i18n.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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)
-
-#endif // __i18n_h__

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index d46937aff5b746579890a4a4096fe0782f0cbbd6..dfac991cca8d9e63f61e20b061677b51a0518bc9 100644 (file)
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -31,7 +31,7 @@
 
 #include "device_info.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc
index f67aa3cddd25ad491fea8d441a0dd884febc4dd7..ca3f14680359cd07e9cea925a64a88610bd0be8e 100644 (file)
--- a/libs/surfaces/mackie/device_profile.cc
+++ b/libs/surfaces/mackie/device_profile.cc
@@ -33,7 +33,7 @@
 #include "mackie_control_protocol.h"
 #include "device_profile.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 6283a5469d61d423763a2b37e5b3e07e3ace86c4..06786197e2b0be6a000a03f801326de4c4a37f24 100644 (file)
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -48,7 +48,7 @@
 #include "surface.h"
 #include "surface_port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;

diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h
index 754c4ac5aab9b0e6e74861dbad669a09ba4c0640..15d266634cc3dcdc56e99c7eef875911ca04b3ac 100644 (file)
--- a/libs/surfaces/mackie/gui.h
+++ b/libs/surfaces/mackie/gui.h
@@ -33,7 +33,7 @@ namespace Gtk {
 
 #include "button.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ArdourSurface {
 

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 224590aa5437c7ab4b9a3cc94c3c4cfd5e471dc0..2ea61cc9f0baf0b64ab0a71964f834e10b55c2a8 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -83,7 +83,7 @@ using namespace Glib;
 using namespace ArdourSurface;
 using namespace Mackie;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/abstract_ui.cc" // instantiate template
 

diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
index c04eb52614b1f50474d0f87f92c92319765bd900..3fcf2458b87b26790bcfc4b5e3caf9b8cb9e0486 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
@@ -9,7 +9,7 @@
 #include "midi++/types.h"
 #include "midi++/port.h"
 #include "midi++/manager.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index f26c92c8697835c11562f2320250eb0ff1c455c9..4733327d2c4ff0bb672474fa631f30f8a81947c7 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -32,7 +32,7 @@
 #include "surface.h"
 #include "fader.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 /* handlers for all buttons, broken into a separate file to avoid clutter in
  * mackie_control_protocol.cc

diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 494418a0909cfcad23c26c255b772c2eb4eb3fab..ec8192f91dd33dfbe21f20c47104d81affd237f8 100644 (file)
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -57,7 +57,7 @@
 #include "jog.h"
 #include "meter.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #define random() rand()

diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc
index 6f6500ffa3899255c7b1f9dc2ea89a64d2726023..ddc5a7b037e0fbd0deebbb0f56b33e8578b45047 100644 (file)
--- a/libs/surfaces/mackie/surface_port.cc
+++ b/libs/surfaces/mackie/surface_port.cc
@@ -41,7 +41,7 @@
 #include "surface.h"
 #include "surface_port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 474fd44fb353030154fa52f95098f9ea1760c0c9..42828626e4cfbd51e7443206917b2f29224aa48b 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -56,7 +56,7 @@
 #include "osc_controllable.h"
 #include "osc_route_observer.h"
 #include "osc_global_observer.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 8eb7dd1e0344ebf7f4db3c1896a37360b6ada7a5..005cac2b5f847e8b5e9731e3332d581c899b9bd1 100644 (file)
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -39,7 +39,7 @@
 #include "ardour/types.h"
 #include "control_protocol/control_protocol.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 class OSCControllable;
 class OSCRouteObserver;

diff --git a/libs/surfaces/osc/osc_global_observer.cc b/libs/surfaces/osc/osc_global_observer.cc
index fef3a92619b4f052cd2573ad0d5c09bc0c602e65..cd7bf0866d55bef5075c33e0702389ecdfefde07 100644 (file)
--- a/libs/surfaces/osc/osc_global_observer.cc
+++ b/libs/surfaces/osc/osc_global_observer.cc
@@ -26,7 +26,7 @@
 #include "osc.h"
 #include "osc_global_observer.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/surfaces/osc/osc_gui.cc b/libs/surfaces/osc/osc_gui.cc
index 7879b75f1923b734d454acb8f3ace7d124f44720..9fd2fce070f3d183b043655019dee20956e8fecb 100644 (file)
--- a/libs/surfaces/osc/osc_gui.cc
+++ b/libs/surfaces/osc/osc_gui.cc
@@ -33,7 +33,7 @@
 
 #include "osc.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ArdourSurface {
 

diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc
index f56729e0fa4122f178809ab77722bb4a1333154e..067e84986aac3632e72631db143c702e904acfc9 100644 (file)
--- a/libs/surfaces/osc/osc_route_observer.cc
+++ b/libs/surfaces/osc/osc_route_observer.cc
@@ -28,7 +28,7 @@
 #include "osc.h"
 #include "osc_route_observer.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc
index 3cbdf8b9413ff1ca0cfe4b3c6c6344300d03c977..b01c4876b33290dadf9e62813952e92c3fddc7ca 100644 (file)
--- a/libs/surfaces/osc/osc_select_observer.cc
+++ b/libs/surfaces/osc/osc_select_observer.cc
@@ -32,7 +32,7 @@
 #include "osc.h"
 #include "osc_select_observer.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/surfaces/tranzport/button_events.cc b/libs/surfaces/tranzport/button_events.cc
index 1b070b3281dd5dcc99975f334d7778bddb447bd2..ebc00f95be6327eba6405d936a4b732d24533a3f 100644 (file)
--- a/libs/surfaces/tranzport/button_events.cc
+++ b/libs/surfaces/tranzport/button_events.cc
@@ -26,7 +26,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <pbd/abstract_ui.cc>
 

diff --git a/libs/surfaces/tranzport/general.cc b/libs/surfaces/tranzport/general.cc
index 35d2f2bb3bccd13e60dfaef70eac6da300b8a5b6..2b39aaa2d7fe184376bb4256050f26b718e88b5d 100644 (file)
--- a/libs/surfaces/tranzport/general.cc
+++ b/libs/surfaces/tranzport/general.cc
@@ -26,7 +26,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <pbd/abstract_ui.cc>
 // HA, I don't need this anymore

diff --git a/libs/surfaces/tranzport/init.cc b/libs/surfaces/tranzport/init.cc
index 459da81cbc1041c55008ca62a0225b163286abe0..1e284b5831ff8a4d4b7ce6028b8601f3bca1dc05 100644 (file)
--- a/libs/surfaces/tranzport/init.cc
+++ b/libs/surfaces/tranzport/init.cc
@@ -26,7 +26,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <pbd/abstract_ui.cc>
 

diff --git a/libs/surfaces/tranzport/io_usb.cc b/libs/surfaces/tranzport/io_usb.cc
index 56d270b62a60061719aac1f00c90db6f325e4bb1..c9c595ee0d21a4cfed0bf1e961b07a1093919d61 100644 (file)
--- a/libs/surfaces/tranzport/io_usb.cc
+++ b/libs/surfaces/tranzport/io_usb.cc
@@ -36,7 +36,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <pbd/abstract_ui.cc>
 

diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc
index 544bb3df96689755df1c27086c9258202fbb376a..027665ef4ab10221c390f536ecf26b704746df7e 100644 (file)
--- a/libs/surfaces/tranzport/show.cc
+++ b/libs/surfaces/tranzport/show.cc
@@ -44,7 +44,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/abstract_ui.cc"
 

diff --git a/libs/surfaces/tranzport/state.cc b/libs/surfaces/tranzport/state.cc
index 59eaef0460fe9ea3f63d024add749c6f6a28609c..f9988a178e5325038fccbc9b05a2591e39a01b7a 100644 (file)
--- a/libs/surfaces/tranzport/state.cc
+++ b/libs/surfaces/tranzport/state.cc
@@ -38,7 +38,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/abstract_ui.cc"
 

diff --git a/libs/surfaces/tranzport/wheel.cc b/libs/surfaces/tranzport/wheel.cc
index d90e0e2b6edd1214f3087c00d490a67fe74d69c3..00a66f9943218133d1cfab13d0d14ea6b6e37c81 100644 (file)
--- a/libs/surfaces/tranzport/wheel.cc
+++ b/libs/surfaces/tranzport/wheel.cc
@@ -38,7 +38,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/abstract_ui.cc"
 

diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc
index 6880218ff02ce60ab7675d1ae928855e6da93a1f..1882ad534ceda7f46f288701cd51af930e2bd08b 100644 (file)
--- a/libs/surfaces/tranzport/wheel_modes.cc
+++ b/libs/surfaces/tranzport/wheel_modes.cc
@@ -48,7 +48,7 @@ using namespace std;
 using namespace sigc;
 using namespace PBD;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <pbd/abstract_ui.cc>
 

diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc
index d86dbbc172c194f4dafb4d46127e32646e090029..df16bc05a5739aebb94d060ec2d9b08be8dbf9df 100644 (file)
--- a/libs/surfaces/wiimote/wiimote.cc
+++ b/libs/surfaces/wiimote/wiimote.cc
@@ -24,7 +24,7 @@
 #include "pbd/error.h"
 #include "ardour/debug.h"
 #include "ardour/session.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "wiimote.h"