Commit: 269858896c525db67e6b4a35be523563debfa417 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revisão: 269858896c525db67e6b4a35be523563debfa417 (tree)
• Hora: 2000-09-29 00:19:02
• Autor: john <john>
• Commiter: john

Mensagem de Log

merged bug fixes from HEAD for 0.31.1

Mudança Sumário

• modified: ChangeLog
• modified: configure.in
• modified: lisp/ChangeLog
• modified: lisp/sawfish/gtk/ChangeLog
• modified: lisp/sawfish/gtk/widget.jl
• modified: lisp/sawfish/ui/ChangeLog
• modified: lisp/sawfish/ui/layout.jl
• modified: lisp/sawfish/ui/widgets/event.jl
• modified: lisp/sawfish/ui/widgets/keymap.jl
• modified: lisp/sawfish/wm/commands/x-cycle.jl
• modified: lisp/sawfish/wm/custom.jl
• modified: lisp/sawfish/wm/ext/shade-hover.jl
• modified: lisp/sawfish/wm/frames.jl
• modified: lisp/sawfish/wm/util/decode-events.jl
• modified: lisp/sawfish/wm/windows.jl
• modified: man/news.texi
• modified: po/README
• modified: po/sawfish-xgettext
• modified: src/ChangeLog

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
[phone]  John Harper  <[e-mail]>
+
+	* configure.in: version 0.31.1
+
+	* po/uk.po, po/sv.po, po/pt_BR.po, po/no.po, po/de.po,
+	po/da.po: updated from cvs.gnome.org (uk: Yuri Syrota, sv:
+	Johan Dahlin, pt_BR: Rui Miguel Silva Seabra, no: Kjartan
+	Maraas, de: Christian Meyer, da: Kenneth Christiansen)
+
 2000-09-25  John Harper  <[e-mail]>
 
 	* po/fr.po: update from Christian Marillat
 	<[e-mail]>
 
-	* po/sawfish-xgettext: grok how :tooltip's are embedded into
-	doc strings of customization options
-
 2000-09-20  John Harper  <[e-mail]>
 
 	* configure.in: version 0.31

--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(etc)
 
 dnl Release versioning info
-version="0.31"
+version="0.31.1"
 
 output_files="src/Makefile lisp/Makefile scripts/Makefile themes/Makefile\
  lisp/sawfish/ui/Makefile lisp/sawfish/gtk/Makefile sounds/Makefile\

--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,41 +1,8 @@
-2000-09-26  John Harper  <[e-mail]>
-
-	* sawfish/wm/commands/x-cycle.jl: don't pass EVENT parameter
-	between commands. Export cycle-next function
-
-	* sawfish/wm/commands/x-cycle.jl: the reverse key is now used
-	to cycle one step `backwards'. The cycle-windows function now
-	has a keyword arg STEP defining the direction (and magnitude)
-	of cycle steps
-
-	* sawfish/wm/util/decode-events.jl (modifier-keysym-p): new
-	function
-
-	* sawfish/wm/commands/x-cycle.jl (cycle-windows): add the
-	modifiers of the invoking event to the cycle-reverse-event when
-	creating its binding
-
-	* sawfish/wm/util/decode-events.jl (decode-event): use a `do'
-	statement instead of while and setq
-
 2000-09-25  John Harper  <[e-mail]>
 
-	* sawfish/wm/commands/x-cycle.jl (cycle-reverse-event): new
-	option, the name of the event that causes cycling to reverse
-	direction. (My rationale is that this is less fiddly to use
-	than, e.g., making M-S-TAB go backwards, and also is cleaner to
-	implement)
-
 	* sawfish/wm/misc.jl (current-head): fall back to checking the
 	pointer position if no head is found for the window
 
-	* sawfish/wm/windows.jl, sawfish/wm/frames.jl,
-	sawfish/wm/ext/shade-hover.jl: added some :tooltip's
-
-	* sawfish/wm/custom.jl (defcustom): new keyword `:tooltip
-	STRING'. Embed it into the doc string (following a `\n\n'
-	marker)
-
 2000-09-23  John Harper  <[e-mail]>
 
 	* sawfish/wm/ext/3d-hack.jl: export 3d-make-cube and

--- a/lisp/sawfish/gtk/ChangeLog
+++ b/lisp/sawfish/gtk/ChangeLog
@@ -1,9 +1,3 @@
-2000-09-25  John Harper  <[e-mail]>
-
-	* widget.jl (tooltip-split, tooltip-set): new functions
-	(make-widget): if the widget advertised that it takes a doc
-	string, then handle any tooltip embedded in that string
-
 2000-09-20  John Harper  <[e-mail]>
 
 	* version 0.31

--- a/lisp/sawfish/gtk/widget.jl
+++ b/lisp/sawfish/gtk/widget.jl
@@ -36,8 +36,6 @@
 	    widget-valid-p
 	    call-callback
 	    make-signal-callback
-	    tooltip-split
-	    tooltip-set
 	    set-widget-enabled
 	    enable-widget
 	    disable-widget
@@ -46,8 +44,7 @@
 
     ((open rep
 	   gui.gtk
-	   rep.system
-	   rep.regexp)
+	   rep.system)
      (access rep.structures))
 
   (defconst box-spacing 4)
@@ -131,11 +128,7 @@
 		    (widget-type-constructor 'unknown))))
       (if maker
 	  (if (and doc-string (widget-accepts-doc-string-p type))
-	      (let* ((split (tooltip-split doc-string))
-		     (widget (apply maker callback (car split) (cdr cell))))
-		(when (cdr split)
-		  (tooltip-set (widget-gtk-widget widget) (cdr split)))
-		widget)
+	      (apply maker callback doc-string (cdr cell))
 	    (apply maker callback (cdr cell)))
 	(error "No widget of type %s" type))))
 
@@ -166,23 +159,6 @@
   (define (make-signal-callback fun) (lambda () (call-callback fun)))
 
 
-;;; tooltip support
-
-  (define tooltips)
-
-  ;; returns (LABEL-STRING . TOOLTIP-STRING-OR-NIL)
-  (define (tooltip-split doc)
-    (if (string-match "\n\n\\s*" doc)
-	(cons (substring doc 0 (match-start))
-	      (substring doc (match-end)))
-      (cons doc nil)))
-
-  (define (tooltip-set widget tip-string #!optional (key "Foo"))
-    (unless tooltips
-      (setq tooltips (gtk-tooltips-new)))
-    (gtk-tooltips-set-tip tooltips widget tip-string key))
-
-
 ;;; Predefined widget constructors
 
   (define (make-choice-item changed-callback . options)

--- a/lisp/sawfish/ui/ChangeLog
+++ b/lisp/sawfish/ui/ChangeLog
@@ -1,14 +1,3 @@
-2000-09-25  John Harper  <[e-mail]>
-
-	* widgets/keymap.jl (make-keymap:binding-item): add a `Key:'
-	label to the event widget
-
-	* widgets/event.jl (make-event-item): don't prefix the widget
-	with a `Key:' label, it's more useful without it
-
-	* layout.jl (document-slot): handle adding any tooltip embedded
-	in the slots documentation string
-
 2000-09-20  John Harper  <[e-mail]>
 
 	* version 0.31

--- a/lisp/sawfish/ui/layout.jl
+++ b/lisp/sawfish/ui/layout.jl
@@ -98,26 +98,18 @@
     (let ((doc (slot-doc slot)))
       (if (null doc)
 	  (slot-gtk-widget slot)
+	(setq doc (remove-newlines doc))
 	(let ((hbox (gtk-hbox-new nil box-spacing))
-	      (split (tooltip-split doc)))
-	  (setq doc (remove-newlines (car split)))
-	  (let ((break (if (string-match "\\\\w" doc)
-			   (match-start)
-			 -2)))
-	    (when (> break 0)
-	      (gtk-box-pack-start hbox (make-label (substring doc 0 break))))
-	    (gtk-box-pack-start hbox (slot-gtk-widget slot))
-	    (when (< break (length doc))
-	      (gtk-box-pack-start
-	       hbox (make-label (substring doc (+ break 2)))))
-	    (when (cdr split)
-	      ;; tooltips need a window to receive events..
-	      (let ((ebox (gtk-event-box-new)))
-		(gtk-container-add ebox hbox)
-		(setq hbox ebox))
-	      (tooltip-set hbox (cdr split)))
-	    (gtk-widget-show-all hbox)
-	    hbox)))))
+	      (break (if (string-match "\\\\w" doc)
+			 (match-start)
+		       -2)))
+	  (when (> break 0)
+	    (gtk-box-pack-start hbox (make-label (substring doc 0 break))))
+	  (gtk-box-pack-start hbox (slot-gtk-widget slot))
+	  (when (< break (length doc))
+	    (gtk-box-pack-start hbox (make-label (substring doc (+ break 2)))))
+	  (gtk-widget-show-all hbox)
+	  hbox))))
 
   (define (remove-newlines string)
     (let loop ((point 0)

--- a/lisp/sawfish/ui/widgets/event.jl
+++ b/lisp/sawfish/ui/widgets/event.jl
@@ -34,6 +34,7 @@
 	  (grab (gtk-button-new-with-label (_ "Grab...")))
 	  (hbox (gtk-hbox-new nil box-spacing)))
 
+      (gtk-box-pack-start hbox (gtk-label-new (_ "Key:")))
       (gtk-container-add hbox entry)
       (gtk-box-pack-end hbox grab)
       (gtk-widget-show-all hbox)

--- a/lisp/sawfish/ui/widgets/keymap.jl
+++ b/lisp/sawfish/ui/widgets/keymap.jl
@@ -37,7 +37,8 @@
   (define (make-keymap-item changed-callback)
 
     (define (print x)
-      (let ((command (car x)))
+      (let ((command (car x))
+	    (key (cdr x)))
 	(list (cdr x)
 	      (if (consp command)
 		  (concat (beautify-symbol-name (command-name command))
@@ -81,8 +82,7 @@
 ;;; widget for editing individual bindings
 
   (define (make-keymap:binding-item changed-callback)
-    (make-widget `(pair command (labelled ,(_ "Key:") event) t t)
-		 changed-callback))
+    (make-widget '(pair command event t t) changed-callback))
 
   (define-widget-type 'keymap:binding make-keymap:binding-item)
 

--- a/lisp/sawfish/wm/commands/x-cycle.jl
+++ b/lisp/sawfish/wm/commands/x-cycle.jl
@@ -68,8 +68,7 @@
     (export cycle-windows
 	    cycle-group
 	    cycle-prefix
-	    cycle-class
-	    cycle-next)
+	    cycle-class)
 
     (open rep
 	  rep.system
@@ -98,13 +97,6 @@
   ;;###autoload (defgroup cycle "Window Cycling" :group focus :require sawfish.wm.commands.x-cycle)
   (defgroup cycle "Window Cycling" :group focus :require sawfish.wm.commands.x-cycle)
 
-  (defcustom cycle-reverse-event "SPC"
-    "Reversal key: \\w"
-    :tooltip "The key used to cycle in the reverse direction. Has the active \
-modifiers added to it."
-    :group (focus cycle)
-    :type event)
-
   (defcustom cycle-show-window-names t
     "Display window names while cycling through windows."
     :group (focus cycle)
@@ -152,34 +144,14 @@ modifiers added to it."
 
 ;; variables
 
-  ;; the current window
   (define x-cycle-current (make-fluid))
-
-  ;; the original stacking order
   (define x-cycle-stacking (make-fluid))
-
-  ;; the list of windows being cycled through
   (define x-cycle-windows (make-fluid))
 
 
 ;;; code
 
-  (define (forwards lst elt count)
-    (let ((total (length lst))
-	  (current (let loop ((rest lst) (i 0))
-		     (cond ((null rest) 0)
-			   ((eq (car rest) elt) i)
-			   (t (loop (cdr rest) (1+ i)))))))
-      (nth (mod (+ current count) total) lst)))
-
-  (define (merge-unsorted x y)
-    (let loop ((rest y)
-	       (out x))
-      (cond ((null rest) out)
-	    ((memq (car rest) out) (loop (cdr rest) out))
-	    (t (loop (cdr rest) (cons (car rest) out))))))
-
-  (define ((cycle-next count))
+  (define (next)
     (let ((win (window-order (if cycle-all-workspaces
 				 nil
 			       current-workspace)
@@ -205,9 +177,9 @@ modifiers added to it."
       (when (fluid x-cycle-stacking)
 	(restack-windows (fluid x-cycle-stacking))
 	(fluid-set x-cycle-stacking nil))
-      (if (fluid x-cycle-current)
-	  (setq win (forwards win (fluid x-cycle-current) count))
-	(setq win (car win)))
+      (when (fluid x-cycle-current)
+	(setq win (or (cdr (memq (fluid x-cycle-current) win)) win)))
+      (setq win (car win))
       (fluid-set x-cycle-current win)
       (when (not (window-get win 'sticky))
 	(select-workspace (nearest-workspace-with-window
@@ -230,14 +202,13 @@ modifiers added to it."
 
   (define (x-cycle-exit) (throw 'x-cycle-exit t))
 
-  (define (cycle-windows #!optional windows (step +1))
+  (define (cycle-windows event #!optional windows)
     "Cycle through all windows in order of recent selections."
     (let ((tail-command nil))
       (let-fluids ((x-cycle-current nil)
 		   (x-cycle-stacking nil)
 		   (x-cycle-windows (or windows t)))
-	(let* ((event (current-event))
-	       (decoded (decode-event event))
+	(let* ((decoded (decode-event event))
 	       (modifier-keys (apply append (mapcar modifier->keysyms
 						    (nth 1 decoded))))
 	       (eval-modifier-events t)
@@ -264,8 +235,7 @@ modifiers added to it."
 	       (unbound-key-hook
 		(list (lambda ()
 			(let ((ev (decode-event (current-event))))
-			  (unless (or (memq 'release (nth 1 ev))
-				      (modifier-keysym-p (nth 2 ev)))
+			  (unless (memq 'release (nth 1 ev))
 			    ;; want to search the usual keymaps
 			    (setq override-keymap nil)
 			    (setq tail-command (lookup-event-binding
@@ -282,21 +252,7 @@ modifiers added to it."
 		   this-command))
 
 	  ;; Use the event that invoked us to contruct the keymap
-	  (bind-keys override-keymap event (cycle-next step))
-
-	  ;; add the reverse key
-	  (when cycle-reverse-event
-	    (condition-case nil
-		;; merge the modifiers of the cycle-reverse-event
-		;; and the decoded current-event
-		(let* ((in (decode-event (lookup-event cycle-reverse-event)))
-		       (out (encode-event (list (car in)
-						(merge-unsorted (cadr in)
-								(cadr decoded))
-						(caddr in)))))
-		  (bind-keys override-keymap out (cycle-next (- step))))
-	      (error nil)))
-
+	  (bind-keys override-keymap event next)
 	  (mapc (lambda (k)
 		  (bind-keys override-keymap
 		    (encode-event `(key (release any) ,k)) x-cycle-exit))
@@ -308,7 +264,7 @@ modifiers added to it."
 		(progn
 		  (catch 'x-cycle-exit
 		    ;; do the first step
-		    ((cycle-next step))
+		    (next)
 		    (recursive-edit))
 		  (when (fluid x-cycle-current)
 		    (display-window (fluid x-cycle-current))))
@@ -324,13 +280,13 @@ modifiers added to it."
 
 ;;; variants
 
-  (define (cycle-group w #!optional (step +1))
+  (define (cycle-group event w)
     "Cycle through all windows in the same group as the current window."
     (let ((windows (windows-in-group w)))
       (when windows
-	(cycle-windows windows step))))
+	(cycle-windows event windows))))
 
-  (define (cycle-prefix w #!optional (step +1))
+  (define (cycle-prefix event w)
     "Cycle through all windows whose names match the leading colon-delimited
 prefix of the current window."
     (when (string-match "^([^:]+)\\s*:" (window-name w))
@@ -340,18 +296,18 @@ prefix of the current window."
 		       (lambda (x)
 			 (string-match re (window-name x))))))
 	(when windows
-	  (cycle-windows windows step)))))
+	  (cycle-windows event windows)))))
 
-  (define (cycle-class w #!optional (step +1))
+  (define (cycle-class event w)
     "Cycle through all windows with the same class as the current window."
     (let ((class (window-class w)))
       (let ((windows (filter-windows (lambda (x)
 				       (equal (window-class x) class)))))
 	(when windows
-	  (cycle-windows windows step)))))
+	  (cycle-windows event windows)))))
 
   ;;###autoload
-  (define-command 'cycle-windows cycle-windows)
-  (define-command 'cycle-group cycle-group #:spec "%W")
-  (define-command 'cycle-prefix cycle-prefix #:spec "%W")
-  (define-command 'cycle-class cycle-class #:spec "%W"))
+  (define-command 'cycle-windows cycle-windows #:spec "e")
+  (define-command 'cycle-group cycle-group #:spec "e\n%W")
+  (define-command 'cycle-prefix cycle-prefix #:spec "e\n%W")
+  (define-command 'cycle-class cycle-class #:spec "e\n%W"))

--- a/lisp/sawfish/wm/custom.jl
+++ b/lisp/sawfish/wm/custom.jl
@@ -138,13 +138,9 @@ custom-set and custom-get may be used to translate data types to the
 string representation required by some widget types. custom-widget may
 construct the widget definition passed to the ui backend."
 
-    (let* ((cell (memq ':tooltip keys))
-	   (tooltip (cadr cell)))
-      (when cell
-	(setq keys (delq (car cell) (delq (cadr cell) keys))))
-      `(progn
-	 (defvar ,symbol ,value ,(if tooltip (concat doc "\n\n" tooltip) doc))
-	 (custom-declare-variable ',symbol ,(custom-quote-keys keys)))))
+    `(progn
+       (defvar ,symbol ,value ,doc)
+       (custom-declare-variable ',symbol ,(custom-quote-keys keys))))
 
   (defmacro defgroup (symbol doc #!rest keys)
     "Declare a new custom group called SYMBOL, with English name DOC. The

--- a/lisp/sawfish/wm/ext/shade-hover.jl
+++ b/lisp/sawfish/wm/ext/shade-hover.jl
@@ -38,8 +38,8 @@
     :require sawfish.wm.ext.shade-hover)
 
   (defcustom shade-hover-mode nil
-    "Enable shade-hover mode."
-    :tooltip "(Temporarily unshades windows while the mouse pointer is over them.)"
+    "Enable shade-hover mode.
+(Temporarily unshade windows while pointer is over them.)"
     :group (focus shade-hover)
     :type boolean
     :user-level novice

--- a/lisp/sawfish/wm/frames.jl
+++ b/lisp/sawfish/wm/frames.jl
@@ -170,9 +170,8 @@ that overrides settings set elsewhere.")
       (shaded-transient . shaped-transient)
       (icon . shaped-transient)
       (dock . icon))
-    "Frame type fallbacks."
-    :tooltip "Associate frame types with type to try if the theme doesn't \
-implement the requested type."
+    "Associate frame types with type to try if the theme doesn't implement the
+requested type."
     :type (alist ((symbol default shaped transient
 			  shaped-transient icon doc) "From")
 		 ((symbol default shaped transient
@@ -236,7 +235,7 @@ deciding which frame type to ask a theme to generate.")
     :after-set (lambda () (after-setting-frame-option)))
 
   (defcustom default-bevel-percent nil
-    "Bevel intensity: \\wpercent."
+    "Intensity of bevels: \\wpercent."
     :group appearance
     :type (number 0 100)
     :user-level expert

--- a/lisp/sawfish/wm/util/decode-events.jl
+++ b/lisp/sawfish/wm/util/decode-events.jl
@@ -25,7 +25,6 @@
 	    encode-event
 	    string->keysym
 	    modifier->keysyms
-	    modifier-keysym-p
 	    should-grab-button-event-p)
 
     (open rep
@@ -41,14 +40,15 @@ cell). The symbolic description has the form `(TYPE MODIFIER-LIST ACTION)'."
 
 	   (decode-mods
 	    (lambda ()
-	      (let ((out '()))
-		(do ((i 0 (1+ i)))
-		    ((= i 13))
+	      (let (i out)
+		(setq i 0)
+		(while (< i 13)
 		  (when (not (zerop (logand mods (lsh 1 i))))
 		    (setq out (cons (aref [shift lock control mod-1 mod-2
 						 mod-3 mod-4 mod-5 button-1
 						 button-2 button-3 button-4
-						 button-5] i) out))))
+						 button-5] i) out)))
+		  (setq i (1+ i)))
 		(when (not (zerop (logand mods (lsh 1 20))))
 		  (setq out (cons 'meta out)))
 		(when (not (zerop (logand mods (lsh 1 21))))
@@ -125,14 +125,6 @@ representing the X11 keysyms that may generate the modifier."
 	   '(Control_L Control_R))
 	  (t (error "Unknown modifier: %s" modifier))))
 
-  (define (modifier-keysym-p keysym)
-    "Returns true if KEYSYM is a modifier keysym."
-    (or (memq keysym '(Shift_L Shift_R Control_L Control_R))
-	(member (symbol-name keysym) alt-keysyms)
-	(member (symbol-name keysym) meta-keysyms)
-	(member (symbol-name keysym) hyper-keysyms)
-	(member (symbol-name keysym) super-keysyms)))
-
   (define (should-grab-button-event-p event keymap)
     (let* ((decoded (decode-event event))
 	   (variants (mapcar (lambda (action)

--- a/lisp/sawfish/wm/windows.jl
+++ b/lisp/sawfish/wm/windows.jl
@@ -60,23 +60,20 @@
 
   (defcustom ignore-window-input-hint t
     "Give focus to windows even when they haven't asked for it."
-    :tooltip "Windows should set the `accepts input' hint in their WM_HINTS
-property to show if they require the focus or not. Many windows don't do
-this, hence this option."
     :type boolean
     :user-level expert
     :group focus)
 
   (defcustom warp-to-window-x-offset -1
-    "Offset (%) from left window edge when warping pointer."
-    :tooltip "A negative number means outside the left window edge."
+    "Offset (%) from left window edge when warping pointer.
+A negative number means outside the left window edge."
     :type (number -65536 65535)
     :user-level expert
     :group focus)
  
   (defcustom warp-to-window-y-offset -1
-    "Offset (%) from top window edge when warping pointer."
-    :tooltip "A negative number means outside the top window edge."
+    "Offset (%) from top window edge when warping pointer.
+A negative number means outside the top window edge."
     :type (number -65536 65535)
     :user-level expert
     :group focus)
@@ -88,8 +85,8 @@ this, hence this option."
     "When non-nil, any unspecified windows are avoided by default.")
 
   (defcustom uniquify-name-format "%s [%d]"
-    "Format to create unique window names."
-    :tooltip "Has two arguments (NAME INDEX) applied to it."
+    "Format to create unique window names. Has two arguments (NAME INDEX)
+applied to it."
     :type string
     :user-level expert
     :group misc)

--- a/man/news.texi
+++ b/man/news.texi
@@ -6,6 +6,28 @@ This lists the user-visible changes made to Sawfish, and which releases
 they occurred between. For more detailed information see the
 @file{ChangeLog} files in the Sawfish source tree.
 
+@heading 0.31.1
+
+@itemize @bullet
+
+@item Translation updates: da (Kenneth Christiansen), de (Christian
+Meyer), no (Kjartan Maraas), pt_BR (Rui Miguel Silva Seabra), sv (Johan
+Dahlin), uk (Yuri Syrota)
+
+@item Bug fixes:
+
+@itemize @minus
+@item Fixed typos in @code{sawfish.wm.gnome.integration} and
+@code{sawfish-themer} (Christian Marillat)
+
+@item Fixed bug when building on Tru64 (John H. Palmieri)
+
+@item Remember to check return value when initializing Imlib
+@end itemize
+
+@end itemize
+
+
 @heading 0.31
 
 @itemize @bullet

--- a/po/README
+++ b/po/README
@@ -5,31 +5,3 @@ gnome-i18n/extra-po/sawfish directory on cvs.gnome.org
 
 (I try to synchronize with that before each release)
 
-
-Notes about strings
-===================
-
-Sawfish uses some embedded control codes in strings (mostly in the
-configurator labels):
-
-`\\w'
-
-Marks where the widget will be inserted into the string. Often used
-with entry box and popup menu widgets to put the selected phrase in the
-middle of the label. If no `\\w' token exists the label is put before
-the widget.
-
-`\n\n'
-
-A double newline separates a widget's label from its (optional)
-tooltip. Be sure to preserve both newline characters!
-
-In po files this is usually formatted like:
-
-	msgid ""
-	"Label.\n"
-	"\n"
-	"Tooltip."
-	msgstr ""
-
-

--- a/po/sawfish-xgettext
+++ b/po/sawfish-xgettext
@@ -34,13 +34,8 @@ exec rep "$0" "$@"
 (define (helper form)
   (case (car form)
     ((defcustom)
-     (let ((doc (nth 3 form))
-	   (keys (nthcdr 4 form)))
-       (let ((tooltip (cadr (memq ':tooltip keys))))
-	 (when tooltip
-	   (setq doc (concat doc "\n\n" tooltip))))
-       (when (stringp doc)
-	 (register doc))))
+     (when (stringp (nth 3 form))
+       (register (nth 3 form))))
 
     ((defgroup)
      (let ((real-name (nth 3 form)))

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
[phone]  John Harper  <[e-mail]>
+
+	* fake-libexec: patch from John H. Palmieri
+	<[e-mail]> to link to libfoo.so as well as
+	foo.la (for Tru64?)
+
 2000-09-22  John Harper  <[e-mail]>
 
 	* images.c (images_init): check return value of imlib_init ()