X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=f192c0a191fe4f771e38f4cee57a52dfba9390aa;hb=296c12c0361d64ad612d22154440ad4046938300;hp=6b563a3fc2c2800e0b888b9d9761967867691516;hpb=ca5b573f6325870c16966df1f0bb989acd6326ae;p=chaz%2Fopenbox

diff --git a/src/main.cc b/src/main.cc
index 6b563a3f..f192c0a1 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -62,8 +62,8 @@ static void showHelp(int exitval) {
   // print program usage and command line options
   printf(i18n(mainSet, mainUsage,
               "Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
-              "                 2001 - 2002 Sean 'Shaleh' Perry\n"
-              "                 1997 - 2000, 2002 Brad Hughes\n\n"
+              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
+              "                    1997 - 2000, 2002 Brad Hughes\n\n"
               "  -display <string>\t\tuse display connection.\n"
               "  -rc <string>\t\t\tuse alternate resource file.\n"
               "  -menu <string>\t\tuse alternate menu file.\n"
@@ -77,8 +77,8 @@ static void showHelp(int exitval) {
               "Compile time options:\n"
               "  Debugging:\t\t\t%s\n"
               "  Shape:\t\t\t%s\n"
-              "  Slit:\t\t\t\t%s\n"
-              "  Event Clobbering:\t\t%s\n"
+              "  Xft:\t\t\t\t%s\n"
+              "  Xinerama:\t\t\t%s\n"
               "  8bpp Ordered Dithering:\t%s\n\n"),
 #ifdef    DEBUG
          i18n(CommonSet, CommonYes, "yes"),
@@ -92,17 +92,17 @@ static void showHelp(int exitval) {
          i18n(CommonSet, CommonNo, "no"),
 #endif // SHAPE
 
-#ifdef    SLIT
+#ifdef    XFT
          i18n(CommonSet, CommonYes, "yes"),
-#else // !SLIT
+#else // !XFT
          i18n(CommonSet, CommonNo, "no"),
-#endif // SLIT
+#endif // XFT
 
-#ifndef   NOCLOBBER
+#ifdef    XINERAMA
          i18n(CommonSet, CommonYes, "yes"),
-#else // !NOCLOBBER
+#else // !XINERAMA
          i18n(CommonSet, CommonNo, "no"),
-#endif // NOCLOBBER
+#endif // XINERAMA
 
 #ifdef    ORDEREDPSEUDO
          i18n(CommonSet, CommonYes, "yes")
@@ -119,7 +119,7 @@ int main(int argc, char **argv) {
   char *rc_file = (char *) 0;
   char *menu_file = (char *) 0;
 
-  i18n.openCatalog("blackbox.cat");
+  i18n.openCatalog("openbox.cat");
 
   for (int i = 1; i < argc; ++i) {
     if (! strcmp(argv[i], "-rc")) {
@@ -169,8 +169,9 @@ int main(int argc, char **argv) {
       }
     } else if (! strcmp(argv[i], "-version")) {
       // print current version string
-      printf("Blackbox %s : (c) 2001 - 2002 Sean 'Shaleh' Perry\n",
-             "\t\t\t   1997 - 2000 Brad Hughes\n"
+      printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
+             "                    2001 - 2002 Sean 'Shaleh' Perry\n"
+             "                    1997 - 2000, 2002 Brad Hughes\n\n",
              __openbox_version);
 
       ::exit(0);