Synkning inför release av 0.46-BETA-K

src/ChangeLog

+Fri Jul 28 14:15:12 2000  David Byers  <davby@sen2.ida.liu.se>
+
+	* Release av 0.46-BETA-K
+
 2000-07-28  David Byers  <davby@ida.liu.se>
 
+	* vars.el.in (lyskom-prefetch-conf-tresh): Not really a user
+	variable. Don't save in server.
+	(lyskom-prefetch-confs): Not really a user variable. Don't save in
+	server.
+	(lyskom-fetch-map-nos): Not really a user variable. Don't save in
+	server. 
+
 	* completing-read.el (lyskom-read-conf-lookup-specials): Return
 	conf-z-info, not uconf-stat.
 

src/english-strings.el

@@ -283,16 +283,9 @@ Send a letter to  %#2P to apply for membership.\n")
     (secret-members-allowed . "Are secret members permitted? ")
     (what-comment-no . "Comment text number: ")
     (what-footnote-no . "Footnote text number: ")
-    (confusion-what-to-reply-to . "I can't figure out which text you want to write a fast reply to.\n")
-    (confusion-what-to-agree-to . "I can't figure out which text you want to agree with.\n")
-    (confusion-what-to-comment . "I can't figure out which text you want to comment.\n")
-    (confusion-what-to-footnote . "I can't figure out to which text you want to write a footnote to.\n")
     (what-private-no . "Private reply to text number: ")
 
-    (confusion-who-to-reply-to . "I can't figure out which text you want to write a private reply to.\n")
-    (confusion-what-to-answer-to . "I can't figure out which text you want to write a reply to.\n")
     (quit-in-spite-of-unsent . "You have an unsent text. Do you really want to quit? ")
-    (confusion-what-to-view . "I can't figure out which text you want to view.\n")
     (really-quit . "Do you really want to quit LysKOM? ")
     (session-ended . "
 --------------------------------------------
@@ -367,7 +360,7 @@ and you have finished reading. Please come back later.
     (text-to-add-copy . "Add recipient of carbon copy of which text:")
     (text-to-add-bcc . "Add recipient of blind carbon copy of which text:")
     (text-to-delete-recipient . "Remove recipient from which text:")
-    (text-to-move . "Which text do you want to move: ")
+    (text-to-move . "Which text do you want to move:")
     (text-to-add-comment-to . "Add comment to which text:")
     (text-to-delete-comment-from . "Remove comment from which text:")
     (text-to-add-footnote-to . "Add footnote to which text:")
@@ -999,7 +992,10 @@ You should set it to a better value.\n")
     (several-unread . "%#1M - %#2d unread texts\n")
     (enter-conf . "%#1M\n")
 
-    (save-on-file-q . "Archive text on file: (%#1s) ")
+    (save-one-on-file-q . "Save copy of text %#1n in file: ")
+    (save-many-on-file-q . "Save copies of %#1d texts in file: ")
+    (saving-one-on-file . "Saving copy of text %#1n in %#2s.\n")
+    (saving-many-on-file . "Saving %#1d texts in %#2s.\n")
     (save-text-to-file-q . "Save body of text %#1n in which file: ")
     (save-text-confirm . "File %#1s exists. Overwrite? ")
     (saving-text . "Saving text %#1n as %#2s...")
@@ -1409,6 +1405,43 @@ You must become an active member of the conference to enter it.\n")
     (review-noconversion-q . "Review which text unconverted?")
     (review-commented-q . "Review the commented for which text?")
 
+    (review-tree-q . "Review all comments recursively for which text?")
+    (find-root-q . "Review original text for text?")
+    (find-root-review-q . "Review tree of which text?")
+    (review-comments-q . "Review all comments to which text?")
+
+    (confusion-who-to-reply-to . "I can't figure out which text you want to write a private reply to.\n")
+    (confusion-what-to-answer-to . "I can't figure out which text you want to write a reply to.\n")
+    (confusion-what-to-view . "I can't figure out which text you want to view.\n")
+
+    (confusion-what-to-reply-to . "I can't figure out which text you want to write a fast reply to.\n")
+    (confusion-what-to-agree-to . "I can't figure out which text you want to agree with.\n")
+    (confusion-what-to-request-confirmation . "I can't figure out which text you want read confirmations for.\n")
+    (confusion-what-to-comment . "I can't figure out which text you want to comment.\n")
+    (confusion-what-to-footnote . "I can't figure out to which text you want to write a footnote to.\n")
+
+    (confusion-what-to-delete . "I can't figure out which text you want to delete.\n")
+    (confusion-what-to-add-sub-recipient . "I can't figure out which text you want to %#1s.\n")
+    (add-rcpt-action-name . "add a recipient to")
+    (add-copy-action-name . "add a carbon copy recipient to")
+    (add-bcc-action-name . "add a blid carbon copy recipient to")
+    (sub-action-name . "remove a recipient from")
+    (move-action-name . "move")
+
+    (confusion-what-to-add-comment-to . "I can't figure out which text you want to add a comment to.\n")
+    (confusion-what-to-sub-comment-from . "I can't figure out which text you want to remove a comment from.\n")
+    (confusion-what-to-add-footnote-to . "I can't figure out which text you want to add a footnote to.\n")
+    (confusion-what-to-sub-footnote-from . "I can't figure out which text you want to remove a footnote from.\n")
+    
+    (confusion-what-to-mark . "I can't figure out which text you want to mark.\n")
+    (confusion-what-to-unmark . "I can't figure out which text you want to unmark.\n")
+    (confusion-what-to-save . "I can't figure out which text you want to save.\n")
+
+    (confusion-what-to-review-mail-headers . "I can't figure out which text's mail headers you want to see.\n")
+    (confusion-what-to-find-root . "I can't figure out which text's root you want to see.\n")
+    (confusion-what-to-find-root-review . "I can't figure out which tree you want to review.\n")
+
+    ;; Button actions
 
     (lyskom-button-view-text-action . "View text")
     (lyskom-button-review-noconversion-action . "Review unconverted")
@@ -3062,6 +3095,23 @@ be saved in the server. Otherwise it will be saved in your .emacs.")
   network connection to the LysKOM server active. If your network connection
   shuts down after a period of inactivity, set this to approximately half
   that period and use the command `Keep connection alive'.")
+    (kom-prompt-for-text-no-doc . "\
+  These commands will always prompt for text numbers, unless one is
+  specified via a prefix argument. Commands that are not listed will
+  assume a suitable default and only prompt if the prefix argument is
+  zero.")
+    (kom-saved-file-name-doc . "\
+  Specifies the default file to archive texts in. The client will always
+  prompt for the file name, using this as the default.")
+    (kom-follow-attachments-doc . "\
+  Specifiec whether to read imported e-mail attachments as regular
+  comments. When off, imported attachments are marked as read when the
+  e-mail they are attached to is read.")
+    (kom-show-unread-in-frame-title-doc . "\
+  When this is on, the indicator \"(Unread)\" is shown in the title
+  bar of all windows whose active buffer belongs to a LysKOM session
+  with unread texts. The title bar may not be updated unless the
+  window is open.")
 
     ;;
     ;; Tags for variables
@@ -3211,6 +3261,10 @@ be saved in the server. Otherwise it will be saved in your .emacs.")
     (kom-server-priority-breaks-tag . "Prompt to go to next LysKOM")
     (kom-complete-numbers-before-names-tag . "Read conference numbers before names")
     (kom-keep-alive-interval-tag . "Keep connection alive interval")
+    (kom-prompt-for-text-no-tag . "Commands that prompt for text numbers")
+    (kom-saved-file-name-tag . "File to archive texts in")
+    (kom-follow-attachments-tag . "Read imported attachments as texts")
+    (kom-show-unread-in-frame-title-tag . "Show unread indicator in title bar")
     )
 )
 

src/option-edit.el

@@ -72,6 +72,7 @@
     [kom-friends]
     [kom-morons]
     "\n"
+    [kom-show-unread-in-frame-title]
     [kom-presence-messages]
     [kom-presence-messages-in-buffer]
     "\n"
@@ -149,6 +150,7 @@
     [kom-reading-puts-comments-in-pointers-last]
     [kom-show-footnotes-immediately]
     [kom-follow-comments-outside-membership]
+    [kom-follow-attachments]
     [kom-created-texts-are-read]
     "\n"
     [kom-saved-file-name]
@@ -650,6 +652,8 @@ customize buffer but do not save them to the server."
     (kom-keep-alive-interval (number))
     (kom-prompt-for-text-no (repeat (command nil :tag command)))
     (kom-saved-file-name (file))
+    (kom-follow-attachments (toggle (yes no)))
+    (kom-show-unread-in-frame-title (toggle (yes no)))
 ))
 
 (defvar lyskom-widget-functions 

src/swedish-strings.el

@@ -3153,6 +3153,15 @@ i servern. Annars sparas det i din .emacs.")
     (kom-saved-file-name-doc . "\
   Anger vilken fil som inlgg skall arkiveras till. Klienten kommer nd
   att frga, men detta blir det frifyllda svaret.")
+    (kom-follow-attachments-doc . "\
+  Anger om bilagor till importerade brev skall lsas som kommentarer. 
+  Om detta r avstngt s lsmarkeras bilagor automatiskt, utan att
+  man lser dem.")
+    (kom-show-unread-in-frame-title-doc . "\
+  Om detta r pslaget s visas \"(Olsta)\" i titelraden fr de
+  fnster vars valda buffert hr till en LysKOM-session med olsta. 
+  Det r inte skert att titelraden ndras om fnstret inte r ppet.")
+
 
     ;;
     ;; Tags for variables
@@ -3304,6 +3313,8 @@ i servern. Annars sparas det i din .emacs.")
     (kom-keep-alive-interval-tag . "Intervall fr hll frbindelsen igng")
     (kom-prompt-for-text-no-tag . "Kommandon som skall frga efter textnummer")
     (kom-saved-file-name-tag . "Fil att arkivera inlgg i")
+    (kom-follow-attachments-tag . "Ls importerade bilagor som vanligt")
+    (kom-show-unread-in-frame-title-tag . "Visa olstamarkering i titelraden")
     )
 )
 

src/vars.el.in

@@ -1730,21 +1730,21 @@ If this variable is non-nil, no asynchronous messages will appear.")
 ;;; These variables control prefetch of conf-stats, text-stats and texts:
 
 (def-kom-var lyskom-prefetch-conf-tresh 50
-  "*If fewer than lyskom-prefetch-conf-tresh texts are known, ask for more
+  "If fewer than lyskom-prefetch-conf-tresh texts are known, ask for more
 conf-stats from server.
 
 This is currently not used."
-  server)
+  local)
 
 (def-kom-var lyskom-prefetch-confs 10
-  "*Number of confs to ask about at once when checking for unread texts.
+  "Number of confs to ask about at once when checking for unread texts.
 
 This is currently not used."
-  server)
+  local)
 
 (def-kom-var lyskom-fetch-map-nos 50
-  "*Number of text-nos lyskom will fetch when fetching maps."
-  server)
+  "Number of text-nos lyskom will fetch when fetching maps."
+  local)
 
 (def-kom-var lyskom-fetch-membership-length 6
   "*Number of entries in the membership-list that is fetched at a time.
@@ -1884,9 +1884,9 @@ set to that text."
 (def-kom-var lyskom-new-text-hook nil
   "*Hook to run when a new text is created.
 This hook is run after the prompt is removed if it shall be changed but before
-the text Text 4711 {r skapad! is printed in the message area. And before the
+the text Text 4711 är skapad! is printed in the message area. And before the
 new prompt is printed.
-If the text: Text 4711 {r skapad! should not be printed then the hook should 
+If the text: Text 4711 är skapad! should not be printed then the hook should 
 set the local variable no-message non-nil."
   server)