diff -ru lisp-orig/sawfish/ui/layouts/keymaps.jl lisp/sawfish/ui/layouts/keymaps.jl
--- lisp-orig/sawfish/ui/layouts/keymaps.jl	Wed Nov 29 04:53:56 2000
+++ lisp/sawfish/ui/layouts/keymaps.jl	Fri Feb 23 17:52:53 2001
@@ -96,4 +96,4 @@
 	       (setq name (concat (substring name 0 (match-start))
 				  ?  (substring name (match-end)))))
 	     (aset name 0 (char-upcase (aref name 0)))
-	     name)))))
+	     (_ name))))))
diff -ru lisp-orig/sawfish/ui/shell.jl lisp/sawfish/ui/shell.jl
--- lisp-orig/sawfish/ui/shell.jl	Tue Nov 28 23:00:53 2000
+++ lisp/sawfish/ui/shell.jl	Sat Feb 24 01:16:53 2001
@@ -207,7 +207,7 @@
 	(let ((layout (layout-slots (group-layout group) slots)))
 	  (setq active-slots (nconc active-slots slots))
 	  (gtk-notebook-append-page
-	   book layout (gtk-label-new (group-real-name group)))
+	   book layout (gtk-label-new (_ (group-real-name group))))
 	  (when (gtk-container-p layout)
 	    (gtk-container-border-width layout box-border))))
       (mapc (lambda (sub)
diff -ru lisp-orig/sawfish/ui/widgets/keymap.jl lisp/sawfish/ui/widgets/keymap.jl
--- lisp-orig/sawfish/ui/widgets/keymap.jl	Tue Sep 26 00:15:26 2000
+++ lisp/sawfish/ui/widgets/keymap.jl	Fri Feb 23 17:48:19 2001
@@ -97,4 +97,4 @@
 	       (setq name (concat (substring name 0 (match-start))
 				  ?  (substring name (match-end)))))
 	     (aset name 0 (char-upcase (aref name 0)))
-	     name)))))
+	     (_ name))))))
diff -ru lisp-orig/sawfish/ui/widgets/match-window.jl lisp/sawfish/ui/widgets/match-window.jl
--- lisp-orig/sawfish/ui/widgets/match-window.jl	Mon Sep 11 12:44:42 2000
+++ lisp/sawfish/ui/widgets/match-window.jl	Sat Feb 24 13:17:19 2001
@@ -34,6 +34,10 @@
 
 
 ;;; the widget representing the `matchers' frame
+  (define (find2nd val thelist)
+    (let ((ret))
+       (mapc (lambda (x) (if (equal (car x) val) (setq ret (cdr x)))) thelist)
+        (nth 0 ret)))
 
   ;; (match-window:matchers x-properties)
 
@@ -41,20 +45,22 @@
     (let ((frame (gtk-frame-new (_ "Matchers")))
 	  (table (gtk-table-new matcher-count 3 nil))
 	  (widgets '()))
-
+	  (defvar i18-x-prop-name-alist 
+	    (mapcar (lambda (nm) (list (_ (cdr nm)) (cdr nm))) x-properties))
       (do ((i 0 (1+ i)))
 	  ((= i matcher-count))
 	(let ((combo (gtk-combo-new))
 	      (entry (gtk-entry-new))
 	      (button (gtk-button-new-with-label (_ "Grab..."))))
 	  (gtk-combo-set-popdown-strings
-	   combo (cons "" (mapcar cdr x-properties)))
+	   combo (cons "" (mapcar (lambda (cell) (_ (cdr cell))) x-properties)))
 	  (gtk-table-attach-defaults table combo 0 1 i (1+ i))
 	  (gtk-table-attach-defaults table entry 1 2 i (1+ i))
 	  (gtk-table-attach-defaults table button 2 3 i (1+ i))
 	  (gtk-signal-connect button "clicked"
 	   (lambda ()
-	     (let ((string (gtk-entry-get-text (gtk-combo-entry combo))))
+	     (let ((string (find2nd (gtk-entry-get-text (gtk-combo-entry combo)) 
+		    i18-x-prop-name-alist)))
 	       (when string
 		 (let ((prop (wm-grab-x-property string)))
 		   (gtk-entry-set-text entry (if (stringp prop)
@@ -95,7 +101,8 @@
 		       (value (gtk-entry-get-text (cdar cells))))
 		   (if (or (string= name "") (string= value ""))
 		       (loop (cdr cells) out)
-		     (let ((prop (rassoc name x-properties)))
+		     (let ((prop (rassoc (find2nd name i18-x-prop-name-alist) 
+			       x-properties)))
 		       (if prop
 			   (setq name (car prop))
 			 (setq name (intern name))))
@@ -183,7 +190,7 @@
 	       (setq name (concat (substring name 0 (match-start))
 				  ?  (substring name (match-end)))))
 	     (aset name 0 (char-upcase (aref name 0)))
-	     name))))
+	     (_ name)))))
 
 
 ;;; the main widget
diff -ru lisp-orig/sawfish/wm/ext/match-window.jl lisp/sawfish/wm/ext/match-window.jl
--- lisp-orig/sawfish/wm/ext/match-window.jl	Wed Nov 29 04:54:47 2000
+++ lisp/sawfish/wm/ext/match-window.jl	Fri Feb 16 13:32:58 2001
@@ -63,8 +63,8 @@
 
 
 ;;; configuration and customize stuff
-
-  (defvar match-window-x-properties
+  (defmacro i18ncardefvar (nm form) (list 'defvar nm form)) ;mark as translatable
+  (i18ncardefvar match-window-x-properties
     '((WM_NAME . "Name")
       (WM_CLASS . "Class")
       (WM_ICON_NAME . "Icon Name")
@@ -72,7 +72,7 @@
       (WM_COMMAND . "Command")
       (WM_LOCALE_NAME . "Locale")))
 
-  (defvar match-window-properties
+  (i18ncardefvar match-window-properties
     `((placement ,(_ "Placement")
        (avoid boolean)
        (ignore-program-position boolean)
diff -ru lisp-orig/sawfish/wm/ext/tooltips.jl lisp/sawfish/wm/ext/tooltips.jl
--- lisp-orig/sawfish/wm/ext/tooltips.jl	Mon Nov 27 22:17:18 2000
+++ lisp/sawfish/wm/ext/tooltips.jl	Sat Feb 24 00:17:08 2001
@@ -198,8 +198,8 @@
       (if (and tooltips-show-doc-strings command
 	       (symbolp command)
 	       (progn
-		 (require 'rep.lang.doc)
-		 (setq doc (documentation command))))
+		 (require 'sawfish.wm.commands) ;(documentation blah) gives nothing	
+		 (setq doc (command-documentation command))))
 	  (_ doc)
 	(format nil "%S" command))))