From: Dana Jansens <danakj@orodu.net>
Date: Sat, 31 Aug 2002 06:15:07 +0000 (+0000)
Subject: sync with the 2.0 branch
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=923c381dc177aa64b1da847ae6a27bff19ec817c;p=chaz%2Fopenbox

sync with the 2.0 branch
---

diff --git a/AUTHORS b/AUTHORS
index 56693f07..44714553 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,37 +49,42 @@ Contributors:
 
 nls contributors:
 	Mads Martin Joergensen <mmj@suse.de>
-	 - Danish (da_DK) nls support
+	 - Danish (da_DK)
 	Jan Schaumann <jschauma@netmeister.org>
-	 - German (de_DE) nls support
+	 - German (de_DE)
 	Adriano Varoli Piazza <adrianovaroli@redusers.com>
-	 - Spanish nls support (submitted as es_AR, ES and MX)
+	 - Spanish (submitted as es_AR, ES and MX)
 	Duret Bertrand <bertrand.duret@libertysurf.fr>
-	 - updated French (fr_FR) nls and added French man pages
+	 - updated French (fr_FR)
 	Bodnar Istvan <piggy@dub.hu>
-	 - Hungarian (hu_HU) support
+	 - Hungarian (hu_HU)
 	Luca Marrazzo <marra.luca@libero.it>
-	 - Italian (it_IT) nls support
+	 - Italian (it_IT)
 	SATO Satoru <ssato@adachi.ne.jp>
-	 - Japanese (ja_JP) nls support and man pages
+	 - Japanese (ja_JP)
 	Hyun Suk Noh <tzesti@users.sourceforge.net>
-	 - Korean (ko_KR) nls support
+	 - Korean (ko_KR)
  	Wilbert Berendsen <wbsoft@xs4all.nl>
-	 - man pages and Dutch (nl_NL) nls support
+	 - Dutch (nl_NL)
 	Øyvind Stegard <oyvind.stegard@bluezone.no>
-	 - Norwegian (no_NO) nls support
-    Wojciech Krygier <wkrygie@kis.p.lodz.pl>
-     - Polish (pl_PL) nls support
+	 - Norwegian (no_NO)
+	Wojciech Krygier <wkrygie@kis.p.lodz.pl>
+	 - Polish (pl_PL)
 	Ciprian Popovici <ciprian@zuavra.net>
-	 - Romanian (ro_RO) nls support
+	 - Romanian (ro_RO)
+	Michail A. Rusinov <one@da.ru>
+	Dmitriy N. Rusinov <rusinov@udm.net>
+	 - Russian (ru_RU)
+	Marian Andre <andre@intrak.sk>
+	 - Slovakian (sk_SK)
 	Ales Kosir <ales.kosir@telemach.net>
-	 - Slovenian man pages and (sl_SI) nls support
+	 - Slovenian (sl_SI)
 	Volodymyr M. Lisivka <lvm@mystery.lviv.net>
-	 - Ukrainian (uk_UA) nls support
+	 - Ukrainian (uk_UA)
 	Wang Tiejun <wtj@dept3.buaa.edu.cn>
-	 - Chinese (zh_CN) nls support
+	 - Chinese (zh_CN)
 	Moto Chen <han_yi_chen@yahoo.com.tw>
-	 - Taiwan Chinese (zh_TW) support
+	 - Taiwan Chinese (zh_TW)
 
 Past Contributors:
         Jeffrey Sean Connell <ankh@canuck.gen.nz>
diff --git a/configure.in b/configure.in
index 2093d4e0..190c1d69 100644
--- a/configure.in
+++ b/configure.in
@@ -292,6 +292,7 @@ nls/nl_NL/Makefile
 nls/pt_BR/Makefile
 nls/ro_RO/Makefile
 nls/ru_RU/Makefile
+nls/sk_SK/Makefile
 nls/sl_SI/Makefile
 nls/sv_SE/Makefile
 nls/tr_TR/Makefile
diff --git a/doc/bsetbg.1 b/doc/bsetbg.1
index 9dd08389..a233325f 100644
--- a/doc/bsetbg.1
+++ b/doc/bsetbg.1
@@ -22,7 +22,7 @@ and to a flexible variety of third-party applications that it uses when handling
 \fIimage\fR is centered on the desktop.
 .TP
 \fB\-e\fR, \fB\-exec\fR \fIprogram\fR \fIoptions\fR \fIfallback\-\fIarg\fR \fIimage\fR
-This option tells \fBbsetbg\fR to run a seperate command by executing \fIprogram\fR with 
+This option tells \fBbsetbg\fR to run a separate command by executing \fIprogram\fR with 
 \fIoptions\fR, where \fIoptions\fR are arguments to \fIprogram\fR.
 
 If a \fIfallback\-arg\fR is supplied (\fB\-full\fR, \fB\-tile\fR, or \fB\-center\fR
@@ -44,6 +44,14 @@ Output a list of default configuration values, suitable for redirecting into
 \fI~/.bsetbgrc\fR. Any arguments that are supplied will be considered applications 
 to search for in the system path, overriding \fBbsetbg\fR's internal defaults.
 .TP
+\fB\-app\fR \fIimageApp\fR
+Use this flag to specify which image application to use. This
+application may be one of the pre-defined list or any application
+capable of displaying an image on the root window. This flag may be
+used in conjunction with passing application specific  parameters to
+the application, in which
+case they should be enclosed in double quotes.
+.TP
 \fB\-v\fR, \fB\-version\fR
 Output version number.
 .TP
@@ -118,7 +126,11 @@ An example of the \fB-exec\fR argument:
 
 An example in which bsetbg creates a configuration file using xv and qiv:
 
-	bsetbg -g xv qiv > ~/.bsetbgrc
+    bsetbg -g xv qiv > ~/.bsetbgrc
+
+An example of the use of the \fB-app\fR argument:
+
+    bsetbg  -app qiv "-o rgb:d6/c5/a2 -x" -c foo.png
 
 .SH AUTHOR
 The author of
diff --git a/nls/C/bsetroot.m b/nls/C/bsetroot.m
index ddd7be6a..d6350fe2 100644
--- a/nls/C/bsetroot.m
+++ b/nls/C/bsetroot.m
@@ -4,7 +4,8 @@ $ #MustSpecify
 # %s: error: must specify one of: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
-  -display <string>        display connection\n\
+	   (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
+  -display <string>        use display connection\n\
   -mod <x> <y>             modula pattern\n\
   -foreground, -fg <color> modula foreground color\n\
   -background, -bg <color> modula background color\n\n\
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 9ac9103f..7dccfc72 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -2,7 +2,8 @@
 
 NLSTEST = @NLS@
 SUBDIRS = C da_DK de_DE es_AR es_ES et_EE fr_FR hu_HU it_IT ja_JP ko_KR nl_NL \
-	no_NO pl_PL pt_BR ro_RO ru_RU sl_SI sv_SE tr_TR uk_UA zh_CN zh_TW
+	no_NO pl_PL pt_BR ro_RO ru_RU sk_SK sl_SI sv_SE tr_TR uk_UA \
+	zh_CN zh_TW
 MAINTAINERCLEANFILES = Makefile.in blackbox-nls.hh
 DISTCLEANFILES = blackbox-nls.hh
 
diff --git a/nls/da_DK/bsetroot.m b/nls/da_DK/bsetroot.m
index 6c94a25f..ff60ebd1 100644
--- a/nls/da_DK/bsetroot.m
+++ b/nls/da_DK/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: fejl: specificér en af følgende: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        skærmtilslutning\n\
   -mod <x> <y>             modula mønster\n\
   -foreground, -fg <color> modula foregrundsfarve\n\
diff --git a/nls/de_DE/bsetroot.m b/nls/de_DE/bsetroot.m
index a692511b..c158e145 100644
--- a/nls/de_DE/bsetroot.m
+++ b/nls/de_DE/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: error: must specify one of: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        Display Verbindung\n\
   -mod <x> <y>             Modula Muster\n\
   -foreground, -fg <color> Modula Vordergrund Farbe\n\
diff --git a/nls/es_AR/bsetroot.m b/nls/es_AR/bsetroot.m
index 253757b0..e002df0f 100644
--- a/nls/es_AR/bsetroot.m
+++ b/nls/es_AR/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: error: debe especificarse uno entre: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        conexión al display\n\
   -mod <x> <y>             diseño de modula\n\
   -foreground, -fg <color> color de primer plano de modula\n\
diff --git a/nls/es_ES/bsetroot.m b/nls/es_ES/bsetroot.m
index f4d119d3..1909d7c1 100644
--- a/nls/es_ES/bsetroot.m
+++ b/nls/es_ES/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: error: debe especificarse uno entre: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        conexión de despliegue\n\
   -mod <x> <y>             diseño de modula\n\
   -foreground, -fg <color> color de primer plano de modula\n\
diff --git a/nls/et_EE/bsetroot.m b/nls/et_EE/bsetroot.m
index 110176c8..51979dd5 100644
--- a/nls/et_EE/bsetroot.m
+++ b/nls/et_EE/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: viga: pead määratlema ühe järgnevaist: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        displei ühendus\n\
   -mod <x> <y>             moodula tapeet\n\
   -foreground, -fg <color> esiplaani värvi moodula\n\
diff --git a/nls/fr_FR/bsetroot.m b/nls/fr_FR/bsetroot.m
index 6e26cd75..c8b9db6a 100644
--- a/nls/fr_FR/bsetroot.m
+++ b/nls/fr_FR/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: Erreur: il faut préciser : -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <chaîne>        	connexion à l'affichage\n\
   -mod <x> <y>             	motif\n\
   -foreground, -fg <couleur> 	couleur d'avant plan\n\
diff --git a/nls/hu_HU/bsetroot.m b/nls/hu_HU/bsetroot.m
index ed19810f..a24e8606 100644
--- a/nls/hu_HU/bsetroot.m
+++ b/nls/hu_HU/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: hiba: kötelezõ megadni egy kapcsolót: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        használandó kijelzõ\n\
   -mod <x> <y>             modula minta\n\
   -foreground, -fg <color> modula elõtér színe\n\
diff --git a/nls/it_IT/bsetroot.m b/nls/it_IT/bsetroot.m
index 3beadcfc..50b227ab 100644
--- a/nls/it_IT/bsetroot.m
+++ b/nls/it_IT/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: errore: deve essere specificato uno dei seguenti: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        connessione display\n\
   -mod <x> <y>             modello di modula\n\
   -foreground, -fg <color> colore di primo piano di modula\n\
diff --git a/nls/ja_JP/bsetroot.m b/nls/ja_JP/bsetroot.m
index b7d78dd7..93349929 100644
--- a/nls/ja_JP/bsetroot.m
+++ b/nls/ja_JP/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: ¥¨¥é¡¼: ¼¡¤ÎÃ椫¤é°ì¤Ä¤òÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        ¥Ç¥£¥¹¥×¥ì¥¤¤ò»ØÄê\n\
   -mod <x> <y>             ÁȤ߹ç¤ï¤»¥Ñ¥¿¡¼¥ó\n\
   -foreground, -fg <color> ÁȤ߹ç¤ï¤»Á°·Ê¿§\n\
diff --git a/nls/ko_KR/bsetroot.m b/nls/ko_KR/bsetroot.m
index ddd7be6a..a1f78508 100644
--- a/nls/ko_KR/bsetroot.m
+++ b/nls/ko_KR/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: error: must specify one of: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        display connection\n\
   -mod <x> <y>             modula pattern\n\
   -foreground, -fg <color> modula foreground color\n\
diff --git a/nls/nl_NL/bsetroot.m b/nls/nl_NL/bsetroot.m
index accb793d..25c78f13 100644
--- a/nls/nl_NL/bsetroot.m
+++ b/nls/nl_NL/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: fout: een van -solid, -mod, -gradient moet aangegeven worden\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <displaynaam>   display verbinding\n\
   -mod <x> <y>             modula patroon\n\
   -foreground, -fg <kleur> modula voorgrondkleur\n\
diff --git a/nls/no_NO/bsetroot.m b/nls/no_NO/bsetroot.m
index 34c8db3c..4afe57d1 100644
--- a/nls/no_NO/bsetroot.m
+++ b/nls/no_NO/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: feil: én av følgende opsjoner må spesifiseres: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        skjermtilkobling3\n\
   -mod <x> <y>             modula mønster\n\
   -foreground, -fg <color> modula forgrunnsfarge\n\
diff --git a/nls/pl_PL/Image.m b/nls/pl_PL/Image.m
index 1ff1249e..30ad3df7 100644
--- a/nls/pl_PL/Image.m
+++ b/nls/pl_PL/Image.m
@@ -16,7 +16,7 @@ $ #ErrorAllocatingColormap
 $ #ColorAllocFail
 # BImageControl::BImageControl: alokacja koloru %d/%d/%d nieudana\n
 $ #PixmapRelease
-# BImageControl::BImageControl: pixmap cache - zwalniam %d pixmap\n
+# BImageControl::BImageControl: pixmap cache - zwalniam %d pixmap(y)\n
 $ #PixmapCacheLarge
 # BImageControl::renderImage: du¿a pamiêæ cache, wymuszam czyszczenie\n
 $ #ColorParseError
diff --git a/nls/pl_PL/bsetroot.m b/nls/pl_PL/bsetroot.m
index 1eed5827..5972b041 100644
--- a/nls/pl_PL/bsetroot.m
+++ b/nls/pl_PL/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: b³±d: nale¿y u¿yæ jednej z opcji: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        po³±cz z podanym panelem graficznym\n\
   -mod <x> <y>             wspó³czynniki siatki typu modula\n\
   -foreground, -fg <color> kolor siatki\n\
diff --git a/nls/pt_BR/BaseDisplay.m b/nls/pt_BR/BaseDisplay.m
index fbd626ee..e5268a3a 100644
--- a/nls/pt_BR/BaseDisplay.m
+++ b/nls/pt_BR/BaseDisplay.m
@@ -3,14 +3,14 @@ $set 1 #BaseDisplay
 $ #XError
 # %s:  X erro: %s(%d) opcodes %d/%d\n  recurso 0x%lx\n
 $ #SignalCaught
-# %s: recebeido sinal %d\n
+# %s: sinal recebido %d\n
 $ #ShuttingDown
-# desligando\n
+# finalizando\n
 $ #Aborting
-# abortando... gerando arquivo core\n
+# abortando... descarregando memória\n
 $ #XConnectFail
 # BaseDisplay::BaseDisplay: conecção ao servidor X falhou.\n
 $ #CloseOnExecFail
-# BaseDisplay::BaseDisplay: impossivel marcar a conexão ao display como close-on-exec\n
+# BaseDisplay::BaseDisplay: impossível exibir sinal de conexão como fechar-em-execução\n
 $ #BadWindowRemove
-# BaseDisplay::eventLoop(): removendo má janela da trilha de eventos\n
+# BaseDisplay::eventLoop(): removendo janela inválida da lista de eventos\n
diff --git a/nls/pt_BR/Basemenu.m b/nls/pt_BR/Basemenu.m
index 80e56ed3..070d663a 100644
--- a/nls/pt_BR/Basemenu.m
+++ b/nls/pt_BR/Basemenu.m
@@ -1,4 +1,4 @@
 $set 2 #Basemenu
 
 $ #BlackboxMenu
-# Menu Blackbox
+# Menu do Blackbox
diff --git a/nls/pt_BR/Configmenu.m b/nls/pt_BR/Configmenu.m
index 482fac78..89010cb3 100644
--- a/nls/pt_BR/Configmenu.m
+++ b/nls/pt_BR/Configmenu.m
@@ -16,18 +16,22 @@ $ #FocusNew
 # Foco em Novas Janelas
 $ #FocusLast
 # Foco na Ultima Janela Da Area de Trabalho
+$ #DisableBindings
+# Disabilitar Ações com Scroll Lock
 $ #ClickToFocus
-# Foco na Janela Quando Clicada
+# Clicar para Focar
 $ #SloppyFocus
-# Foco na Janela Quando Apontada
+# Apontar para Focar
 $ #AutoRaise
-# Sobrepor Janela Quando Ativa
+# Auto-sobrepor
+$ #ClickRaise
+# Click Raise
 $ #SmartRows
-# Posicionamento em Fila
+# Organizar Rapido (Linha)
 $ #SmartCols
-# Posicionamento em Coluna
+# Organizar Rapido (Coluna)
 $ #Cascade
-# Posicionamento em Cascata
+# Organizar em Cascata
 $ #LeftRight
 # Esquerda para Direita
 $ #RightLeft
diff --git a/nls/pt_BR/Image.m b/nls/pt_BR/Image.m
index 596f097b..e44b8f50 100644
--- a/nls/pt_BR/Image.m
+++ b/nls/pt_BR/Image.m
@@ -9,16 +9,16 @@ $ #UnsupVisual
 $ #ErrorCreatingPixmap
 # BImage::renderPixmap: erro criando pixmap\n
 $ #InvalidColormapSize
-# BImageControl::BImageControl: mapa de cores de tamanho invalido %d (%d/%d/%d) - reduzindo\n
+# BImageControl::BImageControl: tamanho invalido de mapa de cores %d (%d/%d/%d) - reduzindo\n
 $ #ErrorAllocatingColormap
-# BImageControl::BImageControl: erro localizando mapa de cores\n
+# BImageControl::BImageControl: erro determinando mapa de cores\n
 $ #ColorAllocFail
-# BImageControl::BImageControl: falha localizando cor %d/%d/%d\n
+# BImageControl::BImageControl: falha em alocar cor %d/%d/%d\n
 $ #PixmapRelease
-# BImageControl::~BImageControl: reserva de pixmap cheia - liberando %d pixmaps\n
+# BImageControl::~BImageControl: cache de pixmap - liberando pixmaps %d\n
 $ #PixmapCacheLarge
-# BImageControl::renderImage: reserva cheia, forçando limpeza\n
+# BImageControl::renderImage: cache está grande, forçando desalocação\n
 $ #ColorParseError
-# BImageControl::getColor: color parse error: '%s'\n
+# BImageControl::getColor: erro ao analizar cor: '%s'\n
 $ #ColorAllocError
-# BImageControl::getColor: erro localizando cor: '%s'\n
+# BImageControl::getColor: erro ao alocar cor: '%s'\n
diff --git a/nls/pt_BR/Screen.m b/nls/pt_BR/Screen.m
index 6c6c06d8..e71a51aa 100644
--- a/nls/pt_BR/Screen.m
+++ b/nls/pt_BR/Screen.m
@@ -1,7 +1,7 @@
 $set 6 #Screen
 
 $ #AnotherWMRunning
-# BScreen::BScreen: um erro occorreu enquanto chamando o servidor X.\n  \
+# BScreen::BScreen: um erro occorreu enquanto consultava o servidor X.\n  \
 existe outro window menager rodando no display. %s.\n
 $ #ManagingScreen
 # BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n
@@ -18,31 +18,33 @@ $ #Restart
 $ #Exit
 # Sair
 $ #EXECError
-# BScreen::parseMenuFile: [exec] erro, não há indicação definida no menu e/ou comando definido\n
+# BScreen::parseMenuFile: [exec] erro, sem rótulo de menu e/ou comando definido\n
 $ #EXITError
-# BScreen::parseMenuFile: [exit] erro, não há indicação definida no menu\n
+# BScreen::parseMenuFile: [exit] erro, sem rótulo de menu definido\n
 $ #STYLEError
-# BScreen::parseMenuFile: [style] erro, não há indicação de menu e/ou nome de arquivo difinido\n
+# BScreen::parseMenuFile: [style] erro, sem rótulo de menu e/ou nome do arquivo \
+definido\n
 $ #CONFIGError
-# BScreen::parseMenuFile: [config] erro, não há indicação definida no menu\n
+# BScreen::parseMenuFile: [config] erro, sem rótulo de menu definido\n
 $ #INCLUDEError
 # BScreen::parseMenuFile: [include] erro, nome de arquivo não definido\n
 $ #INCLUDEErrorReg
 # BScreen::parseMenuFile: [include] error, '%s' não é um arquivo regular\n
 $ #SUBMENUError
-# BScreen::parseMenuFile: [submenu] erro, não há indicação definida no menu\n
+# BScreen::parseMenuFile: [submenu] erro, sem rótulo de menu definido\n
 $ #RESTARTError
-# BScreen::parseMenuFile: [restart] erro, não há indicação definida no menu\n
+# BScreen::parseMenuFile: [restart] erro, sem rótulo de menu definido\n
 $ #RECONFIGError
-# BScreen::parseMenuFile: [reconfig] erro, não há indicação definida no menu\n
+# BScreen::parseMenuFile: [reconfig] erro, sem rótulo de menu definido\n
 $ #STYLESDIRError
-# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, não há diretorio difinido\n
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, sem diretorio difinido\n
 $ #STYLESDIRErrorNotDir
-# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, '%s' não é um diretorio\n
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, '%s' não é um \
+diretorio\n
 $ #STYLESDIRErrorNoExist
 # BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, '%s' não existe\n
 $ #WORKSPACESError
-# BScreen::parseMenuFile: [workspaces] erro, não há indicação definida no menu\n
+# BScreen::parseMenuFile: [workspaces] erro, sem rótulo de menu definido\n
 $ #PositionLength
 # 0: 0000 x 0: 0000
 $ #PositionFormat
diff --git a/nls/pt_BR/Slit.m b/nls/pt_BR/Slit.m
index 73cff228..e5806d05 100644
--- a/nls/pt_BR/Slit.m
+++ b/nls/pt_BR/Slit.m
@@ -3,6 +3,6 @@ $set 7 #Slit
 $ #SlitTitle
 # Slit
 $ #SlitDirection
-# Direção
+# Direção do Slit
 $ #SlitPlacement
-# Posicionamento
+# Posicionamento do Slit
diff --git a/nls/pt_BR/Toolbar.m b/nls/pt_BR/Toolbar.m
index bf1a77be..a7a91eda 100644
--- a/nls/pt_BR/Toolbar.m
+++ b/nls/pt_BR/Toolbar.m
@@ -15,8 +15,8 @@ $ #NoStrftimeTimeFormatP
 $ #NoStrftimeTimeFormatA
 # a
 $ #ToolbarTitle
-# Toolbar
+# Barra de Ferramenta
 $ #EditWkspcName
-# Renomear Area de Trabalho
+# Editar o nome da area de trabalho corrente
 $ #ToolbarPlacement
-# Posicionamento
+# Posicionamento da Barra de Ferramentas
diff --git a/nls/pt_BR/Window.m b/nls/pt_BR/Window.m
index 0b47ab2c..291b6951 100644
--- a/nls/pt_BR/Window.m
+++ b/nls/pt_BR/Window.m
@@ -6,7 +6,7 @@ $ #Creating
 $ #XGetWindowAttributesFail
 # BlackboxWindow::BlackboxWindow: XGetWindowAttributres falhou\n
 $ #CannotFindScreen
-# BlackboxWindow::BlackboxWindow: impossivel encontrar tela para janela 0x%lx\n
+# BlackboxWindow::BlackboxWindow: impossivel encontrar tela para janela principal 0x%lx\n
 $ #Unnamed
 # Sem Nome
 $ #MapRequest
@@ -14,4 +14,4 @@ $ #MapRequest
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() para 0x%lx\n
 $ #ReparentNotify
-# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx para 0x%lx\n
diff --git a/nls/pt_BR/Windowmenu.m b/nls/pt_BR/Windowmenu.m
index fe81d4f9..36630e44 100644
--- a/nls/pt_BR/Windowmenu.m
+++ b/nls/pt_BR/Windowmenu.m
@@ -3,18 +3,18 @@ $set 10 #Windowmenu
 $ #SendTo
 # Enviar Para ...
 $ #Shade
-# Encolher
+# Ocultar
 $ #Iconify
 # Minimizar
 $ #Maximize
 # Maximizar
 $ #Raise
-# Focalizar
+# Trazer pra Frente
 $ #Lower
-# Desfocalizar
+# Levar pra Traz
 $ #Stick
 # Sempre Visivel
 $ #KillClient
-# Kill Cliente
+# Matar Cliente
 $ #Close
 # Fechar
diff --git a/nls/pt_BR/blackbox.m b/nls/pt_BR/blackbox.m
index 136cb0e6..dac6ce8b 100644
--- a/nls/pt_BR/blackbox.m
+++ b/nls/pt_BR/blackbox.m
@@ -1,6 +1,6 @@
 $set 13 #blackbox
 
 $ #NoManagableScreens
-# Blackbox::Blackbox: não foram encontradas telas administraveis, abortando..\n
+# Blackbox::Blackbox: não encontradas telas gerenciaveis, abortando..\n
 $ #MapRequest
 # Blackbox::process_event: MapRequest para 0x%lx\n
diff --git a/nls/pt_BR/bsetroot.m b/nls/pt_BR/bsetroot.m
index c63f994d..705c0a0c 100644
--- a/nls/pt_BR/bsetroot.m
+++ b/nls/pt_BR/bsetroot.m
@@ -1,16 +1,16 @@
 $set 16 #bsetroot
 
 $ #MustSpecify
-# %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n
+# %s: erro: necessario especificar uma das opções: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
-  -display <string>        conexão com display\n\
-  -mod <x> <y>             modula pattern\n\
-  -foreground, -fg <color> modula foreground color\n\
-  -background, -bg <color> modula background color\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
+  -display <string>        conexão com video\n\
+  -mod <x> <y>             modula padrão\n\
+  -foreground, -fg <color> modula cor do primeiro plano\n\
+  -background, -bg <color> modula cor do segundo plano\n\
   -gradient <texture>      textura gradiente\n\
   -from <color>            cor de inicio do gradiente\n\
-  -to <color>              com do fim do gradiente\n\n\
-  -solid <color>           cor solida\n\n\
-  -help                    mostra essa ajuda e sai\n
-
+  -to <color>              com do fim do gradiente\n\
+  -solid <color>           cor solida\n\
+  -help                    mostra este texto de ajuda e sai\n
diff --git a/nls/pt_BR/common.m b/nls/pt_BR/common.m
index 45dcd20d..5869d599 100644
--- a/nls/pt_BR/common.m
+++ b/nls/pt_BR/common.m
@@ -13,7 +13,7 @@ $ #DirectionVert
 # Vertical
 
 $ #AlwaysOnTop
-# Sempre Visivel
+# Sempre vísivel
 
 $ #PlacementTitle
 # Posicionamento
@@ -24,12 +24,15 @@ $ #PlacementCenterLeft
 $ #PlacementBottomLeft
 # Em Baixo a Esquerda
 $ #PlacementTopCenter
-# No Alto e no Centro
+# No Alto ao Centro
 $ #PlacementBottomCenter
-# Em Baixo e no Centro
+# Em Baixo ao Centro
 $ #PlacementTopRight
 # No Alto a Direita
 $ #PlacementCenterRight
 # No Meio a Direita
 $ #PlacementBottomRight
 # Em Baixo a Direita
+
+$ #AutoHide
+# Auto-ocultar
diff --git a/nls/pt_BR/main.m b/nls/pt_BR/main.m
index 505493cd..ceace800 100644
--- a/nls/pt_BR/main.m
+++ b/nls/pt_BR/main.m
@@ -15,12 +15,12 @@ $ #Usage
   -display <string>\t\tusar conexão com o display.\n\
   -rc <string>\t\t\tusar arquivo alternativo de recursos.\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
+  -version\t\t\texibe a versao e sair.\n\
+  -help\t\t\t\texibe este texto de ajuda e sair.\n\n
 $ #CompileOptions
 # Opções em tempo de compilação:\n\
-  Informações extras para problemas:\t\t\t%s\n\
+  Depuração:\t\t\t%s\n\
   Forma:\t\t\t%s\n\
   Xft:\t\t\t\t%s\n\
   Xinerama:\t\t\t%s\n\
-  8bpp Simulação ordenada de cores em imagens:\t%s\n\n
+  Simulação Ordenada de Cores em 8bpp:\t%s\n\n
diff --git a/nls/ro_RO/bsetroot.m b/nls/ro_RO/bsetroot.m
index 7840330d..788c8452 100644
--- a/nls/ro_RO/bsetroot.m
+++ b/nls/ro_RO/bsetroot.m
@@ -5,6 +5,7 @@ $ #MustSpecify
              -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <sir>           conexiunea la ecran\n\
   -mod <x> <y>             model\n\
   -foreground, -fg <color> culoare plan apropiat pentru model\n\
diff --git a/nls/ru_RU/BaseDisplay.m b/nls/ru_RU/BaseDisplay.m
index 809dc92c..e673f0dd 100644
--- a/nls/ru_RU/BaseDisplay.m
+++ b/nls/ru_RU/BaseDisplay.m
@@ -5,11 +5,11 @@ $ #XError
 $ #SignalCaught
 # %s: ÐÏÌÕÞÅÎ ÓÉÇÎÁÌ %d \n
 $ #ShuttingDown
-# ÏÔËÌÀÞÅÎÉÅ\n
+# shutting down\n
 $ #Aborting
 # ïÔÍÅÎÁ... ÓÏÚÄÁÅÔÓÑ ÄÁÍÐ core\n
 $ #XConnectFail
-# BaseDisplay::BaseDisplay: ÓÏÅÄÉÎÅÎÉÅ Ó X ÓÅÒ×ÅÒÏÍ ÐÒÏ×ÁÌÅÎÏ.\n
+# BaseDisplay::BaseDisplay: ÏÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ Ó X ÓÅÒ×ÅÒÏÍ.\n
 $ #CloseOnExecFail
 # BaseDisplay::BaseDisplay: ÎÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÐÏÍÅÔÉÔØ ÁËÔÉ×ÎÙÊ ÄÉÓÐÌÅÊ ËÁË "ÚÁËÒÙÔÙÊ-ÎÁ-ÉÓÐÏÌÎÅÎÉÅ"\n
 $ #BadWindowRemove
diff --git a/nls/ru_RU/Configmenu.m b/nls/ru_RU/Configmenu.m
index 27fddc3e..dcf754f6 100644
--- a/nls/ru_RU/Configmenu.m
+++ b/nls/ru_RU/Configmenu.m
@@ -5,23 +5,27 @@ $ #ConfigOptions
 $ #FocusModel
 # íÏÄÅÌØ ÆÏËÕÓÉÒÏ×ËÉ
 $ #WindowPlacement
-# ðÏÌÏÖÅÎÉÅ ÏËÎÁ
+# òÁÓÐÏÌÏÖÅÎÉÅ ÏËÏÎ
 $ #ImageDithering
-# Image Dithering
+# óÇÌÁÖÉ×ÁÔØ ÉÚÏÂÒÁÖÅÎÉÑ
 $ #OpaqueMove
-# ðÅÒÅÍÅÝÅÎÉÅ ÚÁÐÏÌÎÅÎÎÙÈ ÏËÏÎ
+# ðÏËÁÚÙ×ÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÏËÏÎ ÐÒÉ ÐÅÒÅÍÅÝÅÎÉÉ
 $ #FullMax
 # ðÏÌÎÁÑ ÍÁËÓÉÍÉÚÁÃÉÑ
 $ #FocusNew
 # ðÅÒÅÍÅÝÁÔØ ÆÏËÕÓ ÎÁ ÎÏ×ÙÅ ÏËÎÁ
 $ #FocusLast
-# æÏËÕÓ ÎÁ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ
+# ðÅÒÅÍÅÝÁÔØ ÆÏËÕÓ ÐÒÉ ÓÍÅÎÅ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ
+$ #DisableBindings
+# Scroll Lock ÏÔËÌÀÞÁÅÔ ÓÏÞÅÔÁÎÉÑ ËÌÁ×ÉÛ
 $ #ClickToFocus
 # æÏËÕÓ ÐÏ ÝÅÌÞËÕ
 $ #SloppyFocus
 # æÏËÕÓ ÐÏ ÐÅÒÅÍÅÝÅÎÉÀ
 $ #AutoRaise
 # á×ÔÏ×ÓÐÌÙÔÉÅ
+$ #ClickRaise
+# ÷ÓÐÌÙÔÉÅ ÐÏ ÝÅÌÞËÕ
 $ #SmartRows
 # "õÍÎÏÅ" ÒÁÓÐÏÌÏÖÅÎÉÅ (ÐÏ ÇÏÒÉÚÏÎÔÁÌÉ)
 $ #SmartCols
diff --git a/nls/ru_RU/Icon.m b/nls/ru_RU/Icon.m
index 401f66cf..9a719925 100644
--- a/nls/ru_RU/Icon.m
+++ b/nls/ru_RU/Icon.m
@@ -1,4 +1,4 @@
 $set 4 #Icon
 
 $ #Icons
-# ó×ÅÒÎÕÔÙÅ\nÏËÎÁ
+# ó×ÅÒÎÕÔÙÅ ÏËÎÁ
diff --git a/nls/ru_RU/Image.m b/nls/ru_RU/Image.m
index ea6b32bc..9741fa58 100644
--- a/nls/ru_RU/Image.m
+++ b/nls/ru_RU/Image.m
@@ -9,7 +9,7 @@ $ #UnsupVisual
 $ #ErrorCreatingPixmap
 # BImage::renderPixmap: ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ pixmap\n
 $ #InvalidColormapSize
-# BImageControl::BImageControl: ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ Ã×ÅÔÏ× %d (%d/%d/%d) - ÕÄÁÌÑÅÔÓÑ\n
+# BImageControl::BImageControl: ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ Ã×ÅÔÏ× %d (%d/%d/%d) - ÕÍÅÎØÛÁÅÔÓÑ\n
 $ #ErrorAllocatingColormap
 # BImageControl::BImageControl: ÏÛÉÂËÁ ÒÁÚÍÅÝÅÎÉÑ ÔÁÂÌÉÃÙ Ã×ÅÔÏ×\n
 $ #ColorAllocFail
@@ -17,7 +17,7 @@ $ #ColorAllocFail
 $ #PixmapRelease
 # BImageControl::~BImageControl: ËÜÛ ÔÏÞÅÞÎÙÈ ÉÚÏÂÒÁÖÅÎÉÊ - ÏÓ×ÏÂÏÖÄÁÅÔÓÑ %d ÂÌÏËÏ×\n
 $ #PixmapCacheLarge
-# BImageControl::renderImage: ÐÅÒÅÐÏÌÎÅÎÉÅ ËÜÛÁ, ÐÒÏÉÚ×ÏÄÉÔÓÑ ÂÙÓÔÒÁÑ ÏÞÉÓÔËÁ\n
+# BImageControl::renderImage: ÐÅÒÅÐÏÌÎÅÎÉÅ ËÜÛÁ, ÐÒÏÉÚ×ÏÄÉÔÓÑ ÏÞÉÓÔËÁ\n
 $ #ColorParseError
 # BImageControl::getColor: ÏÛÉÂËÁ ÒÁÚÂÏÒÁ ÓÔÒÏËÉ, ÏÐÉÓÙ×ÁÀÝÅÊ Ã×ÅÔ: '%s'\n
 $ #ColorAllocError
diff --git a/nls/ru_RU/Screen.m b/nls/ru_RU/Screen.m
index 10add528..fe164768 100644
--- a/nls/ru_RU/Screen.m
+++ b/nls/ru_RU/Screen.m
@@ -8,17 +8,17 @@ $ #ManagingScreen
 $ #FontLoadFail
 # BScreen::LoadStyle(): ÎÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÚÁÇÒÕÚÉÔØ ÛÒÉÆÔ '%s'\n
 $ #DefaultFontLoadFail
-# BScreen::LoadStyle(): ÎÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÚÁÇÒÕÚÉÔØ ÐÒÅÄÏÐÒÅÄÅÌÅÎÎÙÊ ÛÒÉÆÔ.\n
+# BScreen::LoadStyle(): ÎÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÚÁÇÒÕÚÉÔØ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n
 $ #EmptyMenuFile
 # %s: ÐÕÓÔÏÊ ÆÁÊÌ ÍÅÎÀ\n
 $ #xterm
-# Xterm
+# XTerm
 $ #Restart
 # ðÅÒÅÚÁÐÕÓË
 $ #Exit
 # ÷ÙÈÏÄ
 $ #EXECError
-# BScreen::parseMenuFile: ÏÛÉÂËÁ [exec], ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÎÁÚ×ÁÎÉÅ ÐÕÎËÔÁ ÍÅÎÀ É/ÉÌÉ ÎÁÚ×ÁÎÉÅ ËÏÍÍÁÎÄÙ\n
+# BScreen::parseMenuFile: ÏÛÉÂËÁ [exec], ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÎÁÚ×ÁÎÉÅ ÐÕÎËÔÁ ÍÅÎÀ É/ÉÌÉ ËÏÍÍÁÎÄÁ\n
 $ #EXITError
 # BScreen::parseMenuFile: ÏÛÉÂËÁ [exit], ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÎÁÚ×ÁÎÉÅ ÐÕÎËÔÁ ÍÅÎÀ\n
 $ #STYLEError
diff --git a/nls/ru_RU/Slit.m b/nls/ru_RU/Slit.m
index d06d296f..c11e3ecf 100644
--- a/nls/ru_RU/Slit.m
+++ b/nls/ru_RU/Slit.m
@@ -3,6 +3,6 @@ $set 7 #Slit
 $ #SlitTitle
 # äÏËÅÒ
 $ #SlitDirection
-# ïÒÉÅÎÔÁÃÉÑ ÄÏËÅÒÁ
+# îÁÐÒÁ×ÌÅÎÉÅ ÄÏËÅÒÁ
 $ #SlitPlacement
-# íÅÓÔÏÐÏÌÏÖÅÎÉÑ ÄÏËÅÒÁ
+# íÅÓÔÏÐÏÌÏÖÅÎÉÅ ÄÏËÅÒÁ
diff --git a/nls/ru_RU/Toolbar.m b/nls/ru_RU/Toolbar.m
index f84495f0..2f68b1e3 100644
--- a/nls/ru_RU/Toolbar.m
+++ b/nls/ru_RU/Toolbar.m
@@ -17,6 +17,6 @@ $ #NoStrftimeTimeFormatA
 $ #ToolbarTitle
 # ôÕÌÂÁÒ
 $ #EditWkspcName
-# òÅÄÁËÔÉÒÏ×ÁÔØ ÉÍÑ ÔÅËÕÝÅÇÏ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ
+# ðÅÒÅÉÍÅÎÏ×ÁÔØ ÔÅËÕÝÉÊ ÒÁÂÏÞÉÊ ÓÔÏÌ
 $ #ToolbarPlacement
 # íÅÓÔÏÐÏÌÏÖÅÎÉÅ ÔÕÌÂÁÒÁ
diff --git a/nls/ru_RU/Window.m b/nls/ru_RU/Window.m
index 68d4d194..0265785d 100644
--- a/nls/ru_RU/Window.m
+++ b/nls/ru_RU/Window.m
@@ -4,14 +4,14 @@ $set 9 #Window
 $ #Creating
 # BlackboxWindow::BlackboxWindow: ÓÏÚÄÁÅÔÓÑ 0x%lx\n
 $ #XGetWindowAttributesFail
-# BlackboxWindow::BlackboxWindow: ÐÒÏ×ÁÌÅÎ ÐÒÏÃÅÓÓ XGetWindowAttributres\n
+# BlackboxWindow::BlackboxWindow: ÏÛÉÂËÁ ÐÒÏÃÅÓÓÁ XGetWindowAttributres\n
 $ #CannotFindScreen
-# BlackboxWindow::BlackboxWindow: ÎÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÎÁÊÔÉ ÜËÒÁÎ ÄÌÑ ËÏÒÎÅ×ÏÇÏ ÏËÎÁ 0x%lx\n
+# BlackboxWindow::BlackboxWindow: ÎÅ ÎÁÊÄÅÎ ÜËÒÁÎ ÄÌÑ ËÏÒÎÅ×ÏÇÏ ÏËÎÁ 0x%lx\n
 $ #Unnamed
-# âÅÚÙÍÑÎÎÏÅ
+# âÅÚ ÉÍÅÎÉ
 $ #MapRequest
 # BlackboxWindow::mapRequestEvent() ÄÌÑ 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() ÄÌÑ 0x%lx\n
 $ #ReparentNotify
-# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
+# BlackboxWindow::reparentNotifyEvent: ÓÍÅÎÁ ÒÏÄÉÔÅÌÑ ÄÌÑ 0x%lx ÎÁ 0x%lx\n
diff --git a/nls/ru_RU/blackbox.m b/nls/ru_RU/blackbox.m
index 134299f5..cfaa8fd2 100644
--- a/nls/ru_RU/blackbox.m
+++ b/nls/ru_RU/blackbox.m
@@ -3,4 +3,4 @@ $set 13 #blackbox
 $ #NoManagableScreens
 # Blackbox::Blackbox: ÎÅ ÎÁÊÄÅÎÏ ÜËÒÁÎÏ× ÄÌÑ ÏÂÓÌÕÖÉ×ÁÎÉÑ, ÏÔÍÅÎÁ...\n
 $ #MapRequest
-# Blackbox::process_event: MapRequest for 0x%lx\n
+# Blackbox::process_event: MapRequest ÄÌÑ 0x%lx\n
diff --git a/nls/ru_RU/bsetroot.m b/nls/ru_RU/bsetroot.m
index 5a659802..053a2457 100644
--- a/nls/ru_RU/bsetroot.m
+++ b/nls/ru_RU/bsetroot.m
@@ -4,10 +4,11 @@ $ #MustSpecify
 # %s: ÏÛÉÂËÁ: ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ËÌÀÞÅÊ: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
-  -display <string>        ÓÏÅÄÉÎÅÎÉÅ Ó ÄÉÓÐÌÅÅÍ\n\
-  -mod <x> <y>             ÍÁËÅÔ ËÌÅÔËÉ\n\
-  -foreground, -fg <color> Ã×ÅÔ ÐÅÒÅÄÎÅÇÏ ÐÌÁÎÁ ËÌÅÔËÉ\n\
-  -background, -bg <color> Ã×ÅÔ ÆÏÎÁ ËÌÅÔËÉ\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
+  -display <string>        ÉÓÐÏÌØÚÏ×ÁÔØ ÚÁÄÁÎÎÙÊ ÄÉÓÐÌÅÊ\n\
+  -mod <x> <y>             ÍÁËÅÔ ÓÅÔËÉ\n\
+  -foreground, -fg <color> Ã×ÅÔ ÓÅÔËÉ\n\
+  -background, -bg <color> Ã×ÅÔ ÆÏÎÁ\n\n\
   -gradient <texture>      ÇÒÁÄÉÅÎÔ\n\
   -from <color>            ÎÁÞÁÌØÎÙÊ Ã×ÅÔ ÇÒÁÄÉÅÎÔÁ\n\
   -to <color>              ËÏÎÅÞÎÙÊ Ã×ÅÔ ÇÒÁÄÉÅÎÔÁ\n\n\
diff --git a/nls/ru_RU/common.m b/nls/ru_RU/common.m
index f164afcf..8f603baa 100644
--- a/nls/ru_RU/common.m
+++ b/nls/ru_RU/common.m
@@ -24,12 +24,15 @@ $ #PlacementCenterLeft
 $ #PlacementBottomLeft
 # óÌÅ×Á ×ÎÉÚÕ
 $ #PlacementTopCenter
-# ó×ÅÒÈÕ ÐÏ ÃÅÎÔÒÕ
+# ÷×ÅÒÈÕ ÐÏ ÃÅÎÔÒÕ
 $ #PlacementBottomCenter
-# óÎÉÚÕ ÐÏ ÃÅÎÔÒÕ
+# ÷ÎÉÚÕ ÐÏ ÃÅÎÔÒÕ
 $ #PlacementTopRight
-# óÐÒÁ×Á Ó×ÅÒÈÕ
+# óÐÒÁ×Á ××ÅÒÈÕ
 $ #PlacementCenterRight
 # óÐÒÁ×Á ÐÏ ÃÅÎÔÒÕ
 $ #PlacementBottomRight
 # óÐÒÁ×Á ×ÎÉÚÕ
+
+$ #AutoHide
+# óËÒÙ×ÁÔØ Á×ÔÏÍÁÔÉÞÅÓËÉ
diff --git a/nls/sk_SK/BaseDisplay.m b/nls/sk_SK/BaseDisplay.m
new file mode 100644
index 00000000..43b9258f
--- /dev/null
+++ b/nls/sk_SK/BaseDisplay.m
@@ -0,0 +1,16 @@
+$set 1 #BaseDisplay
+
+$ #XError
+# %s:  X chyba: %s(%d) operaèné kódy %d/%d\n  zdroj 0x%lx\n
+$ #SignalCaught
+# %s: prijatý signál %d\n
+$ #ShuttingDown
+# ukonèuje sa\n
+$ #Aborting
+# preru¹uje sa... výpis obsahu pamäte (dumping core)\n
+$ #XConnectFail
+# BaseDisplay::BaseDisplay: zlyhalo pripojenie k X serveru\n
+$ #CloseOnExecFail
+# BaseDisplay::BaseDisplay: nie je mo¾né oznaèi» pripojenie k obrazovke ako close-on-exec\n
+$ #BadWindowRemove
+# BaseDisplay::eventLoop(): odstraòuje sa chybné okno z fronty udalostí\n
diff --git a/nls/sk_SK/Basemenu.m b/nls/sk_SK/Basemenu.m
new file mode 100644
index 00000000..6c4da308
--- /dev/null
+++ b/nls/sk_SK/Basemenu.m
@@ -0,0 +1,4 @@
+$set 2 #Basemenu
+
+$ #BlackboxMenu
+# Blackbox Menu
diff --git a/nls/sk_SK/Configmenu.m b/nls/sk_SK/Configmenu.m
new file mode 100644
index 00000000..9a9ea6b5
--- /dev/null
+++ b/nls/sk_SK/Configmenu.m
@@ -0,0 +1,42 @@
+$set 3 #Configmenu
+
+$ #ConfigOptions
+# Konfiguraèné voµby
+$ #FocusModel
+# Model zamerania
+$ #WindowPlacement
+# Umiestnenie okna
+$ #ImageDithering
+# Modifikácia farieb a jasu na obraze
+$ #OpaqueMove
+# Presúvanie celého okna
+$ #FullMax
+# Plná maximalizácia
+$ #FocusNew
+# Zamera» nové okná
+$ #FocusLast
+# Zamera» okno pri zmene pracovnej plochy
+$ #DisableBindings
+# Zakáza» väzby s klávesou Scroll Lock
+$ #ClickToFocus
+# Kliknú» pre zameranie
+$ #SloppyFocus
+# Nedbanlivé zameranie
+$ #AutoRaise
+# Automaticky presunú» do popredia
+$ #ClickRaise
+# Po kliknutí presunú» do popredia
+$ #SmartRows
+# Inteligentné umiestnenie (riadky)
+$ #SmartCols
+# Inteligentné umiestnenie (ståpce)
+$ #Cascade
+# Kaskádové umiestnenie
+$ #LeftRight
+# Zµava doprava
+$ #RightLeft
+# Sprava doµava
+$ #TopBottom
+# Zhora nadol
+$ #BottomTop
+# Zdola nahor
diff --git a/nls/sk_SK/Icon.m b/nls/sk_SK/Icon.m
new file mode 100644
index 00000000..e49e2477
--- /dev/null
+++ b/nls/sk_SK/Icon.m
@@ -0,0 +1,4 @@
+$set 4 #Icon
+
+$ #Icons
+# Ikony
diff --git a/nls/sk_SK/Image.m b/nls/sk_SK/Image.m
new file mode 100644
index 00000000..517c7422
--- /dev/null
+++ b/nls/sk_SK/Image.m
@@ -0,0 +1,24 @@
+$set 5 #Image
+
+$ #ErrorCreatingSolidPixmap
+# BImage::render_solid: chyba pri vytváraní pixmapy\n
+$ #ErrorCreatingXImage
+# BImage::renderXImage: chyba pri vytváraní XImage\n
+$ #UnsupVisual
+# BImage::renderXImage: nepodporované zobrazenie\n
+$ #ErrorCreatingPixmap
+# BImage::renderPixmap: chyba pri vytváraní pixmapy\n
+$ #InvalidColormapSize
+# BImageControl::BImageControl: chybná veµkost colormapy %d (%d/%d/%d) - redukuje sa\n
+$ #ErrorAllocatingColormap
+# BImageControl::BImageControl: chyba pri alokovaní colormapy\n
+$ #ColorAllocFail
+# BImageControl::BImageControl: chyba pri alokovaní farby %d/%d/%d\n
+$ #PixmapRelease
+# BImageControl::~BImageControl: vyrovnávacia pamä» pre pixmapy - uvoµòuje sa %d pixmáp\n
+$ #PixmapCacheLarge
+# BImageControl::renderImage: vyrovnávacia pamä» je príli¹ veµká, vynútené vyprázdnenie\n
+$ #ColorParseError
+# BImageControl::getColor: chyba pri analýze farby: '%s'\n
+$ #ColorAllocError
+# BImageControl::getColor: chyba pri alokovaní farby: '%s'\n
diff --git a/nls/sk_SK/Makefile.am b/nls/sk_SK/Makefile.am
new file mode 100644
index 00000000..390b3cf7
--- /dev/null
+++ b/nls/sk_SK/Makefile.am
@@ -0,0 +1,35 @@
+# Makefile.am for Blackbox - an X11 Window Manager
+
+NLSTEST = @NLS@
+THE_LANG = sk_SK
+THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)
+CLEANFILES = blackbox.cat
+MAINTAINERCLEANFILES = Makefile.in Translation.m
+DISTCLEANFILES = Translation.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
+
+all-local: blackbox.cat
+install-data-local: blackbox.cat
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		echo "Installing catalog in $(THE_NLS_PATH)"; \
+		$(mkinstalldirs) $(THE_NLS_PATH); \
+		$(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \
+	fi
+uninstall-local:
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		rm -f $(THE_NLS_PATH)/blackbox.cat; \
+		rmdir $(THE_NLS_PATH); \
+	fi
+
+Translation.m: $(MFILES)
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
+	fi
+
+blackbox.cat: Translation.m
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		$(gencat_cmd) blackbox.cat Translation.m; \
+	fi
+
+distclean-local:
+	rm -f *\~ .\#*
diff --git a/nls/sk_SK/Screen.m b/nls/sk_SK/Screen.m
new file mode 100644
index 00000000..cc1b02fc
--- /dev/null
+++ b/nls/sk_SK/Screen.m
@@ -0,0 +1,52 @@
+$set 6 #Screen
+
+$ #AnotherWMRunning
+# BScreen::BScreen: pri dopytovaní X servera nastala chyba.\n  \
+na displeji je práve spustený ïal¹í správca okien %s.\n
+$ #ManagingScreen
+# BScreen::BScreen: riadiaca obrazovka %d pou¾íva zobrazenie 0x%lx, håbka %d\n
+$ #FontLoadFail
+# BScreen::LoadStyle(): nie je mo¾né nahra» font '%s'\n
+$ #DefaultFontLoadFail
+# BScreen::LoadStyle(): nie je mo¾né nahra» predvolený font.\n
+$ #EmptyMenuFile
+# %s: prázdny menu súbor\n
+$ #xterm
+# xterm
+$ #Restart
+# Re¹tart
+$ #Exit
+# Koniec
+$ #EXECError
+# BScreen::parseMenuFile: [exec] chyba, nedefinovaný titulok menu a/alebo príkaz\n
+$ #EXITError
+# BScreen::parseMenuFile: [exit] chyba, nedefinovaný titulok menu\n
+$ #STYLEError
+# BScreen::parseMenuFile: [style] chyba, nedefinovaný titulok menu a/alebo názov súboru\n
+$ #CONFIGError
+# BScreen::parseMenuFile: [config] chyba, nedefinovaný titulok menu\n
+$ #INCLUDEError
+# BScreen::parseMenuFile: [include] chyba, nedefinovaný názov súboru\n
+$ #INCLUDEErrorReg
+# BScreen::parseMenuFile: [include] chyba, '%s' nie je obyèajný súbor\n
+$ #SUBMENUError
+# BScreen::parseMenuFile: [submenu] chyba, nedefinovaný titulok menu\n
+$ #RESTARTError
+# BScreen::parseMenuFile: [restart] chyba, nedefinovaný titulok menu\n
+$ #RECONFIGError
+# BScreen::parseMenuFile: [reconfig] chyba, nedefinovaný titulok menu\n
+$ #STYLESDIRError
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] chyba, nedefinovaný adresár\n
+$ #STYLESDIRErrorNotDir
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] chyba, '%s' nie je adresár\n
+$ #STYLESDIRErrorNoExist
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] chyba, '%s' neexistuje\n
+$ #WORKSPACESError
+# BScreen::parseMenuFile: [workspaces] chyba, nedefinovaný titulok menu\n
+$ #PositionLength
+# 0: 0000 x 0: 0000
+$ #PositionFormat
+# X: %4d x Y: %4d
+$ #GeometryFormat
+# W: %4d x H: %4d
+
diff --git a/nls/sk_SK/Slit.m b/nls/sk_SK/Slit.m
new file mode 100644
index 00000000..b9355944
--- /dev/null
+++ b/nls/sk_SK/Slit.m
@@ -0,0 +1,8 @@
+$set 7 #Slit
+
+$ #SlitTitle
+# Slit
+$ #SlitDirection
+# Smer Slitu
+$ #SlitPlacement
+# Umiestnenie Slitu
diff --git a/nls/sk_SK/Toolbar.m b/nls/sk_SK/Toolbar.m
new file mode 100644
index 00000000..e0cf73fc
--- /dev/null
+++ b/nls/sk_SK/Toolbar.m
@@ -0,0 +1,22 @@
+$set 8 #Toolbar
+
+$ #NoStrftimeLength
+# 00:00000
+$ #NoStrftimeDateFormat
+# %02d/%02d/%02d
+$ #NoStrftimeDateFormatEu
+# %02d.%02d.%02d
+$ #NoStrftimeTimeFormat24
+#  %02d:%02d 
+$ #NoStrftimeTimeFormat12
+# %02d:%02d %sm
+$ #NoStrftimeTimeFormatP
+# p
+$ #NoStrftimeTimeFormatA
+# a
+$ #ToolbarTitle
+# Panel nástrojov
+$ #EditWkspcName
+# Zmeni» názov aktuálnej pracovnej plochy
+$ #ToolbarPlacement
+# Umiestnenie panela nástrojov
diff --git a/nls/sk_SK/Window.m b/nls/sk_SK/Window.m
new file mode 100644
index 00000000..92da0f37
--- /dev/null
+++ b/nls/sk_SK/Window.m
@@ -0,0 +1,17 @@
+$set 9 #Window
+
+
+$ #Creating
+# BlackboxWindow::BlackboxWindow: vytvára sa 0x%lx\n
+$ #XGetWindowAttributesFail
+# BlackboxWindow::BlackboxWindow: zlyhanie XGetWindowAttributres\n
+$ #CannotFindScreen
+# BlackboxWindow::BlackboxWindow: nie je mo¾né nájs» obrazovku pre základné okno 0x%lx\n
+$ #Unnamed
+# Nepomenované
+$ #MapRequest
+# BlackboxWindow::mapRequestEvent() pre 0x%lx\n
+$ #UnmapNotify
+# BlackboxWindow::unmapNotifyEvent() pre 0x%lx\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: zmena potomka 0x%lx na rodièa 0x%lx\n
diff --git a/nls/sk_SK/Windowmenu.m b/nls/sk_SK/Windowmenu.m
new file mode 100644
index 00000000..d9193ce1
--- /dev/null
+++ b/nls/sk_SK/Windowmenu.m
@@ -0,0 +1,20 @@
+$set 10 #Windowmenu
+
+$ #SendTo
+# Umiestni» na ...
+$ #Shade
+# Zrolova»
+$ #Iconify
+# Zmeni» na ikonu
+$ #Maximize
+# Maximalizova»
+$ #Raise
+# Presunú» do popredia
+$ #Lower
+# Presunú» do pozadia
+$ #Stick
+# Prilepi»
+$ #KillClient
+# Ukonèi» klienta
+$ #Close
+# Zavrie»
diff --git a/nls/sk_SK/Workspace.m b/nls/sk_SK/Workspace.m
new file mode 100644
index 00000000..0bf99298
--- /dev/null
+++ b/nls/sk_SK/Workspace.m
@@ -0,0 +1,4 @@
+$set 11 #Workspace
+
+$ #DefaultNameFormat
+# Pracovná plocha %d
diff --git a/nls/sk_SK/Workspacemenu.m b/nls/sk_SK/Workspacemenu.m
new file mode 100644
index 00000000..6abe58e5
--- /dev/null
+++ b/nls/sk_SK/Workspacemenu.m
@@ -0,0 +1,8 @@
+$set 12 #Workspacemenu
+
+$ #WorkspacesTitle
+# Pracovné plochy
+$ #NewWorkspace
+# Nová pracovná plocha
+$ #RemoveLast
+# Odstráni» poslednú
diff --git a/nls/sk_SK/blackbox.m b/nls/sk_SK/blackbox.m
new file mode 100644
index 00000000..4abf309e
--- /dev/null
+++ b/nls/sk_SK/blackbox.m
@@ -0,0 +1,6 @@
+$set 13 #blackbox
+
+$ #NoManagableScreens
+# Blackbox::Blackbox: nena¹li sa spravovateµné obrazovky, ru¹í sa\n
+$ #MapRequest
+# Blackbox::process_event: MapRequest pre 0x%lx\n
diff --git a/nls/sk_SK/bsetroot.m b/nls/sk_SK/bsetroot.m
new file mode 100644
index 00000000..ac813d3b
--- /dev/null
+++ b/nls/sk_SK/bsetroot.m
@@ -0,0 +1,17 @@
+$set 16 #bsetroot
+
+$ #MustSpecify
+# %s: chyba: musíte ¹pecifikova» jeden z parametrov: -solid, -mod, -gradient\n
+$ #Usage
+# %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	  (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
+  -display <string>        pripojenie k obrazovke\n\
+  -mod <x> <y>             modul vzorky\n\
+  -foreground, -fg <color> modul farby popredia\n\
+  -background, -bg <color> modul farby pozadia\n\n\
+  -gradient <texture>      textúra farebného prechodu\n\
+  -from <color>            poèiatoèná farba vo farebnom prechode\n\
+  -to <color>              koneèná farba vo farebnom prechode\n\n\
+  -solid <color>           jednoliata farba\n\n\
+  -help                    vypí¹e túto nápovedu a skonèí\n
+
diff --git a/nls/sk_SK/common.m b/nls/sk_SK/common.m
new file mode 100644
index 00000000..cf4df8a6
--- /dev/null
+++ b/nls/sk_SK/common.m
@@ -0,0 +1,38 @@
+$set 15 #Common
+
+$ #Yes
+# Áno
+$ #No
+# Nie
+
+$ #DirectionTitle
+# Smer
+$ #DirectionHoriz
+# Horizontálny
+$ #DirectionVert
+# Vertikálny
+
+$ #AlwaysOnTop
+# Stále na vrchu
+
+$ #PlacementTitle
+# Umiestnenie
+$ #PlacementTopLeft
+# Vµavo hore
+$ #PlacementCenterLeft
+# Uprostred vµavo
+$ #PlacementBottomLeft
+# Vµavo dole
+$ #PlacementTopCenter
+# Hore uprostred
+$ #PlacementBottomCenter
+# Dole uprostred
+$ #PlacementTopRight
+# Vpravo hore
+$ #PlacementCenterRight
+# Uprostred vpravo
+$ #PlacementBottomRight
+# Vpravo dole
+
+$ #AutoHide
+# Automaticky skry»
diff --git a/nls/sk_SK/main.m b/nls/sk_SK/main.m
new file mode 100644
index 00000000..269fed7f
--- /dev/null
+++ b/nls/sk_SK/main.m
@@ -0,0 +1,20 @@
+$set 14 #main
+
+$ #RCRequiresArg
+# chyba: '-rc' vy¾aduje argument\n
+$ #DISPLAYRequiresArg
+# chyba: '-display' vy¾aduje argument\n
+$ #WarnDisplaySet
+# varovanie: nie je mo¾né nastavi» premennú prostredia 'DISPLAY'\n
+$ #Usage
+# Blackbox %s : (c) 2001 - 2002 Sean 'Shaleh' Perry\n\
+  \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
+  -display <string>\t\tpou¾ije sa pripojenie k zadanému displeju.\n\
+  -rc <string>\t\t\tpou¾ije sa alternatívny konfiguraèný súbor.\n\
+  -version\t\t\tzobrazí verziu a skonèí.\n\
+  -help\t\t\t\tzobrazí túto nápovedu a skonèí.\n\n
+$ #CompileOptions
+# Nastavenia v èase kompilácie:\n\
+  Ladenie\t\t\t%s\n\
+  Shape:\t\t\t%s\n\
+  8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/sl_SI/bsetroot.m b/nls/sl_SI/bsetroot.m
index 3778a51d..fa22ab26 100644
--- a/nls/sl_SI/bsetroot.m
+++ b/nls/sl_SI/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: napaka: doloèiti je treba eno: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        prika¾i povezavo\n\
   -mod <x> <y>             vzorec\n\
   -foreground, -fg <color> barva ospredja\n\
diff --git a/nls/sv_SE/bsetroot.m b/nls/sv_SE/bsetroot.m
index 3ed67be9..269b1666 100644
--- a/nls/sv_SE/bsetroot.m
+++ b/nls/sv_SE/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: fel: måste specifiera en av: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        skärmanslutning\n\
   -mod <x> <y>             modulamönster\n\
   -foreground, -fg <color> förgrundsfärg för modulamönster\n\
diff --git a/nls/tr_TR/bsetroot.m b/nls/tr_TR/bsetroot.m
index bdfe020d..05f3a36c 100644
--- a/nls/tr_TR/bsetroot.m
+++ b/nls/tr_TR/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s : hata : -solid, -mod yada -gradient'den birisini belirlemek zorundasýn\n
 $ #Usage
 # %s 2.0 : Tel'if hakký (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <metin>         ekran belirlemesi\n\
   -mod <x> <y>             bölüþüm iþlemi\n\
   -foreground, -fg <renk>  bölüþüm önalaný\n\
diff --git a/nls/uk_UA/bsetroot.m b/nls/uk_UA/bsetroot.m
index 86a6c21d..7160d6d0 100644
--- a/nls/uk_UA/bsetroot.m
+++ b/nls/uk_UA/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: ÐÏÍÉÌËÁ: ÎÅÏÂȦÄÎÏ ÚÁÄÁÔÉ ÏÄÉÎ Ú ÎÁÓÔÕÐÎÉÈ ËÌÀÞ¦×: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        ÏÂÓÌÕÇÏ×Õ×ÁÔÉ ×ËÁÚÁÎÉÊ ÄÉÓÐÌÅÊ\n\
   -mod <x> <y>             ÍÁËÅÔ Ë̦ÔËÉ\n\
   -foreground, -fg <color> ËÏÌ¦Ò ÐÅÒÅÄÎØÏÇÏ ÐÌÁÎÕ Ë̦ÔËÉ\n\
diff --git a/nls/zh_CN/bsetroot.m b/nls/zh_CN/bsetroot.m
index 8d313863..ef1aa86f 100644
--- a/nls/zh_CN/bsetroot.m
+++ b/nls/zh_CN/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: ´íÎó: ±ØÐë´ÓÖÐÖ¸¶¨Ò»¸ö: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        ÏÔʾÁ¬½Ó\n\
   -mod <x> <y>             ģʽ\n\
   -foreground, -fg <color> Ç°¾°É«\n\
diff --git a/nls/zh_TW/bsetroot.m b/nls/zh_TW/bsetroot.m
index ddd7be6a..a1f78508 100644
--- a/nls/zh_TW/bsetroot.m
+++ b/nls/zh_TW/bsetroot.m
@@ -4,6 +4,7 @@ $ #MustSpecify
 # %s: error: must specify one of: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
+	    (c) 2001-2002 Sean 'Shaleh' Perry\n\n\
   -display <string>        display connection\n\
   -mod <x> <y>             modula pattern\n\
   -foreground, -fg <color> modula foreground color\n\
diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 305973ac..51d79399 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -411,7 +411,7 @@ const ScreenInfo* BaseDisplay::getScreenInfo(unsigned int s) const {
 
 BGCCache* BaseDisplay::gcCache(void) const {
   if (! gccache)
-    gccache = new BGCCache(this);
+    gccache = new BGCCache(this, screenInfoList.size());
   
   return gccache;
 }
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 90d5e458..3556d00a 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -84,20 +84,20 @@ Basemenu::Basemenu(BScreen *scrn) {
     which_press =
     which_sbl = -1;
 
+  menu.sublevels =
+    menu.persub =
+    menu.minsub = 0;
+
   menu.frame_pixmap =
     menu.title_pixmap =
     menu.hilite_pixmap = None;
 
   menu.bevel_w = screen->getBevelWidth();
 
-  MenuStyle *style = screen->getMenuStyle();
+  const MenuStyle* const style = screen->getMenuStyle();
   menu.width = menu.title_h = menu.item_w = menu.frame_h =
     style->t_font->height() + (menu.bevel_w  * 2);
 
-  menu.sublevels =
-    menu.persub =
-    menu.minsub = 0;
-
   menu.item_h = style->f_font->height() + menu.bevel_w;
 
   menu.height = menu.title_h + screen->getBorderWidth() + menu.frame_h;
@@ -142,26 +142,25 @@ Basemenu::Basemenu(BScreen *scrn) {
   // completely created.  items must be inserted and it must be update()'d
 }
 
+
 Basemenu::~Basemenu(void) {
   XUnmapWindow(display, menu.window);
 
   if (shown && shown->getWindowID() == getWindowID())
     shown = (Basemenu *) 0;
 
-  MenuItems::const_iterator it = menuitems.begin();
-  while (it != menuitems.end()) {
-    BasemenuItem *item = *it;
+  MenuItems::const_iterator it = menuitems.begin(),
+    end = menuitems.end();
+  for (; it != end; ++it) {
     if (! internal_menu) {
-      Basemenu *tmp = (Basemenu *) item->submenu();
+      Basemenu *tmp = (*it)->submenu();
       if (tmp) {
-        if (! tmp->internal_menu) {
+        if (! tmp->internal_menu)
           delete tmp;
-        } else {
+        else
           tmp->internal_hide();
-        }
       }
     }
-    ++it;
   }
 
   std::for_each(menuitems.begin(), menuitems.end(), PointerAssassin());
@@ -225,13 +224,12 @@ int Basemenu::remove(int index) {
   if (! item) return -1;
 
   if (! internal_menu) {
-    Basemenu *tmp = (Basemenu *) item->submenu();
+    Basemenu *tmp = item->submenu();
     if (tmp) {
-      if (! tmp->internal_menu) {
+      if (! tmp->internal_menu)
         delete tmp;
-      } else {
+      else
         tmp->internal_hide();
-      }
     }
   }
 
@@ -249,7 +247,7 @@ int Basemenu::remove(int index) {
 
 
 void Basemenu::update(void) {
-  MenuStyle *style = screen->getMenuStyle();
+  const MenuStyle* const style = screen->getMenuStyle();
   menu.item_h = (style->f_font->height() < 9 ? 9 : style->f_font->height()) +
                 menu.bevel_w;  // 9 for the menu pixmaps (checkmarks)
   menu.title_h = style->t_font->height() + menu.bevel_w * 2;
@@ -273,7 +271,7 @@ void Basemenu::update(void) {
   if (! menuitems.empty()) {
     menu.sublevels = 1;
 
-    unsigned int menu_size = menuitems.size();
+    const unsigned int menu_size = menuitems.size();
     while (((menu.item_h * (menu_size + 1) / menu.sublevels)
             + menu.title_h + screen->getBorderWidth()) >
            screen->getHeight())
@@ -431,7 +429,7 @@ void Basemenu::redrawTitle(void) {
     i18n(BasemenuSet, BasemenuBlackboxMenu, "Blackbox Menu");
   int dx = menu.bevel_w;
   unsigned int l;
-  MenuStyle *style = screen->getMenuStyle();
+  const MenuStyle* const style = screen->getMenuStyle();
 
   l = style->t_font->measureString(text) + menu.bevel_w * 2;
 
@@ -463,12 +461,13 @@ void Basemenu::drawSubmenu(int index) {
   item = find(index);
   if (! item)
     return;
+
   Basemenu *submenu = item->submenu();
 
   if (submenu && visible && ! submenu->isTorn() && item->isEnabled()) {
     if (submenu->parent != this) submenu->parent = this;
-    int sbl = index / menu.persub, i = index - (sbl * menu.persub),
-      x = menu.x + ((menu.item_w * (sbl + 1)) + screen->getBorderWidth()), y;
+    const int sbl = index / menu.persub, i = index - (sbl * menu.persub);
+    int x = menu.x + ((menu.item_w * (sbl + 1)) + screen->getBorderWidth()), y;
 
     if (alignment == AlignTop) {
       y = (((shifted) ? menu.y_shift : menu.y) +
@@ -528,13 +527,13 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
 
   bool dotext = True, dohilite = True, dosel = True, dooppsel = True;
   const char *text = item->label();
-  int sbl = index / menu.persub, i = index - (sbl * menu.persub);
+  const int sbl = index / menu.persub, i = index - (sbl * menu.persub);
+  const unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4;
   int item_x = (sbl * menu.item_w), item_y = (i * menu.item_h);
   int hilite_x = item_x, hilite_y = item_y, hoff_x = 0, hoff_y = 0;
   int text_x = 0, text_y = 0, sel_x = 0, oppsel_x = 0, sel_y = 0;
   unsigned int hilite_w = menu.item_w, hilite_h = menu.item_h, text_w = 0,
     text_h = 0;
-  unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4;
 
   if (text) {
     text_w = screen->getMenuStyle()->f_font->measureString(text);
@@ -557,12 +556,12 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
     text_h = menu.item_h - menu.bevel_w;
   }
 
-  MenuStyle *style = screen->getMenuStyle();
-  BPen hipen(style->hilite.color());
+  const MenuStyle* const style = screen->getMenuStyle();
+  const BPen hipen(style->hilite.color());
   // match the text color
-  BPen pen((highlight ? style->h_text :
-            (item->isEnabled() ? style->f_text :
-             style->d_text)));
+  const BPen pen((highlight ? style->h_text :
+                  (item->isEnabled() ? style->f_text :
+                   style->d_text)));
 
 
   sel_x = item_x;
@@ -594,7 +593,7 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
     }
 
     // check if we need to redraw the text
-    int text_ry = item_y + (menu.bevel_w / 2);
+    const int text_ry = item_y + (menu.bevel_w / 2);
     if (! (max(text_x, x) <= min<signed>(text_x + text_w, x + w) &&
            max(text_ry, y) <= min<signed>(text_ry + text_h, y + h)))
       dotext = False;
@@ -752,9 +751,9 @@ bool Basemenu::isItemEnabled(int index) {
 
 void Basemenu::buttonPressEvent(XButtonEvent *be) {
   if (be->window == menu.frame) {
-    int sbl = (be->x / menu.item_w), i = (be->y / menu.item_h);
-    int w = (sbl * menu.persub) + i;
-
+    const int sbl = (be->x / menu.item_w), i = (be->y / menu.item_h),
+      w = (sbl * menu.persub) + i;
+    
     BasemenuItem *item = find(w);
     if (item) {
       which_press = i;
@@ -792,7 +791,7 @@ void Basemenu::buttonReleaseEvent(XButtonEvent *re) {
     if (re->button == 3) {
       hide();
     } else {
-      int sbl = (re->x / menu.item_w), i = (re->y / menu.item_h),
+      const int sbl = (re->x / menu.item_w), i = (re->y / menu.item_h),
         ix = sbl * menu.item_w, iy = i * menu.item_h,
         w = (sbl * menu.persub) + i,
         p = (which_sbl * menu.persub) + which_press;
@@ -837,32 +836,34 @@ void Basemenu::motionNotifyEvent(XMotionEvent *me) {
           drawSubmenu(which_sub);
       }
     }
-  } else if (! (me->state & Button1Mask) && me->window == menu.frame &&
+  } else if (me->window == menu.frame &&
              me->x >= 0 && me->x < static_cast<signed>(menu.width) &&
              me->y >= 0 && me->y < static_cast<signed>(menu.frame_h)) {
-    int sbl = (me->x / menu.item_w), i = (me->y / menu.item_h),
+    const int sbl = (me->x / menu.item_w), i = (me->y / menu.item_h),
       w = (sbl * menu.persub) + i;
 
     if ((i != which_press || sbl != which_sbl) &&
         (w >= 0 && w < static_cast<signed>(menuitems.size()))) {
       if (which_press != -1 && which_sbl != -1) {
-        int p = (which_sbl * menu.persub) + which_press;
+        const int p = (which_sbl * menu.persub) + which_press;
         BasemenuItem *item = find(p);
+        if (! item) return;
 
         drawItem(p, False, True);
-        if (item->submenu())
-          if (item->submenu()->isVisible() &&
-              ! item->submenu()->isTorn()) {
-            item->submenu()->internal_hide();
-            which_sub = -1;
-          }
+        if (item->submenu() &&
+            item->submenu()->isVisible() &&
+            ! item->submenu()->isTorn()) {
+          item->submenu()->internal_hide();
+          which_sub = -1;
+        }
       }
 
       which_press = i;
       which_sbl = sbl;
 
       BasemenuItem *itmp = find(w);
-
+      if (! itmp) return;
+      
       if (itmp->submenu())
         drawSubmenu(w);
       else
@@ -876,27 +877,26 @@ void Basemenu::exposeEvent(XExposeEvent *ee) {
   if (ee->window == menu.title) {
     redrawTitle();
   } else if (ee->window == menu.frame) {
-    // this is a compilicated algorithm... lets do it step by step...
+    // this is a complicated algorithm... lets do it step by step...
     // first... we see in which sub level the expose starts... and how many
     // items down in that sublevel
 
-    int sbl = (ee->x / menu.item_w), id = (ee->y / menu.item_h),
+    const int sbl = (ee->x / menu.item_w), id = (ee->y / menu.item_h),
       // next... figure out how many sublevels over the redraw spans
-      sbl_d = ((ee->x + ee->width) / menu.item_w),
+      sbl_d = ((ee->x + ee->width) / menu.item_w);
       // then we see how many items down to redraw
-      id_d = ((ee->y + ee->height) / menu.item_h);
+    int id_d = ((ee->y + ee->height) / menu.item_h);
 
     if (id_d > menu.persub) id_d = menu.persub;
 
     // draw the sublevels and the number of items the exposure spans
     MenuItems::iterator it,
       end = menuitems.end();
-    int i, ii;
-    for (i = sbl; i <= sbl_d; i++) {
+    for (int i = sbl; i <= sbl_d; i++) {
       // set the iterator to the first item in the sublevel needing redrawing
       it = menuitems.begin() + (id + (i * menu.persub));
-      for (ii = id; ii <= id_d && it != end; ++it, ii++) {
-        int index = ii + (i * menu.persub);
+      for (int ii = id; ii <= id_d && it != end; ++it, ii++) {
+        const int index = ii + (i * menu.persub);
         // redraw the item
         drawItem(index, (which_sub == index), False,
                  ee->x, ee->y, ee->width, ee->height);
@@ -933,7 +933,7 @@ void Basemenu::enterNotifyEvent(XCrossingEvent *ce) {
     if (which_sub != -1) {
       BasemenuItem *tmp = find(which_sub);
       if (tmp->submenu()->isVisible()) {
-        int sbl = (ce->x / menu.item_w), i = (ce->y / menu.item_h),
+        const int sbl = (ce->x / menu.item_w), i = (ce->y / menu.item_h),
           w = (sbl * menu.persub) + i;
 
         if (w != which_sub && ! tmp->submenu()->isTorn()) {
@@ -951,7 +951,7 @@ void Basemenu::enterNotifyEvent(XCrossingEvent *ce) {
 void Basemenu::leaveNotifyEvent(XCrossingEvent *ce) {
   if (ce->window == menu.frame) {
     if (which_press != -1 && which_sbl != -1 && menuitems.size() > 0) {
-      int p = (which_sbl * menu.persub) + which_press;
+      const int p = (which_sbl * menu.persub) + which_press;
 
       drawItem(p, (p == which_sub), True);
 
diff --git a/src/GCCache.cc b/src/GCCache.cc
index 75c7252a..829d130f 100644
--- a/src/GCCache.cc
+++ b/src/GCCache.cc
@@ -78,9 +78,10 @@ void BGCCacheContext::set(const XFontStruct * const _font) {
 }
 
 
-BGCCache::BGCCache(const BaseDisplay * const _display)
+BGCCache::BGCCache(const BaseDisplay * const _display,
+                   unsigned int screen_count)
   : display(_display),  context_count(128u),
-    cache_size(16u), cache_buckets(8u),
+    cache_size(16u), cache_buckets(8u * screen_count),
     cache_total_size(cache_size * cache_buckets) {
 
   contexts = new BGCCacheContext*[context_count];
@@ -117,10 +118,8 @@ BGCCacheContext *BGCCache::nextContext(unsigned int scr) {
       c->used = false;
       c->screen = scr;
     }
-    if (! c->used && c->screen == scr) {
-      c->used = true;
+    if (! c->used && c->screen == scr)
       return c;
-    }
   }
 
   fprintf(stderr, "BGCCache: context fault!\n");
@@ -141,15 +140,18 @@ BGCCacheItem *BGCCache::find(const BColor &_color,
   const unsigned int screen = _color.screen();
   const int key = _color.red() ^ _color.green() ^ _color.blue();
   int k = (key % cache_size) * cache_buckets;
-  int i = 0; // loop variable
+  unsigned int i = 0; // loop variable
   BGCCacheItem *c = cache[ k ], *prev = 0;
 
-  // this will either loop 8 times then return/abort or it will stop matching
+  /*
+    this will either loop cache_buckets times then return/abort or
+    it will stop matching
+  */
   while (c->ctx &&
          (c->ctx->pixel != pixel || c->ctx->function != _function ||
           c->ctx->subwindow != _subwindow || c->ctx->screen != screen ||
           c->ctx->linewidth != _linewidth)) {
-    if (i < 7) {
+    if (i < (cache_buckets - 1)) {
       prev = c;
       c = cache[ ++k ];
       ++i;
@@ -164,14 +166,13 @@ BGCCacheItem *BGCCache::find(const BColor &_color,
       return c;
     }
     // cache fault!
-    fprintf(stderr, "BGCCache: cache fault\n");
+    fprintf(stderr, "BGCCache: cache fault, count: %d, screen: %d, item screen: %d\n", c->count, screen, c->ctx->screen);
     abort();
   }
 
-  const unsigned long fontid = _font ? _font->fid : 0;
   if (c->ctx) {
     // reuse existing context
-    if (fontid && fontid != c->ctx->fontid)
+    if (_font && _font->fid && _font->fid != c->ctx->fontid)
       c->ctx->set(_font);
     c->count++;
     c->hits++;
diff --git a/src/GCCache.hh b/src/GCCache.hh
index e7a6c2b7..614eac1d 100644
--- a/src/GCCache.hh
+++ b/src/GCCache.hh
@@ -83,7 +83,7 @@ private:
 
 class BGCCache {
 public:
-  explicit BGCCache(const BaseDisplay * const _display);
+  BGCCache(const BaseDisplay * const _display, unsigned int screen_count);
   ~BGCCache(void);
 
   // cleans up the cache
diff --git a/src/Window.cc b/src/Window.cc
index 2e465a0b..72643c2d 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2971,10 +2971,10 @@ void BlackboxWindow::configureRequestEvent(const XConfigureRequestEvent *cr) {
                                  frame.margin.top + frame.margin.bottom);
 
       /*
-        if a position change ha been specified, then that position will be used
-        instead of determining a position based on the window's gravity.
+        if a position change has been specified, then that position will be
+        used instead of determining a position based on the window's gravity.
       */
-      if (cr->value_mask & (CWX | CWY)) {
+      if (! (cr->value_mask & (CWX | CWY))) {
         Corner corner;
         switch (client.win_gravity) {
         case NorthEastGravity:
@@ -4119,11 +4119,17 @@ void BlackboxWindow::constrain(Corner anchor,
     base_height = (client.base_height) ? client.base_height :
                                          client.min_height;
 
-  // constrain
-  if (dw < client.min_width) dw = client.min_width;
-  if (dh < client.min_height) dh = client.min_height;
-  if (dw > client.max_width) dw = client.max_width;
-  if (dh > client.max_height) dh = client.max_height;
+  // constrain, but only if the min/max are being used. if they aren't, then
+  // this resize is going to be from a ConfigureRequest because the window
+  // isn't allowed to be resized by the user. And in that case, we don't want
+  // to limit what the app can do
+  if (client.max_width > client.min_width ||
+      client.max_height > client.min_height) {
+    if (dw < client.min_width) dw = client.min_width;
+    if (dh < client.min_height) dh = client.min_height;
+    if (dw > client.max_width) dw = client.max_width;
+    if (dh > client.max_height) dh = client.max_height;
+  }
 
   assert(dw >= base_width && dh >= base_height);
 
diff --git a/util/bsetbg b/util/bsetbg
index fda6022d..2184618a 100644
--- a/util/bsetbg
+++ b/util/bsetbg
@@ -106,6 +106,7 @@ $me $version $copyright
   -full <file>             stretch an image to fill the desktop
   -exec <args> <file>      specify an external command to execute
   
+  -app  <app>              specify the image application to use
   -post <string>           arguments to be passed to the post-command
   -debug                   prints commands without executing them
 EOF
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 98a5bfd4..460dc350 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,4 +1,4 @@
-// -*- mode++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 // bsetroot.cc for Blackbox - an X11 Window manager
 // Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh at debian.org>
 // Copyright (c) 1997 - 2000, 2002 Brad Hughes <bhughes at trolltech.com>
@@ -352,7 +352,7 @@ void bsetroot::usage(int exit_code) {
 		 "%s 2.0\n\n"
 		 "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n"
 		 "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n"
-		 "  -display <string>        display connection\n"
+		 "  -display <string>        use display connection\n"
 		 "  -mod <x> <y>             modula pattern\n"
 		 "  -foreground, -fg <color> modula foreground color\n"
 		 "  -background, -bg <color> modula background color\n\n"