Fix --no-nls, i18n include order in UI -- #8361

gtk2_ardour/ardour_ui_access_web.cc

@@ -36,12 +36,13 @@
 #include "gtk2ardour-version.h"
 #endif
 
-#include "pbd/i18n.h"
 #include "pbd/openuri.h"
 
 #include "ardour_message.h"
 #include "ardour_ui.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;

gtk2_ardour/ardour_ui_dependents.cc

@@ -33,7 +33,6 @@
 #include <cstdio>
 
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 
 #include "ardour/session.h"
 #include "ardour/lv2_plugin.h"
@@ -62,6 +61,8 @@
 #include <gdk/gdkx.h>
 #endif
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace PBD;
 

gtk2_ardour/pt_import_selector.cc

@@ -22,7 +22,6 @@
 #include <iostream>
 
 #include "pbd/gstdio_compat.h"
-#include "pbd/i18n.h"
 #include "pbd/file_utils.h"
 
 #include "ptformat/ptformat.h"
@@ -33,6 +32,8 @@
 
 #include "pt_import_selector.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace ARDOUR;
 using namespace PBD;

gtk2_ardour/startup_fsm.cc

@@ -26,7 +26,6 @@
 #include "pbd/basename.h"
 #include "pbd/file_archive.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/filename_extensions.h"
@@ -58,6 +57,8 @@
 #include "gtk2ardour-version.h"
 #endif
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace Gtk;
 using namespace Gtkmm2ext;

gtk2_ardour/template_dialog.cc

@@ -40,7 +40,6 @@
 #include "pbd/error.h"
 #include "pbd/file_archive.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/xml++.h"
 
 #include "gtkmm2ext/gui_thread.h"
@@ -52,9 +51,10 @@
 #include "ardour/template_utils.h"
 
 #include "progress_reporter.h"
-
 #include "template_dialog.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace Gtk;
 using namespace PBD;

gtk2_ardour/transport_control.cc

@@ -16,8 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "pbd/i18n.h"
-
 #include "ardour/location.h"
 #include "ardour/session.h"
 
@@ -25,6 +23,8 @@
 #include "ardour_ui.h"
 #include "transport_control.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 
 TransportControlProvider::TransportControlProvider ()

session_utils/fix_bbtppq.cc

@@ -25,7 +25,6 @@
 #include <glibmm.h>
 
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/stateful.h"
 
 #include "ardour/region_factory.h"
@@ -44,6 +43,8 @@
 
 #include "common.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace SessionUtils;