diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:23 -0600 |
| commit | b6609bb30d91121e98eb2bbe2cf89ff144680e84 (patch) | |
| tree | 5d8a9133155e9e2e9cde60e2cc3670de03ae5d35 /twin/main.cpp | |
| parent | 2242eb95a7bcd686207e2043340fed5ccc8b7609 (diff) | |
| parent | 56a663b7c2cf18978a349015b6e19f1d898e8bb9 (diff) | |
| download | tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.tar.gz tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'twin/main.cpp')
| -rw-r--r-- | twin/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/twin/main.cpp b/twin/main.cpp index 1e1ec114c..7cdf8985c 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -60,7 +60,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e) ) && (e->error_code == BadAccess)) { - fputs(i18n("twin: it looks like there's already a window manager running. twin not started.\n").local8Bit(), stderr); + fputs(i18n("[twin] it looks like there's already a window manager running. twin not started.\n").local8Bit(), stderr); exit(1); } @@ -71,11 +71,11 @@ int x11ErrorHandler(Display *d, XErrorEvent *e) sprintf(number, "%d", e->request_code); XGetErrorDatabaseText(d, "XRequest", number, "<unknown>", req, sizeof(req)); - fprintf(stderr, "twin: %s(0x%lx): %s\n", req, e->resourceid, msg); + fprintf(stderr, "[twin] %s(0x%lx): %s\n", req, e->resourceid, msg); if (initting) { - fputs(i18n("twin: failure during initialization; aborting").local8Bit(), stderr); + fputs(i18n("[twin] failure during initialization; aborting").local8Bit(), stderr); exit(1); } return 0; @@ -129,19 +129,19 @@ Application::Application( ) XFree ( (void *) data); if( !owner.claim( true, true )) { - fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); + fputs(i18n("[twin] unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } } else { - fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); + fputs(i18n("[twin] unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } } else { - fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); + fputs(i18n("[twin] unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } } @@ -299,9 +299,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) if (putenv( strdup(envir.data())) ) { fprintf(stderr, - "%s: WARNING: unable to set DISPLAY environment variable\n", + "[twin] %s: WARNING: unable to set DISPLAY environment variable\n", argv[0]); - perror("putenv()"); + perror("[twin] putenv()"); } } } |