From b6075d1fd2c8504ec37f2dfec70a4a6b4672441c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= <jonas@kirilla.com>
Date: Tue, 15 Mar 2011 16:00:58 +0000
Subject: [PATCH] Adding B_TRANSLATE_NOCOLLECT_APP_NAME. Reordered.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40961 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/locale/Catalog.h | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/headers/os/locale/Catalog.h b/headers/os/locale/Catalog.h
index a3bff0851e..849cd2f550 100644
--- a/headers/os/locale/Catalog.h
+++ b/headers/os/locale/Catalog.h
@@ -100,12 +100,6 @@ private:
 	BLocaleRoster::Default()->GetCatalog()->GetString((string), \
 		B_TRANSLATE_CONTEXT)
 
-#undef B_TRANSLATE_APP_NAME
-#define B_TRANSLATE_APP_NAME(string) \
-	BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
-	? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
-		B_TRANSLATE_APP_NAME_CONTEXT) : (string)
-
 #undef B_TRANSLATE_WITH_CONTEXT
 #define B_TRANSLATE_WITH_CONTEXT(string, context) \
 	BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
@@ -124,6 +118,12 @@ private:
 #define B_TRANSLATE_ID(id) \
 	BLocaleRoster::Default()->GetCatalog()->GetString((id))
 
+#undef B_TRANSLATE_APP_NAME
+#define B_TRANSLATE_APP_NAME(string) \
+	BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
+	? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
+		B_TRANSLATE_APP_NAME_CONTEXT) : (string)
+
 // Translation markers which can be used to mark static strings/IDs which
 // are used as key for translation requests (at other places in the code):
 /* example:
@@ -185,6 +185,10 @@ private:
 #define B_TRANSLATE_NOCOLLECT_ID(id) \
 	B_TRANSLATE_ID(id)
 
+#undef B_TRANSLATE_NOCOLLECT_APP_NAME
+#define B_TRANSLATE_NOCOLLECT_APP_NAME(str) \
+	B_TRANSLATE_APP_NAME(str)
+
 #endif	/* B_AVOID_TRANSLATION_MACROS */
 
 #else	/* B_COLLECTING_CATKEYS */
@@ -200,10 +204,6 @@ private:
 #define B_TRANSLATE(string) \
 	B_CATKEY((string), B_TRANSLATE_CONTEXT)
 
-#undef B_TRANSLATE_APP_NAME
-#define B_TRANSLATE_APP_NAME(string) \
-	B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
-
 #undef B_TRANSLATE_WITH_CONTEXT
 #define B_TRANSLATE_WITH_CONTEXT(string, context) \
 	B_CATKEY((string), (context))
@@ -220,6 +220,10 @@ private:
 #define B_TRANSLATE_ID(id) \
 	B_CATKEY((id))
 
+#undef B_TRANSLATE_APP_NAME
+#define B_TRANSLATE_APP_NAME(string) \
+	B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
+
 #undef B_TRANSLATE_MARK
 #define B_TRANSLATE_MARK(str) \
 	B_CATKEY((str), B_TRANSLATE_CONTEXT)
@@ -256,6 +260,10 @@ private:
 #define B_TRANSLATE_NOCOLLECT_ID(id) \
 	(void)
 
+#undef B_TRANSLATE_NOCOLLECT_APP_NAME
+#define B_TRANSLATE_NOCOLLECT_APP_NAME(str) \
+	(void)
+
 #endif	/* B_COLLECTING_CATKEYS */