[haiku-commits] r40834 - haiku/trunk/src/apps/terminal

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 6 Mar 2011 10:33:39 +0100 (CET)

Author: korli
Date: 2011-03-06 10:33:39 +0100 (Sun, 06 Mar 2011)
New Revision: 40834
Changeset: http://dev.haiku-os.org/changeset/40834
Ticket: http://dev.haiku-os.org/ticket/7329

Modified:
   haiku/trunk/src/apps/terminal/PrefHandler.cpp
   haiku/trunk/src/apps/terminal/Shell.cpp
   haiku/trunk/src/apps/terminal/TermApp.cpp
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
Patch from diver (bug #7329) with cleanup by myself: remove excessive 
localization


Modified: haiku/trunk/src/apps/terminal/PrefHandler.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/PrefHandler.cpp       2011-03-06 08:07:17 UTC 
(rev 40833)
+++ haiku/trunk/src/apps/terminal/PrefHandler.cpp       2011-03-06 09:33:39 UTC 
(rev 40834)
@@ -256,7 +256,7 @@
                sscanf(s, "%d, %d, %d", &r, &g, &b);
        } else {
                fprintf(stderr,
-                       B_TRANSLATE("PrefHandler::getRGB(%s) - key not 
found\n"), key);
+                       "PrefHandler::getRGB(%s) - key not found\n", key);
                r = g = b = 0;
        }
 

Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp     2011-03-06 08:07:17 UTC (rev 
40833)
+++ haiku/trunk/src/apps/terminal/Shell.cpp     2011-03-06 09:33:39 UTC (rev 
40834)
@@ -412,14 +412,14 @@
        const char *ttyName;
 
        if (master < 0) {
-       fprintf(stderr, B_TRANSLATE("Didn't find any available pseudo ttys."));
-       return errno;
+               fprintf(stderr, "Didn't find any available pseudo ttys.");
+               return errno;
        }
 
        if (grantpt(master) != 0 || unlockpt(master) != 0
                || (ttyName = ptsname(master)) == NULL) {
                close(master);
-       fprintf(stderr, B_TRANSLATE("Failed to init pseudo tty."));
+               fprintf(stderr, "Failed to init pseudo tty.");
                return errno;
        }
 
@@ -454,7 +454,7 @@
                if (setsid() < 0) {
                        handshake.status = PTY_NG;
                        snprintf(handshake.msg, sizeof(handshake.msg),
-                               B_TRANSLATE("could not set session leader."));
+                               "could not set session leader.");
                        send_handshake_message(terminalThread, handshake);
                        exit(1);
                }
@@ -464,7 +464,7 @@
                if ((slave = open(ttyName, O_RDWR)) < 0) {
                        handshake.status = PTY_NG;
                        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);
                        exit(1);
                }
@@ -503,7 +503,7 @@
                if (tcsetattr(0, TCSANOW, &tio) == -1) {
                        handshake.status = PTY_NG;
                        snprintf(handshake.msg, sizeof(handshake.msg),
-                               B_TRANSLATE("failed set terminal interface 
(TERMIOS)."));
+                               "failed set terminal interface (TERMIOS).");
                        send_handshake_message(terminalThread, handshake);
                        exit(1);
                }
@@ -519,7 +519,7 @@
                if (handshake.status != PTY_WS) {
                        handshake.status = PTY_NG;
                        snprintf(handshake.msg, sizeof(handshake.msg),
-                               B_TRANSLATE("mismatch handshake."));
+                               "mismatch handshake.");
                        send_handshake_message(terminalThread, handshake);
                        exit(1);
                }

Modified: haiku/trunk/src/apps/terminal/TermApp.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermApp.cpp   2011-03-06 08:07:17 UTC (rev 
40833)
+++ haiku/trunk/src/apps/terminal/TermApp.cpp   2011-03-06 09:33:39 UTC (rev 
40834)
@@ -88,7 +88,7 @@
 #endif
        action.sa_userdata = this;
        if (sigaction(SIGCHLD, &action, NULL) < 0) {
-               fprintf(stderr, B_TRANSLATE("sigaction() failed: %s\n"),
+               fprintf(stderr, "sigaction() failed: %s\n",
                        strerror(errno));
                // continue anyway
        }

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp  2011-03-06 08:07:17 UTC (rev 
40833)
+++ haiku/trunk/src/apps/terminal/TermView.cpp  2011-03-06 09:33:39 UTC (rev 
40834)
@@ -747,7 +747,7 @@
 TermView::_InvalidateTextRect(int32 x1, int32 y1, int32 x2, int32 y2)
 {
        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,
 //rect.right, rect.bottom);
        Invalidate(rect);
@@ -2195,7 +2195,7 @@
                cdItem->SetEnabled(false);
 
        BPopUpMenu *menu = new BPopUpMenu(
-               B_TRANSLATE("Secondary mouse button drop menu"));
+               "Secondary mouse button drop menu");
        menu->SetAsyncAutoDestruct(true);
        menu->AddItem(insertItem);
        menu->AddSeparatorItem();


Other related posts:

  • » [haiku-commits] r40834 - haiku/trunk/src/apps/terminal - korli