sync with bb-cvs.

Add option in config menu for disabling mouse input with scroll lock.
Remove compile-time flag for event clobbering since this solves that problem for now.

23 files changed, 19 insertions, 42 deletions

diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m
index 16279d94..5f6bc1af 100644
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@ -20,6 +20,8 @@ $ #WindowToWindowSnap
 # Window-To-Window Snapping
 $ #WindowCornerSnap
 # Window Corner Snapping
+$ #DisableBindings
+# Disable Mouse with Scroll Lock
 $ #HideToolbar
 # Hide Toolbar
 $ #ClickToFocus
diff --git a/nls/C/main.m b/nls/C/main.m
index acc29ec4..79474952 100644
--- a/nls/C/main.m
+++ b/nls/C/main.m
@@ -21,6 +21,4 @@ $ #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/Configmenu.m b/nls/da_DK/Configmenu.m
index a8ce6715..1e18a2e3 100644
--- a/nls/da_DK/Configmenu.m
+++ b/nls/da_DK/Configmenu.m
@@ -16,6 +16,8 @@ $ #FocusNew
 # Fokus nyt vindue
 $ #FocusLast
 # Fokus vindue ved skrivebords ændring
+$ #DisableBindings
+# Deaktiver tastebindinger med Scroll Lock
 $ #ClickToFocus
 # Klik for fokus
 $ #SloppyFocus
diff --git a/nls/da_DK/main.m b/nls/da_DK/main.m
index 0089ffab..e95a8243 100644
--- a/nls/da_DK/main.m
+++ b/nls/da_DK/main.m
@@ -21,6 +21,4 @@ $ #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 92d83123..41cfd572 100644
--- a/nls/de_DE/main.m
+++ b/nls/de_DE/main.m
@@ -21,6 +21,4 @@ $ #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 c314be9f..bf9d4b61 100644
--- a/nls/es_ES/main.m
+++ b/nls/es_ES/main.m
@@ -21,6 +21,4 @@ $ #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 7115f7af..4ca75cd6 100644
--- a/nls/et_EE/main.m
+++ b/nls/et_EE/main.m
@@ -21,6 +21,4 @@ $ #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 8c36b82f..f33f2f13 100644
--- a/nls/fr_FR/main.m
+++ b/nls/fr_FR/main.m
@@ -21,6 +21,4 @@ $ #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 da240973..bc622345 100644
--- a/nls/hu_HU/main.m
+++ b/nls/hu_HU/main.m
@@ -21,6 +21,4 @@ $ #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 23fe6a8c..b63b7371 100644
--- a/nls/it_IT/main.m
+++ b/nls/it_IT/main.m
@@ -21,6 +21,4 @@ $ #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 91ad47a7..63532de4 100644
--- a/nls/ja_JP/main.m
+++ b/nls/ja_JP/main.m
@@ -21,6 +21,4 @@ $ #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/ko_KR/main.m b/nls/ko_KR/main.m
index b8d2baf6..65206ed2 100644
--- a/nls/ko_KR/main.m
+++ b/nls/ko_KR/main.m
@@ -2,13 +2,16 @@ $set 14 #main
 
 $ #RCRequiresArg
 # error: '-rc' requires an argument\n
+$ #MENURequiresArg
+# error: '-menu' requires an argument\n
 $ #DISPLAYRequiresArg
 # error: '-display' requires an argument\n
 $ #WarnDisplaySet
 # warning: could not set environment variable 'DISPLAY'\n
 $ #Usage
-# 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\
   -version\t\t\tdisplay version and exit.\n\
diff --git a/nls/nl_NL/main.m b/nls/nl_NL/main.m
index d6d4fc95..010049d3 100644
--- a/nls/nl_NL/main.m
+++ b/nls/nl_NL/main.m
@@ -21,6 +21,4 @@ $ #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/no_NO/main.m b/nls/no_NO/main.m
index 60436986..f4e073fa 100644
--- a/nls/no_NO/main.m
+++ b/nls/no_NO/main.m
@@ -2,13 +2,16 @@ $set 14 #main
 
 $ #RCRequiresArg
 # feil: '-rc' krever et argument\n
+$ #MENURequiresArg
+# feil: '-menu' krever et argument\n
 $ #DISPLAYRequiresArg
 # feil: '-display' krever et argument\n
 $ #WarnDisplaySet
 # advarsel: kunne ikke sette 'DISPLAY' miljøvariabelen\n
 $ #Usage
-# 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 <streng>\t\tbruk skjermtilkobling.\n\
   -rc <streng>\t\t\tbrug alternativ ressursfil.\n\
   -version\t\t\tvis versjonsnummeret og avslutt.\n\
diff --git a/nls/pt_BR/main.m b/nls/pt_BR/main.m
index 45b12bb1..0946aeed 100644
--- a/nls/pt_BR/main.m
+++ b/nls/pt_BR/main.m
@@ -21,6 +21,4 @@ $ #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/ro_RO/main.m b/nls/ro_RO/main.m
index b5a40e5b..9babaaec 100644
--- a/nls/ro_RO/main.m
+++ b/nls/ro_RO/main.m
@@ -2,13 +2,16 @@ $set 14 #main
 
 $ #RCRequiresArg
 # eroare: '-rc' necesita inca un parametru\n
+$ #MENURequiresArg
+# eroare: '-menu' necesita inca un parametru\n
 $ #DISPLAYRequiresArg
 # eroare: '-display' necesita inca un parametru\n
 $ #WarnDisplaySet
 # atentionare: nu am putut crea variabila de mediu 'DISPLAY'\n
 $ #Usage
-# 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 <sir>\t\tconexiunea la ecran.\n\
   -rc <sir>\t\t\tfisier de configurare.\n\
   -version\t\t\tafiseaza versiunea.\n\
diff --git a/nls/ru_RU/main.m b/nls/ru_RU/main.m
index b9e32f0d..c3dcf324 100644
--- a/nls/ru_RU/main.m
+++ b/nls/ru_RU/main.m
@@ -21,6 +21,4 @@ $ #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 c77a4ab4..c24ddb91 100644
--- a/nls/sl_SI/main.m
+++ b/nls/sl_SI/main.m
@@ -21,6 +21,4 @@ $ #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 81bdd1bb..98ba3512 100644
--- a/nls/sv_SE/main.m
+++ b/nls/sv_SE/main.m
@@ -21,6 +21,4 @@ $ #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 f382efb4..18bef84d 100644
--- a/nls/tr_TR/main.m
+++ b/nls/tr_TR/main.m
@@ -21,6 +21,4 @@ $ #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 9e5b1a39..7132dd7c 100644
--- a/nls/uk_UA/main.m
+++ b/nls/uk_UA/main.m
@@ -22,6 +22,4 @@ $ #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 f1b2d3b9..142e0042 100644
--- a/nls/zh_CN/main.m
+++ b/nls/zh_CN/main.m
@@ -21,6 +21,4 @@ $ #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 acc29ec4..79474952 100644
--- a/nls/zh_TW/main.m
+++ b/nls/zh_TW/main.m
@@ -21,6 +21,4 @@ $ #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