new nls from bb-cvs

18 files changed, 100 insertions, 108 deletions

diff --git a/nls/C/BaseDisplay.m b/nls/C/BaseDisplay.m
index f7f3d9b4..584e771b 100644
--- a/nls/C/BaseDisplay.m
+++ b/nls/C/BaseDisplay.m
@@ -1,16 +1,16 @@
 $set 1 #BaseDisplay
 
 $ #XError
-# %s:  X error: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
+# %s:  X fejl: %s(%d) kode %d/%d\n  resource 0x%lx\n
 $ #SignalCaught
-# %s: signal %d caught\n
+# %s: signal %d fanget\n
 $ #ShuttingDown
-# shutting down\n
+# lukker ned\n
 $ #Aborting
-# aborting... dumping core\n
+# Avbryder... dumper kernen\n
 $ #XConnectFail
-# BaseDisplay::BaseDisplay: connection to X server failed.\n
+# BaseDisplay::BaseDisplay: tilslutning til X server mislykkedes.\n
 $ #CloseOnExecFail
-# BaseDisplay::BaseDisplay: couldn't mark display connection as close-on-exec\n
+# BaseDisplay::BaseDisplay: kunne ikke markere skærmtilslutning som luk-ved-afslut\n
 $ #BadWindowRemove
-# BaseDisplay::eventLoop(): removing bad window from event queue\n
+# BaseDisplay::eventLoop(): fjerner dårligt vindue fra hændelseskøen\n
diff --git a/nls/C/Basemenu.m b/nls/C/Basemenu.m
index e7867249..6c4da308 100644
--- a/nls/C/Basemenu.m
+++ b/nls/C/Basemenu.m
@@ -1,4 +1,4 @@
 $set 2 #Basemenu
 
-$ #OpenboxMenu
-# Openbox Menu
+$ #BlackboxMenu
+# Blackbox Menu
diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m
index f6b422a2..7fef82da 100644
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@ -22,18 +22,14 @@ $ #SloppyFocus
 # Sloppy Focus
 $ #AutoRaise
 # Auto Raise
+$ #ClickRaise
+# Click Raise
 $ #SmartRows
 # Smart Placement (Rows)
 $ #SmartCols
 # Smart Placement (Columns)
 $ #Cascade
 # Cascade Placement
-$ #BestFit
-# Best Fit Placement
-$ #UnderMouse
-# Under Mouse Placement
-$ #ClickMouse
-# Click Mouse Placement
 $ #LeftRight
 # Left to Right
 $ #RightLeft
@@ -42,5 +38,3 @@ $ #TopBottom
 # Top to Bottom
 $ #BottomTop
 # Bottom to Top
-$ #HideToolbar
-# Hide Toolbar
diff --git a/nls/C/Icon.m b/nls/C/Icon.m
index 54b96a63..e3630b47 100644
--- a/nls/C/Icon.m
+++ b/nls/C/Icon.m
@@ -1,4 +1,6 @@
 $set 4 #Icon
 
 $ #Icons
-# Icons
+# Ikoner
+$ #Unnamed
+# Intet navn
diff --git a/nls/C/Image.m b/nls/C/Image.m
index 5dd251a6..57562eb7 100644
--- a/nls/C/Image.m
+++ b/nls/C/Image.m
@@ -1,24 +1,24 @@
 $set 5 #Image
 
 $ #ErrorCreatingSolidPixmap
-# BImage::render_solid: error creating pixmap\n
+# BImage::render_solid: fejl ved skabelse af pixmap\n
 $ #ErrorCreatingXImage
-# BImage::renderXImage: error creating XImage\n
+# BImage::renderXImage: fejl ved skabelse af XImage\n
 $ #UnsupVisual
-# BImage::renderXImage: unsupported visual\n
+# BImage::renderXImage: ikke support for farvedybden\n
 $ #ErrorCreatingPixmap
-# BImage::renderPixmap: error creating pixmap\n
+# BImage::renderPixmap: fejl ved skabelse af pixmap\n
 $ #InvalidColormapSize
-# BImageControl::BImageControl: invalid colormap size %d (%d/%d/%d) - reducing\n
+# BImageControl::BImageControl: ugyldigt farvekort størrelse %d (%d/%d/%d) - reducing\n
 $ #ErrorAllocatingColormap
-# BImageControl::BImageControl: error allocating colormap\n
+# BImageControl::BImageControl: fejl ved allokering af farvekort\n
 $ #ColorAllocFail
-# BImageControl::BImageControl: failed to alloc color %d/%d/%d\n
+# BImageControl::BImageControl: fejl ved allokering af farve %d/%d/%d\n
 $ #PixmapRelease
-# BImageControl::~BImageControl: pixmap cache - releasing %d pixmaps\n
+# BImageControl::~BImageControl: pixmap cache - sletter %d pixmaps\n
 $ #PixmapCacheLarge
-# BImageControl::renderImage: cache is large, forcing cleanout\n
+# BImageControl::renderImage: cache er for stor, gennemtvinger rensning\n
 $ #ColorParseError
-# BImageControl::getColor: color parse error: '%s'\n
+# BImageControl::getColor: farvefejl: '%s'\n
 $ #ColorAllocError
-# BImageControl::getColor: color alloc error: '%s'\n
+# BImageControl::getColor: farveallokeringsfejl: '%s'\n
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 36ccd676..6674611b 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,29 +1,31 @@
-# nls/C/Makefile.am for Openbox
+# nls/C/Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
-CLEANFILES = openbox.cat
+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@/openbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.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: Translation.m openbox.cat
-install-data-local: openbox.cat
+all-local: Translation.m blackbox.cat
+install-data-local: blackbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
 		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
-		$(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
+		$(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
 		ln -f -ss C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/blackbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
@@ -32,16 +34,16 @@ uninstall-local:
 	fi
 
 # note... when adding new catalogs... you do not need the
-# header=../openbox-nls.h which is passed to awk... we
+# header=../blackbox-nls.hh which is passed to awk... we
 # only need to generate it once.
 
 Translation.m: $(MFILES)
-	awk -f @srcdir@/../convert.awk header=../openbox-nls.h \
+	awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
 		output=Translation.m $(MFILES)
 
-openbox.cat: Translation.m
+blackbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		$(gencat_cmd) openbox.cat Translation.m; \
+		$(gencat_cmd) blackbox.cat Translation.m; \
 	fi
 
 distclean-local:
diff --git a/nls/C/Screen.m b/nls/C/Screen.m
index f2be3d36..128c06e7 100644
--- a/nls/C/Screen.m
+++ b/nls/C/Screen.m
@@ -9,8 +9,6 @@ $ #FontLoadFail
 # BScreen::LoadStyle(): couldn't load font '%s'\n
 $ #DefaultFontLoadFail
 # BScreen::LoadStyle(): couldn't load default font.\n
-$ #DefaultStyleLoadFail
-# BScreen::LoadStyle(): couldn't load default style.\n
 $ #EmptyMenuFile
 # %s: empty menu file\n
 $ #xterm
diff --git a/nls/C/Slit.m b/nls/C/Slit.m
index 0e5e3a4f..e207e29d 100644
--- a/nls/C/Slit.m
+++ b/nls/C/Slit.m
@@ -3,6 +3,6 @@ $set 7 #Slit
 $ #SlitTitle
 # Slit
 $ #SlitDirection
-# Slit Direction
+# Slit retning
 $ #SlitPlacement
-# Slit Placement
+# Slit placering
diff --git a/nls/C/Toolbar.m b/nls/C/Toolbar.m
index 93e26453..c889c94d 100644
--- a/nls/C/Toolbar.m
+++ b/nls/C/Toolbar.m
@@ -15,8 +15,8 @@ $ #NoStrftimeTimeFormatP
 $ #NoStrftimeTimeFormatA
 # a
 $ #ToolbarTitle
-# Toolbar
+# Værktøjsbjælke
 $ #EditWkspcName
-# Edit current workspace name
+# Andring af skrivebordets navn
 $ #ToolbarPlacement
-# Toolbar Placement
+# Værktøjsbjælkens placering
diff --git a/nls/C/Window.m b/nls/C/Window.m
index 057593a3..9987b47c 100644
--- a/nls/C/Window.m
+++ b/nls/C/Window.m
@@ -2,16 +2,16 @@ $set 9 #Window
 
 
 $ #Creating
-# OpenboxWindow::OpenboxWindow: creating 0x%lx\n
+# BlackboxWindow::BlackboxWindow: creating 0x%lx\n
 $ #XGetWindowAttributesFail
-# OpenboxWindow::OpenboxWindow: XGetWindowAttributres failed\n
+# BlackboxWindow::BlackboxWindow: XGetWindowAttributres failed\n
 $ #CannotFindScreen
-# OpenboxWindow::OpenboxWindow: cannot find screen for root window 0x%lx\n
+# BlackboxWindow::BlackboxWindow: cannot find screen for root window 0x%lx\n
 $ #Unnamed
 # Unnamed
 $ #MapRequest
-# OpenboxWindow::mapRequestEvent() for 0x%lx\n
+# BlackboxWindow::mapRequestEvent() for 0x%lx\n
 $ #UnmapNotify
-# OpenboxWindow::unmapNotifyEvent() for 0x%lx\n
-$ #UnmapNotifyReparent
-# OpenboxWindow::unmapnotifyEvent: reparent 0x%lx to root\n
+# BlackboxWindow::unmapNotifyEvent() for 0x%lx\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
diff --git a/nls/C/Windowmenu.m b/nls/C/Windowmenu.m
index 4bf90cf4..ebbf0adb 100644
--- a/nls/C/Windowmenu.m
+++ b/nls/C/Windowmenu.m
@@ -1,20 +1,20 @@
 $set 10 #Windowmenu
 
 $ #SendTo
-# Send To ...
+# Send til ...
 $ #Shade
-# Shade
+# Skygge
 $ #Iconify
-# Iconify
+# Iconificeret
 $ #Maximize
-# Maximize
+# Maksimer
 $ #Raise
-# Raise
+# Hæv
 $ #Lower
-# Lower
+# Sænk
 $ #Stick
-# Stick
+# Klæbrig
 $ #KillClient
-# Kill Client
+# Dræb klient
 $ #Close
-# Close
+# Luk
diff --git a/nls/C/Workspace.m b/nls/C/Workspace.m
index 315460a0..1093dda5 100644
--- a/nls/C/Workspace.m
+++ b/nls/C/Workspace.m
@@ -1,4 +1,4 @@
 $set 11 #Workspace
 
 $ #DefaultNameFormat
-# Workspace %d
+# Skrivebord %d
diff --git a/nls/C/Workspacemenu.m b/nls/C/Workspacemenu.m
index 5423a191..94317b85 100644
--- a/nls/C/Workspacemenu.m
+++ b/nls/C/Workspacemenu.m
@@ -1,8 +1,8 @@
 $set 12 #Workspacemenu
 
 $ #WorkspacesTitle
-# Workspaces
+# Skriveborde
 $ #NewWorkspace
-# New Workspace
+# Nyt skrivebord
 $ #RemoveLast
-# Remove Last
+# Fjern sidste
diff --git a/nls/C/blackbox.m b/nls/C/blackbox.m
new file mode 100644
index 00000000..74d09f6e
--- /dev/null
+++ b/nls/C/blackbox.m
@@ -0,0 +1,6 @@
+$set 13 #blackbox
+
+$ #NoManagableScreens
+# Blackbox::Blackbox: no managable screens found, aborting\n
+$ #MapRequest
+# Blackbox::process_event: MapRequest for 0x%lx\n
diff --git a/nls/C/bsetroot.m b/nls/C/bsetroot.m
index ddd7be6a..cd869ad6 100644
--- a/nls/C/bsetroot.m
+++ b/nls/C/bsetroot.m
@@ -1,16 +1,16 @@
 $set 16 #bsetroot
 
 $ #MustSpecify
-# %s: error: must specify one of: -solid, -mod, -gradient\n
+# %s: fejl: specificér en af følgende: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
-  -display <string>        display connection\n\
-  -mod <x> <y>             modula pattern\n\
-  -foreground, -fg <color> modula foreground color\n\
-  -background, -bg <color> modula background color\n\n\
-  -gradient <texture>      gradient texture\n\
-  -from <color>            gradient start color\n\
-  -to <color>              gradient end color\n\n\
-  -solid <color>           solid color\n\n\
-  -help                    print this help text and exit\n
+  -display <string>        skærmtilslutning\n\
+  -mod <x> <y>             modula mønster\n\
+  -foreground, -fg <color> modula foregrundsfarve\n\
+  -background, -bg <color> modula baggrundsfarve\n\n\
+  -gradient <texture>      gradient tekstur\n\
+  -from <color>            gradient start farve\n\
+  -to <color>              gradient slut farve\n\n\
+  -solid <color>           fast farve\n\n\
+  -help                    hvis denne hjælp og afslut\n
 
diff --git a/nls/C/common.m b/nls/C/common.m
index 53217029..6b545558 100644
--- a/nls/C/common.m
+++ b/nls/C/common.m
@@ -1,38 +1,38 @@
 $set 15 #Common
 
 $ #Yes
-# Yes
+# Ja
 $ #No
-# No
+# Nej
 
 $ #DirectionTitle
-# Direction
+# Retning
 $ #DirectionHoriz
-# Horizontal
+# Horisontal
 $ #DirectionVert
-# Vertical
+# Vertikal
 
 $ #AlwaysOnTop
-# Always on top
+# Altid øverst
 
 $ #PlacementTitle
-# Placement
+# Placering
 $ #PlacementTopLeft
-# Top Left
+# Øverste venstre hjørne
 $ #PlacementCenterLeft
-# Center Left
+# Venstre i midten
 $ #PlacementBottomLeft
-# Bottom Left
+# Bunden til venstre
 $ #PlacementTopCenter
-# Top Center
+# Toppen i midten
 $ #PlacementBottomCenter
-# BottomCenter
+# Bunden i midten
 $ #PlacementTopRight
-# Top Right
+# Øverst til højre
 $ #PlacementCenterRight
-# Center Right
+# Til højre i midten
 $ #PlacementBottomRight
-# Bottom Right
+# Til højre i bunden
 
 $ #AutoHide
-# Auto hide
+# Gem automatisk
diff --git a/nls/C/main.m b/nls/C/main.m
index 9174d9da..b16cbe88 100644
--- a/nls/C/main.m
+++ b/nls/C/main.m
@@ -2,26 +2,22 @@ $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
-# Openbox %s: (c) 2002 - 2002 Ben Jansens\n\
-  \t\t\t  2001 - 2002 Sean 'Shaleh' Perry\n\
-  \t\t\t  1997 - 2000 Brad Hughes\n\n\
+# Openbox %s : (c) 2002 - 2002 Ben Jansens\n\
+  \t\t\t 2001 - 2002, Sean 'Shaleh' Perry\n\n\
+  \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\
   -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\
-  Interlacing:\t\t\t%s\n\
   Shape:\t\t\t%s\n\
   Slit:\t\t\t\t%s\n\
-  8bpp Ordered Dithering:\t%s\n\
-  Event Clobbering:\t\t%s\n\n
+  Event Clobbering:\t\t%s\n\
+  8bpp Ordered Dithering:\t%s\n\n
diff --git a/nls/C/openbox.m b/nls/C/openbox.m
deleted file mode 100644
index 006d12b7..00000000
--- a/nls/C/openbox.m
+++ /dev/null
@@ -1,6 +0,0 @@
-$set 13 #openbox
-
-$ #NoManagableScreens
-# Openbox::Openbox: no managable screens found, aborting\n
-$ #MapRequest
-# Openbox::process_event: MapRequest for 0x%lx\n