Fix #8841 (broken localization support for 3rd-party apps).

* made private Catalog.h header public by moving it to 
  os/locale/tools/CollectingCatalog.h
* reintroduce B_COLLECTING_CATKEYS define (which is expected to be set
  during a collectcatkeys session) in order to decide whether or not
  to automatically include the CollecingCatalog.h header from Catalog.h
* adjust jam rule for collecting catalog keys accordingly

headers/os/locale/Catalog.h

@@ -86,6 +86,13 @@ private:
 	// Tip: Use a descriptive name of the class implemented in that
 	//		source-file.
 
+#ifdef B_COLLECTING_CATKEYS
+
+// pull in all the macros used when collecting catalog keys.
+#include <tools/CollectingCatalog.h>
+
+#else
+
 // Translation macros which may be used to shorten translation requests:
 #undef B_TRANSLATE
 #define B_TRANSLATE(string) \
@@ -172,7 +179,7 @@ private:
 #undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID
 #define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string)
 
-// Translation macros which do not let collectcatkeys try to collect the key
+// Translation macros which cause collectcatkeys to ignore this key
 // (useful in combination with the marking macros above):
 #undef B_TRANSLATE_NOCOLLECT
 #define B_TRANSLATE_NOCOLLECT(string) \
@@ -194,6 +201,8 @@ private:
 #define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string) \
 	B_TRANSLATE_SYSTEM_NAME(string)
 
+#endif	/* B_COLLECTING_CATKEYS */
+
 #endif	/* B_AVOID_TRANSLATION_MACROS */
 
 

headers/os/locale/tools/CollectingCatalog.h

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _TOOLS_COLLECTING_CATALOG_H_
+#define _TOOLS_COLLECTING_CATALOG_H_
+
+
+// Translation macros used when executing collectcatkeys
+#undef B_TRANSLATE
+#define B_TRANSLATE(string) \
+	B_CATKEY((string), B_TRANSLATION_CONTEXT)
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT(string, context) \
+	B_CATKEY((string), (context))
+
+#undef B_TRANSLATE_COMMENT
+#define B_TRANSLATE_COMMENT(string, comment) \
+	B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
+
+#undef B_TRANSLATE_ALL
+#define B_TRANSLATE_ALL(string, context, comment) \
+	B_CATKEY((string), (context), (comment))
+
+#undef B_TRANSLATE_ID
+#define B_TRANSLATE_ID(id) \
+	B_CATKEY((id))
+
+#undef B_TRANSLATE_SYSTEM_NAME
+#define B_TRANSLATE_SYSTEM_NAME(string) \
+	B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT)
+
+#undef B_TRANSLATE_MARK
+#define B_TRANSLATE_MARK(string) \
+	B_CATKEY((string), B_TRANSLATION_CONTEXT)
+
+#undef B_TRANSLATE_MARK_COMMENT
+#define B_TRANSLATE_MARK_COMMENT(string, comment) \
+	B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
+
+#undef B_TRANSLATE_MARK_ALL
+#define B_TRANSLATE_MARK_ALL(string, context, comment) \
+	B_CATKEY((string), (context), (comment))
+
+#undef B_TRANSLATE_MARK_ID
+#define B_TRANSLATE_MARK_ID(id) \
+	B_CATKEY((id))
+
+#undef B_TRANSLATE_MARK_SYSTEM_NAME
+#define B_TRANSLATE_MARK_SYSTEM_NAME(string) \
+	B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT, "")
+
+#undef B_TRANSLATE_MARK_VOID
+#define B_TRANSLATE_MARK_VOID(string) \
+	B_CATKEY((string), B_TRANSLATION_CONTEXT)
+
+#undef B_TRANSLATE_MARK_COMMENT_VOID
+#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
+	B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
+
+#undef B_TRANSLATE_MARK_ALL_VOID
+#define B_TRANSLATE_MARK_ALL_VOID(string, context, comment) \
+	B_CATKEY((string), (context), (comment))
+
+#undef B_TRANSLATE_MARK_ID_VOID
+#define B_TRANSLATE_MARK_ID_VOID(id) \
+	B_CATKEY((id))
+
+#undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID
+#define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string) \
+	B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT, "")
+
+#undef B_TRANSLATE_NOCOLLECT
+#define B_TRANSLATE_NOCOLLECT(string)
+
+#undef B_TRANSLATE_NOCOLLECT_COMMENT
+#define B_TRANSLATE_NOCOLLECT_COMMENT(string, comment)
+
+#undef B_TRANSLATE_NOCOLLECT_ALL
+#define B_TRANSLATE_NOCOLLECT_ALL(string, context, comment)
+
+#undef B_TRANSLATE_NOCOLLECT_ID
+#define B_TRANSLATE_NOCOLLECT_ID(id)
+
+#undef B_TRANSLATE_NOCOLLECT_SYSTEM_NAME
+#define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string)
+
+
+#endif /* _COLLECTING_CATALOG_H_ */