Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from diver (bug #7329) with cleanup by myself: remove excessive localization

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40834 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2011-03-06 09:33:39 +00:00
parent 6c6f425ceb
commit 0961433d2a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/terminal/PrefHandler.cpp
View File

@ -256,7 +256,7 @@ PrefHandler::getRGB(const char *key)
sscanf(s, "%d, %d, %d", &r, &g, &b); sscanf(s, "%d, %d, %d", &r, &g, &b);
} else { } else {
fprintf(stderr, fprintf(stderr,
B_TRANSLATE("PrefHandler::getRGB(%s) - key not found\n"), key); "PrefHandler::getRGB(%s) - key not found\n", key);
r = g = b = 0; r = g = b = 0;
} }

14
src/apps/terminal/Shell.cpp
View File

@ -412,14 +412,14 @@ Shell::_Spawn(int row, int col, const ShellParameters& parameters)
const char *ttyName; const char *ttyName;
if (master < 0) { if (master < 0) {
fprintf(stderr, B_TRANSLATE("Didn't find any available pseudo ttys.")); fprintf(stderr, "Didn't find any available pseudo ttys.");
return errno; return errno;
} }
if (grantpt(master) != 0 || unlockpt(master) != 0 if (grantpt(master) != 0 || unlockpt(master) != 0
|| (ttyName = ptsname(master)) == NULL) { || (ttyName = ptsname(master)) == NULL) {
close(master); close(master);
fprintf(stderr, B_TRANSLATE("Failed to init pseudo tty.")); fprintf(stderr, "Failed to init pseudo tty.");
return errno; return errno;
} }
@ -454,7 +454,7 @@ Shell::_Spawn(int row, int col, const ShellParameters& parameters)
if (setsid() < 0) { if (setsid() < 0) {
handshake.status = PTY_NG; handshake.status = PTY_NG;
snprintf(handshake.msg, sizeof(handshake.msg), snprintf(handshake.msg, sizeof(handshake.msg),
B_TRANSLATE("could not set session leader.")); "could not set session leader.");
send_handshake_message(terminalThread, handshake); send_handshake_message(terminalThread, handshake);
exit(1); exit(1);
} }
@ -464,7 +464,7 @@ Shell::_Spawn(int row, int col, const ShellParameters& parameters)
if ((slave = open(ttyName, O_RDWR)) < 0) { if ((slave = open(ttyName, O_RDWR)) < 0) {
handshake.status = PTY_NG; handshake.status = PTY_NG;
snprintf(handshake.msg, sizeof(handshake.msg), snprintf(handshake.msg, sizeof(handshake.msg),
B_TRANSLATE("can't open tty (%s)."), ttyName); "can't open tty (%s).", ttyName);
send_handshake_message(terminalThread, handshake); send_handshake_message(terminalThread, handshake);
exit(1); exit(1);
} }
@ -503,7 +503,7 @@ Shell::_Spawn(int row, int col, const ShellParameters& parameters)
if (tcsetattr(0, TCSANOW, &tio) == -1) { if (tcsetattr(0, TCSANOW, &tio) == -1) {
handshake.status = PTY_NG; handshake.status = PTY_NG;
snprintf(handshake.msg, sizeof(handshake.msg), snprintf(handshake.msg, sizeof(handshake.msg),
B_TRANSLATE("failed set terminal interface (TERMIOS).")); "failed set terminal interface (TERMIOS).");
send_handshake_message(terminalThread, handshake); send_handshake_message(terminalThread, handshake);
exit(1); exit(1);
} }
@ -519,7 +519,7 @@ Shell::_Spawn(int row, int col, const ShellParameters& parameters)
if (handshake.status != PTY_WS) { if (handshake.status != PTY_WS) {
handshake.status = PTY_NG; handshake.status = PTY_NG;
snprintf(handshake.msg, sizeof(handshake.msg), snprintf(handshake.msg, sizeof(handshake.msg),
B_TRANSLATE("mismatch handshake.")); "mismatch handshake.");
send_handshake_message(terminalThread, handshake); send_handshake_message(terminalThread, handshake);
exit(1); exit(1);
} }

2
src/apps/terminal/TermApp.cpp
View File

@ -88,7 +88,7 @@ TermApp::ReadyToRun()
#endif #endif
action.sa_userdata = this; action.sa_userdata = this;
if (sigaction(SIGCHLD, &action, NULL) < 0) { if (sigaction(SIGCHLD, &action, NULL) < 0) {
fprintf(stderr, B_TRANSLATE("sigaction() failed: %s\n"), fprintf(stderr, "sigaction() failed: %s\n",
strerror(errno)); strerror(errno));
// continue anyway // continue anyway
} }

4
src/apps/terminal/TermView.cpp
View File

@ -747,7 +747,7 @@ inline void
TermView::_InvalidateTextRect(int32 x1, int32 y1, int32 x2, int32 y2) TermView::_InvalidateTextRect(int32 x1, int32 y1, int32 x2, int32 y2)
{ {
BRect rect(x1 * fFontWidth, _LineOffset(y1), BRect rect(x1 * fFontWidth, _LineOffset(y1),
(x2 + 1) * fFontWidth - 1, _LineOffset(y2 + 1) - 1); (x2 + 1) * fFontWidth - 1, _LineOffset(y2 + 1) - 1);
//debug_printf("Invalidate((%f, %f) - (%f, %f))\n", rect.left, rect.top, //debug_printf("Invalidate((%f, %f) - (%f, %f))\n", rect.left, rect.top,
//rect.right, rect.bottom); //rect.right, rect.bottom);
Invalidate(rect); Invalidate(rect);
@ -2195,7 +2195,7 @@ TermView::_SecondaryMouseButtonDropped(BMessage* msg)
cdItem->SetEnabled(false); cdItem->SetEnabled(false);
BPopUpMenu *menu = new BPopUpMenu( BPopUpMenu *menu = new BPopUpMenu(
B_TRANSLATE("Secondary mouse button drop menu")); "Secondary mouse button drop menu");
menu->SetAsyncAutoDestruct(true); menu->SetAsyncAutoDestruct(true);
menu->AddItem(insertItem); menu->AddItem(insertItem);
menu->AddSeparatorItem(); menu->AddSeparatorItem();