From ca5b573f6325870c16966df1f0bb989acd6326ae Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 25 May 2002 02:58:51 +0000
Subject: [PATCH] reindent the help/usage message

---
 nls/C/main.m     |  4 +++-
 nls/da_DK/main.m |  4 +++-
 nls/de_DE/main.m |  4 +++-
 nls/es_ES/main.m |  2 ++
 nls/et_EE/main.m |  4 +++-
 nls/fr_FR/main.m |  4 +++-
 nls/hu_HU/main.m |  4 +++-
 nls/it_IT/main.m |  4 +++-
 nls/ja_JP/main.m |  4 +++-
 nls/nl_NL/main.m |  2 ++
 nls/pt_BR/main.m |  4 +++-
 nls/ru_RU/main.m |  4 +++-
 nls/sl_SI/main.m |  4 +++-
 nls/sv_SE/main.m |  4 +++-
 nls/tr_TR/main.m |  4 +++-
 nls/uk_UA/main.m |  4 +++-
 nls/zh_CN/main.m |  4 +++-
 nls/zh_TW/main.m |  4 +++-
 src/main.cc      | 21 ++++++++++++++++++---
 19 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/nls/C/main.m b/nls/C/main.m
index b6bb0678..2cf3a75f 100644
--- a/nls/C/main.m
+++ b/nls/C/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 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\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\tdisplay version and exit.\n\
   -help\t\t\t\tdisplay this help text and exit.\n\n
 $ #CompileOptions
 # 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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/da_DK/main.m b/nls/da_DK/main.m
index 34a3e395..d8ebe16b 100644
--- a/nls/da_DK/main.m
+++ b/nls/da_DK/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tbrug skærm tilslutning.\n\
   -rc <string>\t\t\tbrug alternativ resource fil.\n\
-  -menu <string>\t\t\tbrug alternativ menu fil.\n\
+  -menu <string>\t\tbrug alternativ menu fil.\n\
   -version\t\t\tvis versionsnummer og afslut.\n\
   -help\t\t\t\tvis denne hjælp og afslut.\n\n
 $ #CompileOptions
 # Kompileret med:\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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/de_DE/main.m b/nls/de_DE/main.m
index 1e028ea0..39f22e01 100644
--- a/nls/de_DE/main.m
+++ b/nls/de_DE/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tDisplay Verbindung.\n\
   -rc <string>\t\t\talternative Konfigurationsdatei.\n\
-  -menu <string>\t\t\talternate menu file.\n\
+  -menu <string>\t\talternate menu file.\n\
   -version\t\t\tzeige Versionsnummer und Beendung.\n\
   -help\t\t\t\tzeige diesen Hilfstext und Beendung.\n\n
 $ #CompileOptions
 # Optionen zum Kompilationszeitpunkt:\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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/es_ES/main.m b/nls/es_ES/main.m
index ee81f7db..8807fdcf 100644
--- a/nls/es_ES/main.m
+++ b/nls/es_ES/main.m
@@ -20,4 +20,6 @@ $ #CompileOptions
 # Opciones durante la compilación:\n\
   Información extra para depuración:               %s\n\
   Forma:                                           %s\n\
+  Slit:                                            %s\n\
+  Event Clobbering:                                %s\n\
   8bpp simulación ordenada de colores en imágenes: %s\n\n
diff --git a/nls/et_EE/main.m b/nls/et_EE/main.m
index 885b415f..b4012369 100644
--- a/nls/et_EE/main.m
+++ b/nls/et_EE/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tkasuta displei ühendust.\n\
   -rc <string>\t\t\tkasuta alternatiivseid resursse.\n\
-  -menu <string>\t\t\tkasuta alternatiivseid menu.\n\
+  -menu <string>\t\tkasuta alternatiivseid menu.\n\
   -version\t\t\tnäita versiooninumber ja välju.\n\
   -help\t\t\t\tnäita seda abiteksti ja välju.\n\n
 $ #CompileOptions
 # Kompileerimisoptsioonid:\n\
   Debuggimine\t\t\t%s\n\
   Kuju:\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp määratud teravustamine:\t%s\n\n
diff --git a/nls/fr_FR/main.m b/nls/fr_FR/main.m
index 034f3578..a1e73d3c 100644
--- a/nls/fr_FR/main.m
+++ b/nls/fr_FR/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000 Brad Hughes\n\n\
   -display <chaîne>\t\tutilise la connexion à l'affichage.\n\
   -rc <chaîne>\t\t\tutilise un autre fichier de configuration.\n\
-  -menu <chaîne>\t\t\tutilise un autre fichier de menu.\n\
+  -menu <chaîne>\t\tutilise un autre fichier de menu.\n\
   -version\t\t\taffiche la version et quitte.\n\
   -help\t\t\t\taffiche ce texte d'aide et quitte.\n\n
 $ #CompileOptions
 # Options de compilation:\n\
   Debugage\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp Lissage ordonné:\t%s\n\n
diff --git a/nls/hu_HU/main.m b/nls/hu_HU/main.m
index 79bc33d7..8a403d68 100644
--- a/nls/hu_HU/main.m
+++ b/nls/hu_HU/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000 Brad Hughes\n\n\
   -display <string>\t\thasználandó kijelzõ\n\
   -rc <string>\t\t\tválasztható konfigurációs file.\n\
-  -menu <string>\t\t\tválasztható menu file.\n\
+  -menu <string>\t\tválasztható menu file.\n\
   -version\t\t\tverziószám kijelzése és kilépés.\n\
   -help\t\t\t\tsúgóképernyõ mutatása és kilépés.\n\n
 $ #CompileOptions
 # Fordításnál állítható lehetõségek:\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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/it_IT/main.m b/nls/it_IT/main.m
index 5ced55df..adf5a13b 100644
--- a/nls/it_IT/main.m
+++ b/nls/it_IT/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tusa connessione display.\n\
   -rc <string>\t\t\tusa un file risorsa alternativo.\n\
-  -menu <string>\t\t\tusa un file menu alternativo.\n\
+  -menu <string>\t\tusa un file menu alternativo.\n\
   -version\t\t\tmostra la versione e esci.\n\
   -help\t\t\t\tmostra questo aiuto e esci.\n\n
 $ #CompileOptions
 # Opzioni in fase di compilazione:\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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/ja_JP/main.m b/nls/ja_JP/main.m
index ba016e67..094846c8 100644
--- a/nls/ja_JP/main.m
+++ b/nls/ja_JP/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\t»ØÄê¥Ç¥£¥¹¥×¥ì¥¤¤ËÀܳ\n\
   -rc <string>\t\t\tÂå¤ê¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò»ÈÍÑ\n\
-  -menu <string>\t\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\t¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¡¢½ªÎ»\n\
   -help\t\t\t\t¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¡¢½ªÎ»\n\n
 $ #CompileOptions
 # ¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:\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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/nl_NL/main.m b/nls/nl_NL/main.m
index 64d7b64e..1b1076f7 100644
--- a/nls/nl_NL/main.m
+++ b/nls/nl_NL/main.m
@@ -20,4 +20,6 @@ $ #CompileOptions
 # Gecompileerd met instellingen:\n\
   Debugging:               %s\n\
   Shape:                   %s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp Ordered Dithering:  %s\n\n
diff --git a/nls/pt_BR/main.m b/nls/pt_BR/main.m
index 5b7347c8..2b26894d 100644
--- a/nls/pt_BR/main.m
+++ b/nls/pt_BR/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tusar conexão com o display.\n\
   -rc <string>\t\t\tusar arquivo alternativo de recursos.\n\
-  -menu <string>\t\t\tusar arquivo alternativo de menu.\n\
+  -menu <string>\t\tusar arquivo alternativo de menu.\n\
   -version\t\t\tmostrar versao e sair.\n\
   -help\t\t\t\tmostrar esta ajuda e sair.\n\n
 $ #CompileOptions
 # Opções em tempo de compilação:\n\
   Informações extras para problemas:\t\t\t%s\n\
   Forma:\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp Simulação ordenada de cores em imagens:\t%s\n\n
diff --git a/nls/ru_RU/main.m b/nls/ru_RU/main.m
index 3df8e098..501e53e6 100644
--- a/nls/ru_RU/main.m
+++ b/nls/ru_RU/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000 Brad Hughes\n\n\
   -display <string>\t\tÉÓÐÏÌØÚÏ×ÁÔØ ÚÁÄÁÎÎÙÊ ÄÉÓÐÌÅÊ.\n\
   -rc <string>\t\t\tÉÓÐÏÌØÚÏ×ÁÔØ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ ÆÁÊÌ ÒÅÓÕÒÓÏ×.\n\
-  -menu <string>\t\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\t×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n\
   -help\t\t\t\t×Ù×ÅÓÔÉ ÜÔÕ ÐÏÄÓËÁÚËÕ É ×ÙÊÔÉ.\n\n
 $ #CompileOptions
 # 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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/sl_SI/main.m b/nls/sl_SI/main.m
index 0bb36fca..fa0ead7c 100644
--- a/nls/sl_SI/main.m
+++ b/nls/sl_SI/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tuporabi prikazovalnik.\n\
   -rc <string>\t\t\tuporabi nadomestno datoteko z viri.\n\
-  -menu <string>\t\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\tprika¾i oznako razlièice in konèaj.\n\
   -help\t\t\t\prika¾i ta navodila in konèaj.\n\n
 $ #CompileOptions
 # Izbire pri prevajanju:\n\
   Razhro¹èevanje\t\t\t%s\n\
   Oblika:\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   Osembitno stresanje barv:\t%s\n\n
diff --git a/nls/sv_SE/main.m b/nls/sv_SE/main.m
index 573d3d73..d255e480 100644
--- a/nls/sv_SE/main.m
+++ b/nls/sv_SE/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tanvänd skärmanslutning.\n\
   -rc <string>\t\t\tanvänd alternativ resursfil.\n\
-  -menu <string>\t\t\tanvänd alternativ menufil.\n\
+  -menu <string>\t\tanvänd alternativ menufil.\n\
   -version\t\t\tvisa version och avsluta.\n\
   -help\t\t\t\tvisa denna hjälptext och avsluta.\n\n
 $ #CompileOptions
 # Kompilerad med:\n\
   Avlusning\t\t\t%s\n\
   Form:\t\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp ordnad dithering:\t%s\n\n
diff --git a/nls/tr_TR/main.m b/nls/tr_TR/main.m
index ca348b61..116a459a 100644
--- a/nls/tr_TR/main.m
+++ b/nls/tr_TR/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <metin>\t\tekraný kullan.\n\
   -rc <metin>\t\t\tbaþka bir ayarlama dosyasýný kullan.\n\
-  -menu <metin>\t\t\tuse alternate menu file.\n\
+  -menu <metin>\t\tuse alternate menu file.\n\
   -version\t\t\tnesil bilgisini gösterir ve çýkar.\n\
   -help\t\t\t\tbu yardým iletisini gösterir ve çýkar.\n\n
 $ #CompileOptions
 # Denetleme seçenekleri :\n\
   Bilgilendirme\t\t\t%s\n\
   Gölgeleme:\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   R8b'e göre týzla:\t%s\n\n
diff --git a/nls/uk_UA/main.m b/nls/uk_UA/main.m
index 53bc789c..3834d665 100644
--- a/nls/uk_UA/main.m
+++ b/nls/uk_UA/main.m
@@ -12,7 +12,7 @@ $ #Usage
 # Blackbox %s: (c) 1997 - 2000 Brad Hughes\n\n\
   -display <string>\t\tÏÂÓÌÕÇÏ×Õ×ÁÔÉ ×ËÁÚÁÎÉÊ ÄÉÓÐÌÅÊ.\n\
   -rc <string>\t\t\t×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÆÁÊÌ ÒÅÓÕÒÓ¦×.\n\
-  -menu <string>\t\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\t×É×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓ¦§ ¦ ×ÉÊÔÉ.\n\
   -help\t\t\t\t×É×ÅÓÔÉ ÃÀ ЦÄËÁÚËÕ ¦ ×ÉÊÔÉ.\n\n
 $ #CompileOptions
@@ -20,4 +20,6 @@ $ #CompileOptions
   Debugging\t\t\t%s\n\
   Interlacing:\t\t\t%s\n\
   Shape:\t\t\t%s\n\
+  Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/zh_CN/main.m b/nls/zh_CN/main.m
index 6e0310f3..44878ec2 100644
--- a/nls/zh_CN/main.m
+++ b/nls/zh_CN/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tʹÓÃÏÔʾÁ¬½Ó.\n\
   -rc <string>\t\t\tʹÓÃÆäËûµÄ×ÊÔ´Îļþ.\n\
-  -menu <string>\t\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\tÏÔʾ°æ±¾.\n\
   -help\t\t\t\tÏÔʾÕâ¸ö°ïÖú.\n\n
 $ #CompileOptions
 # ±àÒëÑ¡Ïî:\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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/zh_TW/main.m b/nls/zh_TW/main.m
index b6bb0678..2cf3a75f 100644
--- a/nls/zh_TW/main.m
+++ b/nls/zh_TW/main.m
@@ -13,11 +13,13 @@ $ #Usage
   \t\t\t 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\t\tuse alternate menu file.\n\
+  -menu <string>\t\tuse alternate menu file.\n\
   -version\t\t\tdisplay version and exit.\n\
   -help\t\t\t\tdisplay this help text and exit.\n\n
 $ #CompileOptions
 # 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\
   8bpp Ordered Dithering:\t%s\n\n
diff --git a/src/main.cc b/src/main.cc
index e213c808..6b563a3f 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -61,11 +61,12 @@ I18n i18n; // initialized in main
 static void showHelp(int exitval) {
   // print program usage and command line options
   printf(i18n(mainSet, mainUsage,
-              "Blackbox %s : (c) 2001 - 2002 Sean 'Shaleh' Perry\n"
-              "\t\t\t  1997 - 2000, 2002 Brad Hughes\n\n"
+              "Openbox %s : (c) 2002 - 2002 Ben Jansens\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\t\tuse alternate menu file.\n"
+              "  -menu <string>\t\tuse alternate menu file.\n"
               "  -version\t\t\tdisplay version and exit.\n"
               "  -help\t\t\t\tdisplay this help text and exit.\n\n"),
          __openbox_version);
@@ -76,6 +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"
               "  8bpp Ordered Dithering:\t%s\n\n"),
 #ifdef    DEBUG
          i18n(CommonSet, CommonYes, "yes"),
@@ -89,6 +92,18 @@ static void showHelp(int exitval) {
          i18n(CommonSet, CommonNo, "no"),
 #endif // SHAPE
 
+#ifdef    SLIT
+         i18n(CommonSet, CommonYes, "yes"),
+#else // !SLIT
+         i18n(CommonSet, CommonNo, "no"),
+#endif // SLIT
+
+#ifndef   NOCLOBBER
+         i18n(CommonSet, CommonYes, "yes"),
+#else // !NOCLOBBER
+         i18n(CommonSet, CommonNo, "no"),
+#endif // NOCLOBBER
+
 #ifdef    ORDEREDPSEUDO
          i18n(CommonSet, CommonYes, "yes")
 #else // !ORDEREDPSEUDO
-- 
2.45.2