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