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

16 files changed, 57 insertions, 26 deletions

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);