From ad76f4439fd539b006ab654596f6591f1bce9270 Mon Sep 17 00:00:00 2001
From: Alexandre Deckner <alex@zappotek.com>
Date: Thu, 16 Sep 2010 16:36:56 +0000
Subject: [PATCH] * Build fix, see ticket 6374 * 80 char limit fix

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38679 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/tracker/OpenWithWindow.cpp | 11 ++++----
 src/kits/tracker/RegExp.cpp         | 39 +++++++++++++----------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/kits/tracker/OpenWithWindow.cpp b/src/kits/tracker/OpenWithWindow.cpp
index 1fe1b6af45..bae5a3875f 100644
--- a/src/kits/tracker/OpenWithWindow.cpp
+++ b/src/kits/tracker/OpenWithWindow.cpp
@@ -677,11 +677,12 @@ OpenWithPoseView::OpenSelection(BPose *pose, int32 *)
 	if (OpenWithRelation(pose->TargetModel()) == kNoRelation) {
 		if (!fIterator->GenericFilesOnly()) {
 			BString warning(B_TRANSLATE(
-				"The application \"%appname\" does not support the type of document you are "
-				"about to open. Are you sure you want to proceed? If you know that "
-				"the application supports the document type, you should contact the "
-				"publisher of the application and ask them to update their application "
-				"to list the type of your document as supported."));
+				"The application \"%appname\" does not support the type of "
+				"document you are about to open. Are you sure you want to "
+				"proceed? If you know that the application supports the "
+				"document type, you should contact the publisher of the "
+				"application and ask them to update their application to list "
+				"the type of your document as supported."));
 			warning.ReplaceFirst("%appname", pose->TargetModel()->Name());
 
 			BAlert* alert = new BAlert("", warning.String(),
diff --git a/src/kits/tracker/RegExp.cpp b/src/kits/tracker/RegExp.cpp
index 0416067791..573a3e00ed 100644
--- a/src/kits/tracker/RegExp.cpp
+++ b/src/kits/tracker/RegExp.cpp
@@ -65,14 +65,10 @@ All rights reserved.
 #include <stdio.h>
 #include <string.h>
 
-#include <Catalog.h>
 #include <Errors.h>
 
 #include "RegExp.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "libtracker"
-
 // The first byte of the regexp internal "program" is actually this magic
 // number; the start node begins in the second byte.
 
@@ -176,22 +172,22 @@ enum {
 	kWorst = 0	// Worst case.
 };
 
-static const char *kRegExpErrorStringArray[] = {
-	B_TRANSLATE_MARK("Unmatched parenthesis."),
-	B_TRANSLATE_MARK("Expression too long."),
-	B_TRANSLATE_MARK("Too many parenthesis."),
-	B_TRANSLATE_MARK("Junk on end."),
-	B_TRANSLATE_MARK("*+? operand may be empty."),
-	B_TRANSLATE_MARK("Nested *?+."),
-	B_TRANSLATE_MARK("Invalid bracket range."),
-	B_TRANSLATE_MARK("Unmatched brackets."),
-	B_TRANSLATE_MARK("Internal error."),
-	B_TRANSLATE_MARK("?+* follows nothing."),
-	B_TRANSLATE_MARK("Trailing \\."),
-	B_TRANSLATE_MARK("Corrupted expression."),
-	B_TRANSLATE_MARK("Memory corruption."),
-	B_TRANSLATE_MARK("Corrupted pointers."),
-	B_TRANSLATE_MARK("Corrupted opcode.")
+const char *kRegExpErrorStringArray[] = {
+	"Unmatched parenthesis.",
+	"Expression too long.",
+	"Too many parenthesis.",
+	"Junk on end.",
+	"*+? operand may be empty.",
+	"Nested *?+.",
+	"Invalid bracket range.",
+	"Unmatched brackets.",
+	"Internal error.",
+	"?+* follows nothing.",
+	"Trailing \\.",
+	"Corrupted expression.",
+	"Memory corruption.",
+	"Corrupted pointers.",
+	"Corrupted opcode."
 };
 
 #ifdef DEBUG
@@ -380,8 +376,7 @@ RegExp::ErrorString() const
 {
 	if (fError >= REGEXP_UNMATCHED_PARENTHESIS
 		&& fError <= REGEXP_CORRUPTED_OPCODE)
-		return B_TRANSLATE_NOCOLLECT(
-			kRegExpErrorStringArray[fError - B_ERRORS_END]);
+		return kRegExpErrorStringArray[fError - B_ERRORS_END];
 
 	return strerror(fError);
 }