diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-14 14:44:52 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-14 14:45:23 -0400 |
commit | cf52d6e4b40111eb04b244ec054055a4ec15dbe0 (patch) | |
tree | 2cb873af8afa79fcce46b82832da82de500666a2 /libs | |
parent | 2b262dbfdd25808471244ddc0edede34f8230231 (diff) |
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
Diffstat (limited to 'libs')
265 files changed, 300 insertions, 377 deletions
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index e4223e4586..d86362aa0d 100644 --- 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 a603e29b23..457291f72f 100644 --- 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 53966fdfca..a1e8807d57 100644 --- 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 7204bc33c8..80e51232d0 100644 --- 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 c3e88e7669..930eb416bd 100644 --- 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 6d8b2aa55f..89e210c772 100644 --- 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 e5ba4e8dcd..330b9d582a 100644 --- 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 a1643c88c5..2f09a37633 100644 --- 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 80ec1cb5f1..b00252df74 100644 --- 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 f24777c68d..c1afdfe535 100644 --- 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 98df5c1835..f77c8b526f 100644 --- 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 615ec4c0d7..8fc5c53d6d 100644 --- 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 8c56f90afb..8f83c19161 100644 --- 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 5280216d1b..dd77cb370e 100644 --- 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 c9c5565e3b..88cc197d60 100644 --- 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 7013d3446f..f90edd380a 100644 --- 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 84bfab11f8..30c2113c06 100644 --- 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 bb3c18f810..bb0b4da774 100644 --- 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 2917f155d3..391dcfb2d3 100644 --- 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 7b3f424663..123bc22918 100644 --- 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 0c7ba0bc1c..aa81c3aa92 100644 --- 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 dfc7be417a..10d2565c90 100644 --- 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 0d5c2ecc2d..e27da6ab08 100644 --- 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 3bc3f7e3d8..4b23378cac 100644 --- 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 99340839d2..c27905e2cf 100644 --- 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 62f3a525ea..228188621a 100644 --- 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 751e74cbcf..b9bd20ddc3 100644 --- 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 8951bee487..b942883250 100644 --- 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 3cef0f6f90..42f9994ae3 100644 --- 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 ca422b5bce..f6f0e092c8 100644 --- 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 9f6216062a..2b0a4dce4c 100644 --- 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 3bb00f731a..90ab07b86d 100644 --- 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 a86124c555..4742d96174 100644 --- 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 4a43009faf..c72c173425 100644 --- 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 89719e4259..e051ce6fb1 100644 --- 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 a8108e9a39..5d138505fb 100644 --- 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 6eac0c1cd9..ebd11a1887 100644 --- 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 3788e0207e..a329f877c1 100644 --- 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 d1a67da2c4..7bd7d0104f 100644 --- 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 67cdc7d086..06a4f465b2 100644 --- 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 26f5a7bb28..cc388531df 100644 --- 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 97f2ee56ac..6de3c9f8b7 100644 --- 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 efeb3398e5..177d515028 100644 --- 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 6554412273..e5d291a1b4 100644 --- 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 aef49cc28f..07bd911e98 100644 --- 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 47f68fe464..642f05a228 100644 --- 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 2dddd52401..8ca73788dd 100644 --- 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 fd6e6de1c5..f924ed17e5 100644 --- 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 c148c6dd82..c05a0a4bb9 100644 --- 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 fa6ca07fde..c575f1295e 100644 --- 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 fcdf42cbbe..47b9994cc6 100644 --- 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 36a74da0f5..6ebf23102a 100644 --- 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 c470ef7f3e..af39a47527 100644 --- 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 ef560085cc..8910c9a98c 100644 --- 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 7d4730d290..cdfd4e036d 100644 --- 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 3cf0eaea16..563c882efe 100644 --- 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 index b04c96d435..0000000000 --- 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 fd5d3bf98a..b2b9403e0e 100644 --- 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 a3b48ee790..b8c026bd02 100644 --- 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 67b0a06b79..1746b00847 100644 --- 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 2931e8d23a..f7e2b95eb3 100644 --- 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 3af3d67de4..61bb97f0ad 100644 --- 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 cfff3a5ee6..7ca6929112 100644 --- 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 0bdc89600c..9f2ab0ab3b 100644 --- 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 d827d0f2b6..0a48b43d0e 100644 --- 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 281e045ae3..87c304ff9e 100644 --- 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 b07b320f85..8ca97ee5b6 100644 --- 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 ab84cf6201..6167c6bda2 100644 --- 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 edee3a34a9..890e268c59 100644 --- 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 b48c3100fb..54427a2ddb 100644 --- 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 25c139d26a..815711f039 100644 --- 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 c850cb6fe7..daf781e4f5 100644 --- 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 4b32e47bb5..3939048ad4 100644 --- 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 9743327ec6..f2dc4f9abb 100644 --- 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 5baeb32263..4d3dd4e5a7 100644 --- 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 b5e93ae494..7f2b7fb863 100644 --- 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 133f4ee7f8..8a6d8dfd10 100644 --- 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 5402664ed1..e3274c77b1 100644 --- 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 3d9c5b1e9f..65c2794947 100644 --- 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 14b29eb6d4..4c678c04e0 100644 --- 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 9304a64323..969dadbf75 100644 --- 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 7f6c865922..07eb549e66 100644 --- 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 70364b6841..5b671b4a26 100644 --- 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 7258f49a1c..70f44e19c1 100644 --- 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 e9efb2fc17..c96254eeb2 100644 --- 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 c11f96c071..eaacde2969 100644 --- 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 5b97b4090a..7f5dee4c64 100644 --- 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 c16de3b7c1..907a7473d7 100644 --- 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 f9bff99c19..811d5a15b3 100644 --- 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 25aa93db9d..102694e7ac 100644 --- 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 7e9815f326..5b38547366 100644 --- 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 32f50bd573..29a2fe9143 100644 --- 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 eb64a77433..7658bd86e8 100644 --- 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 1b4796d351..5c5fe411d5 100644 --- 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 754e8fc5d2..d77c8a0e7f 100644 --- 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 d132850af0..59e4e2e977 100644 --- 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 906e979862..c6b73b4077 100644 --- 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 afc34c358a..6c3ae0021c 100644 --- 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 3a7eff9d14..bf0c9b7af1 100644 --- 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 bc237893a0..9757c104b9 100644 --- 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 de13d0eeb1..70744429f9 100644 --- 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 79bbfb02f3..46f9910738 100644 --- 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 8dc2bce418..07f72331bb 100644 --- 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 81982c156d..884ac0d53e 100644 --- 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 11117e720c..7fb799d492 100644 --- 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 49d72f65d6..23515a2e2e 100644 --- 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 61313f371c..33b41f5c04 100644 --- 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 d38279c08c..3b53454289 100644 --- 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 1eafca0574..ec8e3024ea 100644 --- 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 fe094dae6b..b335f54904 100644 --- 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 f13edb5165..60a23376b6 100644 --- 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 f484a1602a..b60b63dcf4 100644 --- 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 9ae909780a..bc127e2d81 100644 --- 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 f6366b5463..100e73678d 100644 --- 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 39d517cff8..fd0b9b1b1d 100644 --- 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 67375e7431..f3512c3204 100644 --- 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 b820ad3e49..f3036e04ea 100644 --- 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 039ecbe691..ca2914764a 100644 --- 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 6578e89837..16a9e02e37 100644 --- 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 04eecf0dee..9a406c549f 100644 --- 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 cb61b0767a..5c92b9051c 100644 --- 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 fa564968ed..01580456e4 100644 --- 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 111033bf23..dfe61c4c33 100644 --- 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 a0ffbbc83c..1a7b98050c 100644 --- 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 dcf83951cd..e9d3195694 100644 --- 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 2ad08736df..d0049ff7b2 100644 --- 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 9ab82c7106..4449897898 100644 --- 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 613233cacb..259a3a1d3d 100644 --- 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 969fdabb82..9c67ebef86 100644 --- 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 1f78d7ed12..a99738a613 100644 --- 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 2744831643..b8814711f3 100644 --- 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 3a4d049e3a..c52fe1aeb5 100644 --- 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 9d11cb0b91..6e17545fc3 100644 --- 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 84342fa3d9..7234411ce4 100644 --- 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 0cf0f6d1b1..2a14f8a4bc 100644 --- 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 2cd21f9afd..945f96519e 100644 --- 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 6d7fea3b26..fa23880b87 100644 --- 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 39b31550d9..683d174b16 100644 --- 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 368b043ef7..95982b6158 100644 --- 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 b054d65787..eaa1d05503 100644 --- 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 f1f99e3693..5572cdce70 100644 --- 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 1aafd7118b..76cf2d3755 100644 --- 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 5d5c9cc8df..28cfbb2b75 100644 --- 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 54770d5cc8..8f080285e2 100644 --- 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 47c7885b85..8771af46aa 100644 --- 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 4cce5219ac..7b52b3cdf4 100644 --- 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 0ac1e3227b..e759af3d5d 100644 --- 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 5cb8e8ddce..10eb084372 100644 --- 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 9d332b5453..2aae26d847 100644 --- 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 1b69ca2d0a..3bd54736df 100644 --- 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 73361c33da..4522e8a54d 100644 --- 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 a961fa0b1f..c31644b026 100644 --- 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 25bb5e723e..e4d551168b 100644 --- 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 6d827b815d..92c6c9ec20 100644 --- 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 68ab2fa2f6..caef9570b4 100644 --- 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 ee32e508e2..f9772ec9ed 100644 --- 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 db7faeddf1..834014bd1f 100644 --- 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 98fe63d587..624ad5cee1 100644 --- 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 b9421d2c07..98389bf33b 100644 --- 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 8e65ea2b56..752fdd8ae5 100644 --- 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 b031ee28f9..d12ceed706 100644 --- 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 744c103e48..84d2bafccf 100644 --- 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 0f8594d731..0be884c6ba 100644 --- 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 05d3d89c15..0c328c0b1e 100644 --- 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 5a6a2a4018..91e2320337 100644 --- 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 0c586e4a0e..71eabc5b28 100644 --- 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 31b5ab6a8b..6eed8369a7 100644 --- 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 1f710d4c4c..8fbb1787c7 100644 --- 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 aaafcb0479..dda0a6dce7 100644 --- 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 0ae1c569c8..8e57cdeac3 100644 --- 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 abc74fbdc6..a2b16913bb 100644 --- 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 382e350929..20e9e38ca2 100644 --- 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 68b376d8d3..ca2ef910ad 100644 --- 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 b517b480b6..728219b0fe 100644 --- 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 9dec5ea772..17cfa1eed7 100644 --- 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 8e34428db3..5c267d6c7f 100644 --- 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 43c11c3265..76738e9db5 100644 --- 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 303649b9e7..0702c63158 100644 --- 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 cb77c3c48d..a9c3adf4fa 100644 --- 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 b22049e247..a0eeb3dcaa 100644 --- 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 801c8045d9..6282518d91 100644 --- 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 32c9f203fa..8b9e4af1dd 100644 --- 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 0b25ecbe01..934f8b5d9e 100644 --- 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 6fb3201c99..b26cb40367 100644 --- 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 26e3264e1f..b25a54f7a9 100644 --- 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 aa47d98488..0c321ec704 100644 --- 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 index 43ae07cac1..0000000000 --- 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 fb0abf44d1..5f04d9488c 100644 --- 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 a73720009a..19a0fb1409 100644 --- 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 index dcbbfcf52e..0000000000 --- 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 e2abdae4f9..3aa36b98db 100644 --- 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 0c777ed999..d213f22d26 100644 --- 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 5c0cc3c958..cc9695f981 100644 --- 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 dfa2b4ac7c..5ba5f7eba4 100644 --- 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 617fc3a100..ff44da4b32 100644 --- 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 fe93f1eb7c..8349a685fa 100644 --- 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 f8862835f6..2ac0dba627 100644 --- 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 5d28218bb5..6d4697fe04 100644 --- 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 e220a37a28..c3e94c922e 100644 --- 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 index 2f1c52a907..0000000000 --- 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 1abe69f9f0..569db5e1a8 100644 --- 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 02a4745f8b..5926809a55 100644 --- 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 f169a5a29d..2f2ff0c5d8 100644 --- 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 3040b0f9ac..d45ef01408 100644 --- 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 1f5e13b923..51628ab13d 100644 --- 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 f0ad19d055..9b55efbcd1 100644 --- 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 9aa1c3fe5f..5e4752454e 100644 --- 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 c107bd988a..bb30e5610f 100644 --- 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 7de9b02683..22c26aa1b7 100644 --- 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 3210e0e63d..b1be7c9c92 100644 --- 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 d0303c972b..1f2fa54112 100644 --- 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 eaf25a9f74..5cb9ed94b6 100644 --- 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 0c04c022d2..3dc3b53e2c 100644 --- 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 c4cdf22958..9105eff713 100644 --- 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 6e4752bff7..647c92ada3 100644 --- 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 74fcde33aa..e6cbd3655f 100644 --- 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 d303d880c9..f22d83264e 100644 --- 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 6b92e84926..b730a42980 100644 --- 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 660891076d..dd43475e69 100644 --- 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 0940146aef..419c5bfb37 100644 --- 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 ddc8215194..7b3aba9053 100644 --- 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 08f3c2e158..ea3f7a46af 100644 --- 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 6cf43f3fd2..26f80f9719 100644 --- 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 c72f65d303..7c3e097881 100644 --- 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 index 35516fab53..0000000000 --- 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 c48544d160..59c6c4469e 100644 --- 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 13383c27d1..ab0f668f26 100644 --- 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 52dc3fa12a..6f03f2554e 100644 --- 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 index 0000000000..4b75d34315 --- /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 3fb11a3a50..8b8219f7e2 100644 --- 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 f7fcd65098..5721b58fd0 100644 --- 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 ab45e30d80..0fab935b08 100644 --- 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 dd5e84cfd7..74c2802a7a 100644 --- 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 f1036c87a7..6a11cadb4a 100644 --- 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 7d8bb46bf1..0f32b09d4b 100644 --- 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 f9179f8b8b..160ba0ec87 100644 --- 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 index dcbbfcf52e..0000000000 --- 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 f093287f50..5799ab682a 100644 --- 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 07dc06a3bb..a116c4f2a1 100644 --- 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 8e861b370d..3c2479b622 100644 --- 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 index dcbbfcf52e..0000000000 --- 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 d46937aff5..dfac991cca 100644 --- 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 f67aa3cddd..ca3f146803 100644 --- 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 6283a5469d..06786197e2 100644 --- 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 754c4ac5aa..15d266634c 100644 --- 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 224590aa54..2ea61cc9f0 100644 --- 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 c04eb52614..3fcf2458b8 100644 --- 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 f26c92c869..4733327d2c 100644 --- 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 494418a090..ec8192f91d 100644 --- 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 6f6500ffa3..ddc5a7b037 100644 --- 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 474fd44fb3..42828626e4 100644 --- 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 8eb7dd1e03..005cac2b5f 100644 --- 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 fef3a92619..cd7bf0866d 100644 --- 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 7879b75f19..9fd2fce070 100644 --- 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 f56729e0fa..067e84986a 100644 --- 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 3cbdf8b941..b01c4876b3 100644 --- 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 1b070b3281..ebc00f95be 100644 --- 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 35d2f2bb3b..2b39aaa2d7 100644 --- 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 459da81cbc..1e284b5831 100644 --- 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 56d270b62a..c9c595ee0d 100644 --- 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 544bb3df96..027665ef4a 100644 --- 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 59eaef0460..f9988a178e 100644 --- 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 d90e0e2b6e..00a66f9943 100644 --- 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 6880218ff0..1882ad534c 100644 --- 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 d86dbbc172..df16bc05a5 100644 --- 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" |