diff -r -N -C 2 imp-2.2.0-pre4/README imp-2.2.0-pre5/README
*** imp-2.2.0-pre4/README	Wed Aug 25 00:44:56 1999
--- imp-2.2.0-pre5/README	Wed Oct 20 03:12:32 1999
***************
*** 10,13 ****
--- 10,14 ----
  docs/DATABASE - How to configure your Database
  
+ 
  ---------------
  Now what to do?
diff -r -N -C 2 imp-2.2.0-pre4/addcontact.php3 imp-2.2.0-pre5/addcontact.php3
*** imp-2.2.0-pre4/addcontact.php3	Thu Aug 19 14:24:12 1999
--- imp-2.2.0-pre5/addcontact.php3	Tue Sep 28 13:25:07 1999
***************
*** 5,10 ****
   File: contacts.php3
   $Author: chuck $
!  $Revision: 2.6.2.3 $
!  $Date: 1999/08/19 18:24:12 $
   
   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: contacts.php3
   $Author: chuck $
!  $Revision: 2.6.2.4 $
!  $Date: 1999/09/28 17:25:07 $
   
   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 55,59 ****
   
      case ADD_CONTACT:
!        if ($imp->mailbox && $index && $bodypart) {
           $h = imap_header($imp->stream, imap_msgno($imp->stream, $index));
           if (isset($h->reply_toaddress)) { $new_address = chop(htmlspecialchars($h->reply_toaddress)); }
--- 55,59 ----
   
      case ADD_CONTACT:
!        if ($imp->mailbox && $index) {
           $h = imap_header($imp->stream, imap_msgno($imp->stream, $index));
           if (isset($h->reply_toaddress)) { $new_address = chop(htmlspecialchars($h->reply_toaddress)); }
diff -r -N -C 2 imp-2.2.0-pre4/compose.php3 imp-2.2.0-pre5/compose.php3
*** imp-2.2.0-pre4/compose.php3	Thu Aug 26 20:19:09 1999
--- imp-2.2.0-pre5/compose.php3	Mon Oct 18 12:43:36 1999
***************
*** 5,10 ****
   File: compose.php3
   $Author: chuck $
!  $Revision: 2.35.2.12 $
!  $Date: 1999/08/27 00:19:09 $
   
   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: compose.php3
   $Author: chuck $
!  $Revision: 2.35.2.22 $
!  $Date: 1999/10/18 16:43:36 $
   
   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 24,30 ****
    if ($default->user_change_fullname || $default->use_db)
      $name = imp_get_fullname($imp->user, $imp->server);
    if (empty($name)) $name = '';
    
-   $from = imap_rfc822_write_address($imp->user, $imp->from_server, $name);
    return $from;
  }
--- 24,42 ----
    if ($default->user_change_fullname || $default->use_db)
      $name = imp_get_fullname($imp->user, $imp->server);
+   
    if (empty($name)) $name = '';
+ 
+   if (!isset($from) || !$from || !$default->user_change_from) {
+     $from = '';
+     if ($name) {
+       $from  = $name;
+       $from .= ' <';
+     }
+     $from .= get_barefrom();
+     if ($name) {
+       $from .= '>';
+     }
+   }
    
    return $from;
  }
***************
*** 153,157 ****
  }
  
! page_open(array('sess' => 'HordeSession'));
  page_close();
  if (!isset($imp) || !is_object($imp)) { echo '<script language="JavaScript">window.close()</script>'; exit; }
--- 165,169 ----
  }
  
! page_open(array('sess' => 'HordeSessionCached'));
  page_close();
  if (!isset($imp) || !is_object($imp)) { echo '<script language="JavaScript">window.close()</script>'; exit; }
***************
*** 190,197 ****
    case COMPOSE:
      if (isset($to)) {
!       $to = chop(htmlspecialchars(decode_mime_string($to)));
      }
      if (isset($subject)) {
!       $subject = chop(htmlspecialchars(decode_mime_string($subject)));
      }
      $ACTION_TEXT = $lang->action_compose;
--- 202,209 ----
    case COMPOSE:
      if (isset($to)) {
!       $to = chop(decode_mime_string($to));
      }
      if (isset($subject)) {
!       $subject = chop(decode_mime_string($subject));
      }
      $ACTION_TEXT = $lang->action_compose;
***************
*** 202,210 ****
        $h = @imap_header($imp->stream, imap_msgno($imp->stream, $index));
        if (isset($mailto) && isset($h->$mailto)) {
! 	$to = chop(htmlspecialchars(decode_mime_string($h->$mailto)));
        } else if (isset($h->reply_toaddress) && $h->reply_toaddress) {
! 	$to = chop(htmlspecialchars(decode_mime_string($h->reply_toaddress)));
        } else if (isset($h->fromaddress)) {
! 	$to = chop(htmlspecialchars(decode_mime_string($h->fromaddress)));
        } else {
  	$to = '';
--- 214,222 ----
        $h = @imap_header($imp->stream, imap_msgno($imp->stream, $index));
        if (isset($mailto) && isset($h->$mailto)) {
! 	$to = chop(decode_mime_string($h->$mailto));
        } else if (isset($h->reply_toaddress) && $h->reply_toaddress) {
! 	$to = chop(decode_mime_string($h->reply_toaddress));
        } else if (isset($h->fromaddress)) {
! 	$to = chop(decode_mime_string($h->fromaddress));
        } else {
  	$to = '';
***************
*** 219,230 ****
        
        if ($h) {
! 	if (isset($h->toaddress)) $to = chop(htmlspecialchars($h->toaddress));
! 	if (isset($h->ccaddress)) $cc = chop(htmlspecialchars($h->ccaddress));
! 	if (isset($h->bccaddress)) $bcc = chop(htmlspecialchars($h->bccaddress));
! 	if (isset($h->reply_toaddress)) $reply_to = chop(htmlspecialchars($h->reply_toaddress));
! 	if (isset($h->subject)) $subject = chop(htmlspecialchars($h->subject));
        }
        
!       $msg = htmlspecialchars(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID),($_html['compose_body_cols']-8-strlen($quote_str)), $quote_str);
        $ACTION_TEXT = $lang->action_compose;
        $structure = @imap_fetchstructure($imp->stream, imap_msgno($imp->stream, $index));
--- 231,243 ----
        
        if ($h) {
! 	if (isset($h->toaddress)) $to = chop($h->toaddress);
! 	if (isset($h->ccaddress)) $cc = chop($h->ccaddress);
! 	if (isset($h->bccaddress)) $bcc = chop($h->bccaddress);
! 	if (isset($h->reply_toaddress)) $reply_to = chop($h->reply_toaddress);
! 	if (isset($h->subject)) $subject = chop($h->subject);
        }
        
!       $quote_str = "\n" . $default->quote_prefix;
!       $msg = imap_fetchbody($imp->stream, $index, $bodypart, FT_UID);
        $ACTION_TEXT = $lang->action_compose;
        $structure = @imap_fetchstructure($imp->stream, imap_msgno($imp->stream, $index));
***************
*** 241,247 ****
        /* Set the message_id and references headers */
        if (isset($h->message_id)) {
! 	$in_reply_to = chop(htmlspecialchars($h->message_id));
  	if (isset($h->references)) {
! 	  $references = chop(htmlspecialchars($h->references)) . ' ' . $in_reply_to;
  	} else {
  	  $references = $in_reply_to;
--- 254,260 ----
        /* Set the message_id and references headers */
        if (isset($h->message_id)) {
! 	$in_reply_to = chop($h->message_id);
  	if (isset($h->references)) {
! 	  $references = chop($h->references) . ' ' . $in_reply_to;
  	} else {
  	  $references = $in_reply_to;
***************
*** 253,282 ****
        
        if (isset($h->reply_toaddress))
! 	$to = chop(htmlspecialchars(decode_mime_string($h->reply_toaddress)));
        else if (isset($h->fromaddress))
! 	$to = chop(htmlspecialchars(decode_mime_string($h->fromaddress)));
        else
  	$to = '';
        
        if (isset($h->fromaddress))
! 	$qfrom = chop(htmlspecialchars(decode_mime_string($h->fromaddress)));
        else $qfrom = '&lt;&gt;';
        
        $quote_str = "\n" . $default->quote_prefix;
!       $msg = htmlspecialchars(wrap_message(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID), $_html['compose_body_cols']-8, $quote_str));
        if ($qprint_msg = imap_qprint($msg)) {
  	$msg = $qprint_msg;
! 	}
        $msg  = $lang->quoting_string . ' ' . $qfrom . ":\n$quote_str$msg";
        $msg .= "\n";
  	
        if (isset($h->subject) && (strtolower(substr(trim(decode_mime_string($h->subject)), 0, 3)) != 're:'))
! 	$subject = 'Re: ' . chop(htmlspecialchars(decode_mime_string($h->subject)));
        else if (isset($h->subject))
! 	$subject = chop(htmlspecialchars(decode_mime_string($h->subject)));
        else
  	$subject = 'Re: ';
        
!       $ACTION_TEXT = $lang->action_reply . ' ' . chop(htmlspecialchars(decode_mime_string($subject)));
      }
      break;
--- 266,295 ----
        
        if (isset($h->reply_toaddress))
! 	$to = chop(decode_mime_string($h->reply_toaddress));
        else if (isset($h->fromaddress))
! 	$to = chop(decode_mime_string($h->fromaddress));
        else
  	$to = '';
        
        if (isset($h->fromaddress))
! 	$qfrom = chop(decode_mime_string($h->fromaddress));
        else $qfrom = '&lt;&gt;';
        
        $quote_str = "\n" . $default->quote_prefix;
!       $msg = wrap_message(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID), $_html['compose_body_cols'] - 8, $quote_str);
        if ($qprint_msg = imap_qprint($msg)) {
  	$msg = $qprint_msg;
!       }
        $msg  = $lang->quoting_string . ' ' . $qfrom . ":\n$quote_str$msg";
        $msg .= "\n";
  	
        if (isset($h->subject) && (strtolower(substr(trim(decode_mime_string($h->subject)), 0, 3)) != 're:'))
! 	$subject = 'Re: ' . chop(decode_mime_string($h->subject));
        else if (isset($h->subject))
! 	$subject = chop(decode_mime_string($h->subject));
        else
  	$subject = 'Re: ';
        
!       $ACTION_TEXT = $lang->action_reply . ' ' . $subject;
      }
      break;
***************
*** 288,294 ****
        /* Set the message_id and references headers */
        if (isset($h->message_id)) {
! 	$in_reply_to = chop(htmlspecialchars($h->message_id));
  	if (isset($h->references)) {
! 	  $references = chop(htmlspecialchars($h->references)) . ' ' . $in_reply_to;
  	} else {
  	  $references = $in_reply_to;
--- 301,307 ----
        /* Set the message_id and references headers */
        if (isset($h->message_id)) {
! 	$in_reply_to = chop($h->message_id);
  	if (isset($h->references)) {
! 	  $references = chop($h->references) . ' ' . $in_reply_to;
  	} else {
  	  $references = $in_reply_to;
***************
*** 300,306 ****
        
        if ($h->reply_toaddress) {
! 	$reply = chop(htmlspecialchars(decode_mime_string($h->reply_toaddress)));
        } else if (isset($h->fromaddress)) {
! 	$reply = chop(htmlspecialchars(decode_mime_string($h->fromaddress)));
        } else {
  	$reply = '';
--- 313,319 ----
        
        if ($h->reply_toaddress) {
! 	$reply = chop(decode_mime_string($h->reply_toaddress));
        } else if (isset($h->fromaddress)) {
! 	$reply = chop(decode_mime_string($h->fromaddress));
        } else {
  	$reply = '';
***************
*** 312,343 ****
        }
        
!       if ($reply != chop(htmlspecialchars(decode_mime_string($h->fromaddress)))) {
! 	$to = $reply . ',' . chop(htmlspecialchars(decode_mime_string($h->fromaddress)));
        } else {
  	$to = $reply;
        }
!       if ($reply != chop(htmlspecialchars(decode_mime_string($h->toaddress)))) {
! 	$cc = chop(htmlspecialchars(decode_mime_string($h->toaddress)));
  	if (isset($h->ccaddress)) {
! 	  $cc .= ',' . chop(htmlspecialchars(decode_mime_string($h->ccaddress)));
  	}
        } else if (isset($h->ccaddress)) {
! 	$cc = chop(htmlspecialchars(decode_mime_string($h->ccaddress)));
        }
        
        if (isset($h->bccaddress)) {
! 	$bcc = ',' . chop(htmlspecialchars(decode_mime_string($h->bccaddress)));
        }
        
        $quote_str = "\n" . $default->quote_prefix;
!       $msg  = htmlspecialchars(wrap_message(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID), $_html['compose_body_cols']-8, $quote_str));
        if ($qprint_msg = imap_qprint($msg)) {
  	$msg = $qprint_msg;
        }
!       $msg  = $lang->quoting_string . ' ' . chop(htmlspecialchars(decode_mime_string($h->fromaddress))) . ":\n$quote_str$msg";
        $msg .= "\n";
        
!       if (isset($h->subject) && strtolower(substr(trim(decode_mime_string($h->subject)), 0, 3)) != 're:') $subject = 'Re: ' . chop(htmlspecialchars(decode_mime_string($h->subject)));
!       else if (isset($h->subject)) $subject = chop(htmlspecialchars(decode_mime_string($h->subject)));
        else $subject = '';
        
--- 325,356 ----
        }
        
!       if ($reply != chop(decode_mime_string($h->fromaddress))) {
! 	$to = $reply . ',' . chop(decode_mime_string($h->fromaddress));
        } else {
  	$to = $reply;
        }
!       if ($reply != chop(decode_mime_string($h->toaddress))) {
! 	$cc = chop(decode_mime_string($h->toaddress));
  	if (isset($h->ccaddress)) {
! 	  $cc .= ',' . chop(decode_mime_string($h->ccaddress));
  	}
        } else if (isset($h->ccaddress)) {
! 	$cc = chop(decode_mime_string($h->ccaddress));
        }
        
        if (isset($h->bccaddress)) {
! 	$bcc = ',' . chop(decode_mime_string($h->bccaddress));
        }
        
        $quote_str = "\n" . $default->quote_prefix;
!       $msg = wrap_message(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID), $_html['compose_body_cols'] - 8, $quote_str);
        if ($qprint_msg = imap_qprint($msg)) {
  	$msg = $qprint_msg;
        }
!       $msg  = $lang->quoting_string . ' ' . chop(decode_mime_string($h->fromaddress)) . ":\n$quote_str$msg";
        $msg .= "\n";
        
!       if (isset($h->subject) && strtolower(substr(trim(decode_mime_string($h->subject)), 0, 3)) != 're:') $subject = 'Re: ' . chop(decode_mime_string($h->subject));
!       else if (isset($h->subject)) $subject = chop(decode_mime_string($h->subject));
        else $subject = '';
        
***************
*** 350,354 ****
        $h = imap_header($imp->stream, imap_msgno($imp->stream, $index));
        if (isset($h->fromaddress))
! 	$message_source = chop(htmlspecialchars(decode_mime_string($h->fromaddress)));
        else
  	$message_source = '';
--- 363,367 ----
        $h = imap_header($imp->stream, imap_msgno($imp->stream, $index));
        if (isset($h->fromaddress))
! 	$message_source = chop(decode_mime_string($h->fromaddress));
        else
  	$message_source = '';
***************
*** 358,368 ****
        $msg  = "\n" . $lang->forwarded_from($message_source) . "\n";
        
!       if (isset($h->date) && $h->date) { $msg .= 'Date: ' . chop(htmlspecialchars(decode_mime_string($h->date))) . "\n"; }
!       if (isset($h->fromaddress) && $h->fromaddress) { $msg .= 'From: ' . chop(htmlspecialchars(decode_mime_string($h->fromaddress))) . "\n"; }
!       if (isset($h->reply_toaddress) && $h->reply_toaddress) { $msg .= 'Reply-To: ' . chop(htmlspecialchars(decode_mime_string($h->reply_toaddress))) . "\n"; }
!       if (isset($h->subject) && $h->subject) { $msg .= 'Subject: ' . chop(htmlspecialchars(decode_mime_string($h->subject))) . "\n"; }
!       if (isset($h->toaddress) && $h->toaddress) { $msg .= 'To: ' . chop(htmlspecialchars(decode_mime_string($h->toaddress))) . "\n"; }
        $msg .= "\n";
!       $msg .= htmlspecialchars(wrap_message(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID)));
        $msg .= "\n----- " . $lang->forward_end_string . " -----\n";
        if ($qprint_msg = imap_qprint($msg)) {
--- 371,381 ----
        $msg  = "\n" . $lang->forwarded_from($message_source) . "\n";
        
!       if (isset($h->date) && $h->date) { $msg .= 'Date: ' . chop(decode_mime_string($h->date)) . "\n"; }
!       if (isset($h->fromaddress) && $h->fromaddress) { $msg .= 'From: ' . chop(decode_mime_string($h->fromaddress)) . "\n"; }
!       if (isset($h->reply_toaddress) && $h->reply_toaddress) { $msg .= 'Reply-To: ' . chop(decode_mime_string($h->reply_toaddress)) . "\n"; }
!       if (isset($h->subject) && $h->subject) { $msg .= 'Subject: ' . chop(decode_mime_string($h->subject)) . "\n"; }
!       if (isset($h->toaddress) && $h->toaddress) { $msg .= 'To: ' . chop(decode_mime_string($h->toaddress)) . "\n"; }
        $msg .= "\n";
!       $msg .= wrap_message(imap_fetchbody($imp->stream, $index, $bodypart, FT_UID));
        $msg .= "\n----- " . $lang->forward_end_string . " -----\n";
        if ($qprint_msg = imap_qprint($msg)) {
***************
*** 371,376 ****
        
        if (isset($h->subject)) {
! 	$subject = $lang->fwd_string . ' ' . chop(htmlspecialchars(decode_mime_string($h->subject)));
! 	$ACTION_TEXT = $lang->action_forward . ' ' . chop(htmlspecialchars(decode_mime_string($h->subject)));
        } else {
  	$subject = $lang->fwd_string;
--- 384,389 ----
        
        if (isset($h->subject)) {
! 	$subject = $lang->fwd_string . ' ' . chop(decode_mime_string($h->subject));
! 	$ACTION_TEXT = $lang->action_forward . ' ' . chop(decode_mime_string($h->subject));
        } else {
  	$subject = $lang->fwd_string;
***************
*** 440,444 ****
      if (isset($attachments_type) && !is_array($attachments_type)) { $attachments = array($attachments_type); }
      
!     if ($to && $message) {
        $message = str_replace("\r\n", "\n", $message);
        $mime = new MimeMessage($message);
--- 453,457 ----
      if (isset($attachments_type) && !is_array($attachments_type)) { $attachments = array($attachments_type); }
      
!     if ($to && isset($message)) {
        $message = str_replace("\r\n", "\n", $message);
        $mime = new MimeMessage($message);
***************
*** 632,636 ****
  	$total_size += $attachments_size[$i];
        }
!       if ($message) {
  	$msg = $message; // save for later.
  	
--- 645,649 ----
  	$total_size += $attachments_size[$i];
        }
!       if (isset($message)) {
  	$msg = $message; // save for later.
  	
***************
*** 759,764 ****
        $body = str_replace("\n", "\r\n", $body);
        
-       echo nl2br($body);
-       
        if (isset($append_flags)) {
  	$append_flags .= ' \\Seen';
--- 772,775 ----
***************
*** 904,910 ****
--- 915,927 ----
  $sidebar = false;
  require ("$default->include_dir/generic-header.inc");
+ if (!$this_client->lynx) {
+   $addresses = imp_get_addresses($imp->user, $imp->server);
+   include "$default->include_dir/compose/javascript.inc";
+   include "./lib/js/open_contacts.js";
+ }
  
  $barefrom = get_barefrom();
  $from = get_from();
+ 
  if (!isset($msg)) { $msg = ''; }
  if (!isset($to)) { $to = ''; }
***************
*** 914,921 ****
  if ($get_sig && $sig = htmlentities(imp_get_signature($imp->user, $imp->server))) $msg .= "\n\n\n" . $sig;
  
- if (!$this_client->lynx) {
-   $addresses = imp_get_addresses($imp->user, $imp->server);
- }
- 
  if (isset($actionID) && ($actionID == BOUNCE_COMPOSE)) {
    if (!$this_client->lynx) {
--- 931,934 ----
***************
*** 932,939 ****
  }
  require "$default->include_dir/generic-footer.inc";
- if (!$this_client->lynx) {
-   include "$default->include_dir/compose/javascript.inc";
-   include "./lib/js/open_contacts.js";
- }
  
  ?>
--- 945,948 ----
diff -r -N -C 2 imp-2.2.0-pre4/config/README imp-2.2.0-pre5/config/README
*** imp-2.2.0-pre4/config/README	Wed Apr 28 07:41:19 1999
--- imp-2.2.0-pre5/config/README	Tue Oct  5 16:34:38 1999
***************
*** 1,6 ****
    File: config/README
!   $Author: mhardy $
!   $Revision: 2.0 $
!   $Date: 1999/04/28 11:41:19 $
    
    IMP: Copywrite 1998 Charles J. Hagenbuch chuck@horde.org
--- 1,6 ----
    File: config/README
!   $Author: chuck $
!   $Revision: 2.0.2.1 $
!   $Date: 1999/10/05 20:34:38 $
    
    IMP: Copywrite 1998 Charles J. Hagenbuch chuck@horde.org
***************
*** 67,75 ****
  
  class ImpDefaults {
-   - Local Configuration -
-   var $localhost;
-       - your local host name -
- 
-   
    - Html Configuration -
    var $cache_pages;
--- 67,70 ----
***************
*** 189,202 ****
        - If available within your driver, the object will try to be
          or not be in persistent mode. -
- 
- 
-  ****************************************************************
-                          W A R N I N G
-  
-  You MUST set $default->localhost to the name of the webserver.
-  
-  Cookies will be horribly broken otherwise.
-  
-  ****************************************************************
  
  
--- 184,187 ----
diff -r -N -C 2 imp-2.2.0-pre4/config/defaults.php3.dist imp-2.2.0-pre5/config/defaults.php3.dist
*** imp-2.2.0-pre4/config/defaults.php3.dist	Thu Aug 26 20:19:11 1999
--- imp-2.2.0-pre5/config/defaults.php3.dist	Tue Oct  5 16:34:38 1999
***************
*** 12,17 ****
  $default->max_execution_time        = 0;
  
- /* Server Specific Configuration */
- $default->localhost                 = 'web.horde.org';
  
  /* Imap Server Default */
--- 12,15 ----
diff -r -N -C 2 imp-2.2.0-pre4/config/lang.php3 imp-2.2.0-pre5/config/lang.php3
*** imp-2.2.0-pre4/config/lang.php3	Fri Aug 27 02:35:22 1999
--- imp-2.2.0-pre5/config/lang.php3	Tue Oct  5 15:17:49 1999
***************
*** 1,5 ****
  <?php
  
! $lang->lang['cs'] = '\xc8esky';
  $lang->lang['da'] = 'Danish';
  $lang->lang['de'] = 'Deutsch';
--- 1,5 ----
  <?php
  
! $lang->lang['cs'] = '?esky';
  $lang->lang['da'] = 'Danish';
  $lang->lang['de'] = 'Deutsch';
***************
*** 8,18 ****
  $lang->lang['et'] = 'Estonian';
  $lang->lang['fi'] = 'Finnish';
! $lang->lang['fr'] = 'Francais'; // someone please fix the accents
! $lang->lang['it'] = 'Italiano';
  $lang->lang['id'] = 'Bahasa Indonesia';
! $lang->lang['no'] = 'Norwegian';
! $lang->lang['no-nyn'] = 'Norwegian-Nynorsk';
  $lang->lang['pt-BR'] = 'Portugu\xeas Brasileiro';
! $lang->lang['se'] = 'Swedish'; // someone please translate this
  
  # multi-language spelling support
--- 8,21 ----
  $lang->lang['et'] = 'Estonian';
  $lang->lang['fi'] = 'Finnish';
! $lang->lang['fr'] = 'Fran&ccedil;ais';
! $lang->lang['hu'] = 'Magyar';
  $lang->lang['id'] = 'Bahasa Indonesia';
! $lang->lang['is'] = 'Íslenska';
! $lang->lang['it'] = 'Italiano';
! $lang->lang['no-bok'] = 'Norsk-bokmål';
! $lang->lang['no-nyn'] = 'Norsk-nynorsk';
! $lang->lang['pl'] = 'Polish';
  $lang->lang['pt-BR'] = 'Portugu\xeas Brasileiro';
! $lang->lang['se'] = 'Svenska';
  
  # multi-language spelling support
diff -r -N -C 2 imp-2.2.0-pre4/config/mime.php3 imp-2.2.0-pre5/config/mime.php3
*** imp-2.2.0-pre4/config/mime.php3	Wed Aug 18 02:52:28 1999
--- imp-2.2.0-pre5/config/mime.php3	Tue Sep 28 16:54:40 1999
***************
*** 4,10 ****
    
    File: config/mime.conf
!   $Author: chuck $
!   $Revision: 2.2.2.2 $
!   $Date: 1999/08/18 06:52:28 $
    
    IMP: Copyright 1998 Patrick C. Audley <paudley@blackcat.ca>
--- 4,10 ----
    
    File: config/mime.conf
!   $Author: mhardy $
!   $Revision: 2.2.2.3 $
!   $Date: 1999/09/28 20:54:40 $
    
    IMP: Copyright 1998 Patrick C. Audley <paudley@blackcat.ca>
***************
*** 210,220 ****
  
  // Allow the HTML MIME-part to be viewed in another browser window and
! // downloadable, and inline. This is the safest way to read mail and
  // still have HTML mail renderable, all options are open.
  $mime_actions['text/html'] =
  array(
        'action'          => 'default',
        'view'            => true,
!       'inline'          => true,
        'override_text'   => false,
        'view_function'   => 'mime_view_html',
--- 210,225 ----
  
  // Allow the HTML MIME-part to be viewed in another browser window and
! // downloadable. This is the safest way to read mail and
  // still have HTML mail renderable, all options are open.
+ //
+ // Viewing HTML is not secure though - it can open you to attack. For 
+ // this reason, you can *choose* to view it, but it won't display inline
+ // unless you change the settings.
+ //
  $mime_actions['text/html'] =
  array(
        'action'          => 'default',
        'view'            => true,
!       'inline'          => false,
        'override_text'   => false,
        'view_function'   => 'mime_view_html',
***************
*** 224,229 ****
  
  // View the HTML MIME-part inline, overriding the text part, and be
! // downloadable. This is not provably 100% safe (you may lose text),
! // but we do sanitize the HTML for security.
  /*
  $mime_actions['text/html'] =
--- 229,236 ----
  
  // View the HTML MIME-part inline, overriding the text part, and be
! // downloadable. This is not provably 100% safe (you may lose text).
! //
! // This is not secure, unfortunately, and should only be used if you
! // can trust your incoming mail.
  /*
  $mime_actions['text/html'] =
***************
*** 246,249 ****
--- 253,259 ----
  // HTML-email clients send the email in such a way that this doesn't
  // happen as far as I know.
+ // 
+ // Unfortunately, this is not secure. Unless you only get trusted mail, (like an
+ // intranet, where I have my IMP), you shouldn't use this.
  /*
  $mime_actions['text/html'] =
diff -r -N -C 2 imp-2.2.0-pre4/config/scripts/impsetup.pl imp-2.2.0-pre5/config/scripts/impsetup.pl
*** imp-2.2.0-pre4/config/scripts/impsetup.pl	Wed Jun 16 08:57:18 1999
--- imp-2.2.0-pre5/config/scripts/impsetup.pl	Sat Sep 18 23:26:59 1999
***************
*** 12,21 ****
  $DEBIAN = 'false';
  
! if (-s "/etc/horde/imp") {
    $DEBIAN = 'true';
  } else {
    $DEBIAN = 'false';
  }
! local( $IMP_SETUP_VER )        = '1.0';
  
  # Hash keys of configuration file info 
--- 12,21 ----
  $DEBIAN = 'false';
  
! if (-s "/etc/imp") {
    $DEBIAN = 'true';
  } else {
    $DEBIAN = 'false';
  }
! local( $IMP_SETUP_VER )        = '2.0';
  
  # Hash keys of configuration file info 
***************
*** 28,33 ****
    $CONFIG_INFO{ 'INSTALLED_PATH' }      = '/usr/share/horde/imp';
    $CONFIG_INFO{ 'INSTALLED_HORDE_PATH' }      = '/usr/share/horde';
!   $etc = "/etc/horde/imp";
!   $scripts = '/usr/share/horde/imp/config/scripts';
  } else {
    $CONFIG_INFO{ 'INSTALLED_PATH' }      = autodetect_installed_path();
--- 28,33 ----
    $CONFIG_INFO{ 'INSTALLED_PATH' }      = '/usr/share/horde/imp';
    $CONFIG_INFO{ 'INSTALLED_HORDE_PATH' }      = '/usr/share/horde';
!   $etc = "/etc/imp";
!   $scripts = '/usr/share/doc/imp/examples';
  } else {
    $CONFIG_INFO{ 'INSTALLED_PATH' }      = autodetect_installed_path();
***************
*** 64,69 ****
        $CONFIG_INFO{ 'DB_OWNER_PASS' } = 'none';
        $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = 'not set';
!       $CONFIG_INFO{ 'DB_USERNAME' } = 'impmgr';
!       $CONFIG_INFO{ 'DB_PASSWORD' } = 'impmgr';
    } else {
      if (-s "/usr/local/bin/mysql") {
--- 64,69 ----
        $CONFIG_INFO{ 'DB_OWNER_PASS' } = 'none';
        $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = 'not set';
!       $CONFIG_INFO{ 'DB_USERNAME' } = 'hordemgr';
!       $CONFIG_INFO{ 'DB_PASSWORD' } = 'hordemgr';
    } else {
      if (-s "/usr/local/bin/mysql") {
***************
*** 73,86 ****
         $CONFIG_INFO{ 'DB_OWNER_PASS' } = 'none';
         $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = 'not set';
!        $CONFIG_INFO{ 'DB_USERNAME' } = 'impmgr';
!        $CONFIG_INFO{ 'DB_PASSWORD' } = 'impmgr';
      } else {
          if (-s "/usr/bin/psql") {
            $CONFIG_INFO{ 'DB_TYPE' } = 'postgres';
            if ($DEBIAN eq "true") {
!             $CONFIG_INFO{ 'DB_USERNAME' } = 'www-data';
              $CONFIG_INFO{ 'DB_PASSWORD' } = '';
            } else {
!             $CONFIG_INFO{ 'DB_USERNAME' } = 'nobody';
              $CONFIG_INFO{ 'DB_PASSWORD' } = '';
            }
--- 73,86 ----
         $CONFIG_INFO{ 'DB_OWNER_PASS' } = 'none';
         $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = 'not set';
!        $CONFIG_INFO{ 'DB_USERNAME' } = 'hordemgr';
!        $CONFIG_INFO{ 'DB_PASSWORD' } = 'hordemgr';
      } else {
          if (-s "/usr/bin/psql") {
            $CONFIG_INFO{ 'DB_TYPE' } = 'postgres';
            if ($DEBIAN eq "true") {
!             $CONFIG_INFO{ 'DB_USERNAME' } = 'hordemgr';
              $CONFIG_INFO{ 'DB_PASSWORD' } = '';
            } else {
!             $CONFIG_INFO{ 'DB_USERNAME' } = 'hordemgr';
              $CONFIG_INFO{ 'DB_PASSWORD' } = '';
            }
***************
*** 93,97 ****
              $CONFIG_INFO{ 'DB_TYPE' } = 'postgres';
              if ($DEBIAN eq "true") {
!               $CONFIG_INFO{ 'DB_USERNAME' } = 'www-data';
                $CONFIG_INFO{ 'DB_PASSWORD' } = '';
              } else {
--- 93,97 ----
              $CONFIG_INFO{ 'DB_TYPE' } = 'postgres';
              if ($DEBIAN eq "true") {
!               $CONFIG_INFO{ 'DB_USERNAME' } = 'hordemgr';
                $CONFIG_INFO{ 'DB_PASSWORD' } = '';
              } else {
***************
*** 100,104 ****
              }
              $CONFIG_INFO{ 'DB_WHERE' } = '/usr/local/bin/psql';
!             $CONFIG_INFO{ 'DB_OWNER' } = 'postgres';
              $CONFIG_INFO{ 'DB_OWNER_PASS' } = 'none';
              $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = 'not set';
--- 100,104 ----
              }
              $CONFIG_INFO{ 'DB_WHERE' } = '/usr/local/bin/psql';
!             $CONFIG_INFO{ 'DB_OWNER' } = 'hordemgr';
              $CONFIG_INFO{ 'DB_OWNER_PASS' } = 'none';
              $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = 'not set';
***************
*** 109,114 ****
              $CONFIG_INFO{ 'DB_OWNER_PASS' } = '';
              $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = '';
!             $CONFIG_INFO{ 'DB_USERNAME' } = 'impmgr';
!             $CONFIG_INFO{ 'DB_PASSWORD' } = 'impmgr';
            }
          }
--- 109,114 ----
              $CONFIG_INFO{ 'DB_OWNER_PASS' } = '';
              $CONFIG_INFO{ 'DB_OWNER_PASSWORD' } = '';
!             $CONFIG_INFO{ 'DB_USERNAME' } = 'hordemgr';
!             $CONFIG_INFO{ 'DB_PASSWORD' } = 'hordemgr';
            }
          }
***************
*** 120,125 ****
  $db_owner = $CONFIG_INFO{ 'DB_OWNER' };
  $db_pass = $CONFIG_INFO{ 'DB_OWNER_PASS' };
! $CONFIG_INFO{ 'DB_NAME' } = 'imp';
! $CONFIG_INFO{ 'DB_SERVER' } = '';
  $CONFIG_INFO{ 'DB_PORT' } = '';
  $CONFIG_INFO{ 'ROOT_URL' } = '/imp';
--- 120,125 ----
  $db_owner = $CONFIG_INFO{ 'DB_OWNER' };
  $db_pass = $CONFIG_INFO{ 'DB_OWNER_PASS' };
! $CONFIG_INFO{ 'DB_NAME' } = 'horde';
! $CONFIG_INFO{ 'DB_SERVER' } = 'localhost';
  $CONFIG_INFO{ 'DB_PORT' } = '';
  $CONFIG_INFO{ 'ROOT_URL' } = '/imp';
***************
*** 271,278 ****
  \$default->session_file = './lib/sessions';
  
- /* Email address to send problem reports */
- \$default->problem_email             = 'root\@localhost';
- \$default->problem_reporting         = true;
- 
  /* For debugging purposes */
  \$default->error_level               = 15;
--- 271,274 ----
***************
*** 290,293 ****
--- 286,290 ----
  \$default->from_server               = \'$CONFIG_INFO{ 'SERVER_FROM' }\';
  \$default->port                      = $CONFIG_INFO{ 'SERVER_PORT' };
+ \$default->servtype                  = 'imap';
  
  /* Web server configuration */
***************
*** 304,310 ****
  \$default->postponed                 = 'postponed-msgs';
  
- /* Allow caching of the pages */
- \$default->cache_pages               = false;
- 
  /* Ldap searching */
  \$default->use_ldap_search           = $CONFIG_INFO{ 'LDAP_SEARCH' };
--- 301,304 ----
***************
*** 315,322 ****
--- 309,319 ----
  /* User changable items */
  \$default->user_change_server        = $CONFIG_INFO{ 'CHANGE_SERVER' };
+ \$default->user_change_port          = true;
+ \$default->user_change_servtype      = true;
  \$default->user_change_folder        = $CONFIG_INFO{ 'CHANGE_FOLDER' };
  \$default->user_change_from          = $CONFIG_INFO{ 'CHANGE_FROM' };
  \$default->user_change_fullname      = $CONFIG_INFO{ 'CHANGE_FULLNAME' };
  \$default->user_use_addressbook      = $CONFIG_INFO{ 'USE_ADDRESSBOOK' };
+ \$default->user_use_folders          = true;
  
  /* New mail configuration */
***************
*** 352,356 ****
  /* Default Language */
  \$default->language                  = '$CONFIG_INFO{ 'LANGUAGE' }';
- \$default->user_change_language      = true;
  
  \$default->append_header             = true;
--- 349,352 ----
***************
*** 371,378 ****
  \$default->db_server_options         = '';
  \$default->db_server_tty             = '';
- 
- /* IMP Signup */
- \$default->signup_email              = 'root\@localhost';
- \$default->signup                    = false;
  
  ?>
--- 367,370 ----
diff -r -N -C 2 imp-2.2.0-pre4/config/servers.php3 imp-2.2.0-pre5/config/servers.php3
*** imp-2.2.0-pre4/config/servers.php3	Thu Aug 19 12:40:21 1999
--- imp-2.2.0-pre5/config/servers.php3	Tue Oct  5 15:17:50 1999
***************
*** 36,40 ****
  
  $IMAPServers['nirgal'] = new IMAPServer('Nirgal',
! 					'nirgal.horde.org',
  					143,
  					'',
--- 36,40 ----
  
  $IMAPServers['nirgal'] = new IMAPServer('Nirgal',
! 					'localhost',
  					143,
  					'',
diff -r -N -C 2 imp-2.2.0-pre4/contacts.php3 imp-2.2.0-pre5/contacts.php3
*** imp-2.2.0-pre4/contacts.php3	Thu Aug 19 14:24:14 1999
--- imp-2.2.0-pre5/contacts.php3	Fri Oct  8 02:10:38 1999
***************
*** 5,10 ****
    File: contacts.php3
    $Author: chuck $
!   $Revision: 2.8.2.3 $
!   $Date: 1999/08/19 18:24:14 $
    
    IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
    File: contacts.php3
    $Author: chuck $
!   $Revision: 2.8.2.4 $
!   $Date: 1999/10/08 06:10:38 $
    
    IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 22,28 ****
  if (!defined("HORDE_LIB")) include '../lib/horde.lib';
  require './lib/imp.lib';              /* IMPlib is the IMP function library  */
- require  './config/ldap.php3';
  require '../config/horde.php3';
  require './config/defaults.php3';     /* Defaults Configuration File */
  /* Html styles configuration */
  require './config/html.php3';
--- 22,28 ----
  if (!defined("HORDE_LIB")) include '../lib/horde.lib';
  require './lib/imp.lib';              /* IMPlib is the IMP function library  */
  require '../config/horde.php3';
  require './config/defaults.php3';     /* Defaults Configuration File */
+ if ($default->use_ldap_search) './config/ldap.php3';
  /* Html styles configuration */
  require './config/html.php3';
diff -r -N -C 2 imp-2.2.0-pre4/docs/CHANGES imp-2.2.0-pre5/docs/CHANGES
*** imp-2.2.0-pre4/docs/CHANGES	Fri Aug 27 08:26:55 1999
--- imp-2.2.0-pre5/docs/CHANGES	Tue Oct  5 16:56:18 1999
***************
*** 1,3 ****
--- 1,23 ----
  ------
+ v2.2.0-pre5?
+ -----
+ 
+ BUG: renaming folders should work again (cjh)
+ BUG: contacts with " in the fullname should work again
+ BUG: went back to using $h->udate for message dates to avoid problems with strange dates
+ BUG: fixed a garbled line that was causing a warning when resuming messages (cjh)
+ BUG: poppassd support should work now ("Charles P. Wright" <cpwright@cpwright.com>)
+ CHANGE: $default->localhost is now deprecated in favor of $SERVER_NAME
+ CHANGE: INBOX is no longer shown on the folders page
+ LANGUAGE: Czech updated
+ LANGUAGE: German updated
+ LANGUAGE: Polish now available (-_ sergio _- <ser@serek.arch.pwr.wroc.pl>)
+ LANGUAGE: Norwegian Bokmål language support - Terje Lunndal <terje.lunndal@norway.eu.net>
+ LANGUAGE: Icelandic language support - Kristofer Arnar Einarsson <kristofe@kristofer.com>
+ LANGUAGE: French updated - Jean Charles Delepine <delepine@u-picardie.fr>
+ SECURITY: We should now be immune to the {} and mocha javascript exploits recently described on Bugtraq (Charles Wright).
+ 
+ 
+ ------
  v2.2.0-pre4
  ------
diff -r -N -C 2 imp-2.2.0-pre4/docs/CREDITS imp-2.2.0-pre5/docs/CREDITS
*** imp-2.2.0-pre4/docs/CREDITS	Wed Aug 25 00:44:57 1999
--- imp-2.2.0-pre5/docs/CREDITS	Tue Oct  5 16:09:32 1999
***************
*** 1,4 ****
  =------------------------------=
! IMP Version 2.0 Development Team
  =------------------------------=
  
--- 1,4 ----
  =------------------------------=
! IMP Version 2.2 Development Team
  =------------------------------=
  
***************
*** 12,23 ****
  * spell checking 
  
- Jason "ZeroDiViDe" Orcutt (zerodiv@zerodivide.net)
- 
- * a ton of library objects
- * library building script
- * setup wizard
- * help system
- * v2 database design
- 
  Mike Hardy (mike@itsprojects.com)
  
--- 12,15 ----
***************
*** 59,62 ****
--- 51,60 ----
  Jette Lyon <jettelyon@post2.tele.dk> - Danish
  Hans Morten Kind <Kind@it.uib.no> - Norwegian
+ Roy-Magne Mo <rmo@www.hivolda.no> - Norwegian-Nynorsk
+ Viktor Haas <haasv@server.kando-misk.sulinet.hu> - Hungarian
+ Terje Lunndal <terje.lunndal@norway.eu.net> - Norwegian Bokmål
+ Chou-kai Wang <stylon@ms2.hinet.net> - Chinese Big5
+ Kai Duebbert <kai@duebbert.de> - German
+ Jean Charles Delepine <delepine@u-picardie.fr> - French
  
  
***************
*** 65,66 ****
--- 63,76 ----
  
  Oracle - Vadim Kolontsov <sb@123.org>
+ 
+ 
+ Inactive Developers
+ ===================
+ 
+ Jason "ZeroDiViDe" Orcutt (zerodiv@zerodivide.net)
+ 
+ * a ton of library objects
+ * library building script
+ * setup wizard
+ * help system
+ * v2 database design
diff -r -N -C 2 imp-2.2.0-pre4/docs/FEATURES imp-2.2.0-pre5/docs/FEATURES
*** imp-2.2.0-pre4/docs/FEATURES	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/docs/FEATURES	Wed Oct 20 03:12:33 1999
***************
*** 0 ****
--- 1,41 ----
+ IMP Features
+ Copyright 1998,1999 Charles J. Hagenbuch <chuck@horde.org>
+ Copyright 1999 Ivan E. Moore II <rkrusty@tdyc.com>
+ Copyright 1999 Mike Hardy <mikeh@spark.com>
+ Copyright 1999 Doug Lumpkin <dougel@thecalling.net>
+ 
+ This code is licensed under the GNU Public License.
+ See the file COPYING in this directory.
+ 
+ Last Updated: 10/19/1999  [DEL]
+ 
+ --------------
+ Basic Features
+ ==============
+ 
+ 
+ Languages Supported:
+ 
+     Danish
+     German
+     English
+     Spanish
+     French
+     Italian
+     Norwegian
+     Nynorsk Norwegian
+     Portuguese Brazilian
+     Bahasa Indonesian
+     Estonian 
+     Finnish 
+     Czech
+ 
+ Databases Supported:
+ 
+      MySql
+      PostgreSql
+      Oracle
+      Sybase
+      Informix (not tested recently)
+ 
+ 
diff -r -N -C 2 imp-2.2.0-pre4/docs/INSTALL imp-2.2.0-pre5/docs/INSTALL
*** imp-2.2.0-pre4/docs/INSTALL	Fri Aug 27 02:36:54 1999
--- imp-2.2.0-pre5/docs/INSTALL	Tue Oct 19 20:54:45 1999
***************
*** 3,110 ****
  Copyright 1999 Ivan E. Moore II <rkrusty@tdyc.com>
  Copyright 1999 Mike Hardy <mikeh@spark.com>
  
  This code is licensed under the GNU Public License.
  See the file COPYING in this directory.
  
! Last Updated: 08/25/1999  [IEM]
  
  
! -------------------- 
! Requirements for IMP 
! ====================
  
  
!  * PHP 3.0.9 or greater with IMAP support (PHP4 does not work yet, but hey
! 	its still in beta)
  
!  * A web server supported by PHP (Apache is most widely used)
  
!  * An IMAP server to connect to.
  
!  * Horde MUST be installed. If it is not already, please download it, and
! 	follow the instructions in its INSTALL file BEFORE installing IMP.
  
-  * PERL if you want to use the manual config scripts.
  
!  * PHPLIB 7 or greater
  
! ----------------------
! Optional Requirements:
! ======================
  
  
!  * An SSL Web-server so the client connection to IMP is secure (Apache+mod_ssl+OpenSSL is
!      popular)
  
-  * A database and Database support compiled into PHP if you want support
-      for user preferences and addressbooks. See the DATABASE file in this
-      distribution for installation and configuration instructions here.
  
!  * LDAP support compiled into PHP if you want support for LDAP
!    searches. See the file 'horde/imp/config/ldap.php3' for configuration
!    instructions here.
  
  
  
  
! --------------
! Basic Features
! ==============
  
  
! Languages Supported:
  
!     Danish
!     German
!     English
!     Spanish
!     French
!     Italian
!     Norwegian
!     Nynorsk Norwegian
!     Portuguese Brazilian
!     Bahasa Indonesian
!     Estonian 
!     Finnish 
!     Czech
  
! Databases Supported:
  
!      MySql
!      PostgreSql
!      Oracle
!      Sybase
!      Informix (not tested recently)
  
  
  
  
! -----------------------
! Methods of Installation
! =======================
  
  
!              There is more than one way to setup IMP.
  
!          We will cover each of them in more detail here. There is more 
!          information below on database configuration as well.
  
  
  
! -=-=-=-=
! Manually
! -=-=-=-=
  
  
! 	  This is the hard way. It is, however, the most flexible. If you
! 	  want an easier method, examine the scripts section below.
  
! 	  The manual method of installing IMP is to grab the tarball,
!           untar it somewhere and run through the code making all the changes 
!           you need by hand.  In order to do this you must remember that IMP
!           and HORDE have been broken up into 2 separate distributions. You
!           need HORDE to use IMP.  HORDE contains the base functions for all
!           HORDE based applications.  Here is the process for doing all of this
!           by hand.
  
             1)  Obtain horde*.tar.gz and imp*tar.gz 
--- 3,218 ----
  Copyright 1999 Ivan E. Moore II <rkrusty@tdyc.com>
  Copyright 1999 Mike Hardy <mikeh@spark.com>
+ Copyright 1999 Doug Lumpkin <dougel@thecalling.net>
  
  This code is licensed under the GNU Public License.
  See the file COPYING in this directory.
+ Last Updated: 08/25/1999  [DEL]
  
! +++++++++
! Overview:
! +++++++++
  
+ This file contains the following sections:
+ 	  + Overview
+           + Requirements for IMP
+           + Installing IMP
+           + Additional Notes for IMP
+           
  
! +++++++++++++
! Requirements:
! +++++++++++++
  
+   ----------------
+   Mandatory Items:
+   ================
  
!    * PHP 3.0.12 or greater with IMAP support (PHP4 does not work yet, but hey
!        it's still in beta)
!   
!    * A web server supported by PHP (Apache is most widely used)
!   
!    * An IMAP server to connect to.
  
!    * Horde MUST be installed. If it is not already, please download it, and
!      follow the instructions in its INSTALL file BEFORE installing IMP.
  
!    * Perl if you want to use the manual config scripts.
  
!    * PHPLIB 7 or greater
  
  
!   ---------------
!   Optional Items:
!   ===============
  
!    * An SSL Web-server so the client connection to IMP is secure
!        (Apache+mod_ssl+OpenSSL is popular)
  
+    * A database and Database support compiled into PHP if you want support
+        for user preferences and addressbooks. See the DATABASE file in this
+        distribution for installation and configuration instructions here.
  
!    * LDAP support compiled into PHP if you want support for LDAP
!      searches. See the file 'horde/imp/config/ldap.php3' for configuration
!      instructions here.
  
  
! +++++++++++++++
! Installing IMP:
! +++++++++++++++
  
+   ---------------------------
+   Changes for your Webserver:
+   ===========================
  
+   This piece will cover what changes to your PHP3 and Web Server
+   configurations you need to make.
  
+   ==php3.ini==
  
!   In your php3.ini file there are a few things you need to do so that 
!   content appears the way it should and also so that you can use key
!   features such as IMAP.  :)
  
+   Under the Dynamic Extensions section:
  
!   ===Start===
  
!   ;;;;;;;;;;;;;;;;;;;;;;
!   ; Dynamic Extensions ;
!   ;;;;;;;;;;;;;;;;;;;;;;
!   ; if you wish to have an extension loaded automatically, use the
!   ; following syntax:  extension=modulename.extension
!   ; for example, on windows,
!   ; extension=msql.dll
!   ; or under UNIX,
!   ; extension=msql.so
!   ; Note that it should be the name of the module only, no directory information
!   ; needs to go here.  Specify the location of the extension with the 
!   ; extension_dir directive above.
!   extension=imap.so      ; Added for IMAP support
!   extension=mysql.so     ; Added for MySql support
!   extension=pgsql.so     ; Added for PostgreSql support
!   extension=ldap.so      ; Added for LDAP support
  
!   ===End===
  
!   You'll need to add the appropriate extensions for what you'll be using.  
!   Remember that if your running this server on a Windows box you'll be using
!   .dll extensions instead of .so extensions.   
  
+   ===Apache's srm.conf===
  
+   Now this file can look different depending on version and configuration so
+   I will just show the actual line within the file that we are concerned
+   with.
  
+   DirectoryIndex index.html index.php3
  
!   You need to make sure that index.php3 is listed in your DirectoryIndex
!   line in order for IMP to show up properly. I'm sure this line is 
!   called different things with different servers but the basic idea is
!   that you want the index.php3 file to be a default in the same sense that
!   index.html is.  
  
  
!   -------------------
!   Installation of IMP
!   ===================
  
!      There is more than one way to setup IMP. We will cover each of them
!      in more detail here. There is more information below on database
!      configuration as well.
  
  
+     =-=-=-=-=-
+     A) Scripts
+     =-=-=-=-=-
  
!        First untar the files:
!            cd <Document Root> #(i.e. /usr/local/apache/htdocs/ /www/htdocs/)
!            tar -xzf horde-(ver).tar.gz 
!            cd horde-(ver)
!            tar -xzf horde-(ver).tar.gz 
  
  
!            Scripts make everyone's life much easier.  Here are the two current
!            methods for setting up IMP using scripts.  
! 
!         Of the two methods, setup.php3 is the preferred method.
! 
! 
!         ==========
!         Setup.php3
!         ==========
! 
!         "setup.php3" is the name of a PHP system that will allow you
!            to configure IMP (out of the box) via the web.  For security reasons,
!            it is disabled by default, but you can enable it by saying:
! 
!              cd <horde dir> 
!              sh ./install.sh
! 
!            You should be able to point your browser to:
  
!              http://<your imp server>/<your horde home>/setup.php3
! 
!            At this point you can walk through the graphical setup program
!            and configure nearly all aspects of IMP.  Well, at least the major 
! 	   aspects. 
! 
!            When you are done be sure to disable it again!
! 
!               cd <horde dir>
!               sh ./secure.sh
! 
!         It should be noted that it does *NOT* do extended LDAP or database
! 	configuration at this time, please examine the DATABASE file for
! 	information regarding database configuration, and the file
! 	'horde/imp/config/ldap.php3' for LDAP configuration.
! 
!         Additionally, there are several lower-level configuration parameters
! 	that you may change directly by editing various config files in the
! 	<horde>/imp/config directory. Most of them have fairly
! 	self-explanatory names, or are commented to describe their
! 	functionality.
! 
! 
! 
!         ===========
!         impsetup.pl
!         ===========
! 
!            *** NOTE *** This is really outdated *** NOTE*** impsetup.pl was
! 	   originally started by Jason (same as the setup.php3) and as he
! 	   started to work on the setup.php3 process he dumped it off onto
! 	   Ivan.  Ivan has since slapped it together and finished it up. To
! 	   use the script all you have to do is:
! 
!                  cd <impdir>/config/scripts
!                  ./impsetup.pl    (you may have to do perl ./impsetup.pl)
! 
!            Fill out all options under each of the sections and after you
! 	   finish them you should have a functioning IMP installation.
! 	   Please note that if you use this procedure, you need to chmod 000
! 	   horde/setup.php3 since you won't be using it and IMP won't run
! 	   while it is readable (for security reasons).
! 
!     -=-=-=-=
!     B) Manually
!     -=-=-=-=
! 
! 
!        This is the hard way. It is, however, the most flexible. If you want
!        an easier method, examine the scripts section above.
! 
!           The manual method of installing IMP is to grab the tarball, untar
! 	  it somewhere and run through the code making all the changes you
! 	  need by hand.  In order to do this you must remember that IMP and
! 	  HORDE have been broken up into 2 separate distributions. You need
! 	  HORDE to use IMP.  HORDE contains the base functions for all HORDE
! 	  based applications.  Here is the process for doing all of this by
! 	  hand.
  
             1)  Obtain horde*.tar.gz and imp*tar.gz 
***************
*** 116,121 ****
                 setup the Horde module.  
  
! 	   4)  Change into the 'horde' directory, and untar/gzip imp.
! 	       Change the directory name from "imp-2.2.xx" to "imp"
                 Make sure your directory structure is like this:
  
--- 224,229 ----
                 setup the Horde module.  
  
!            4)  Change into the 'horde' directory, and untar/gzip imp.
!                Change the directory name from "imp-2.2.xx" to "imp"
                 Make sure your directory structure is like this:
  
***************
*** 128,136 ****
                libraries now.
  
! 	      Go into 'horde/lib/src' and run the following command:
  
                    ./build.pl --help
  
! 	      It will print out instructions on its use.
  
             6) Move into 'horde/imp/lib/src' and run the 'build.pl' there.
--- 236,244 ----
                libraries now.
  
!            Go into 'horde/lib/src' and run the following command:
  
                    ./build.pl --help
  
!            It will print out instructions on its use.
  
             6) Move into 'horde/imp/lib/src' and run the 'build.pl' there.
***************
*** 141,147 ****
                It will print out instructions on its use.
  
! 	      The one nice thing about build.pl is that you can create a
! 	      file called build.opts in that same directory and put all
! 	      your options you want to use in that file in this format:
  
                            option=value
--- 249,255 ----
                It will print out instructions on its use.
  
!            The one nice thing about build.pl is that you can create a
!            file called build.opts in that same directory and put all
!            your options you want to use in that file in this format:
  
                            option=value
***************
*** 151,163 ****
                            database=postgres
  
!               When build.pl runs it will check that file and use any values
! 	      in it as defaults.  This is nice for keeping your
! 	      configuration the same and automating upgrades/installs.
  
! 	      This program will build the horde library containing only the
! 	      routines necessary for the options you configured it for.
  
! 	      At this point, you're horde library and IMP libraries are
! 	      built.
  
  
--- 259,271 ----
                            database=postgres
  
!            When build.pl runs it will check that file and use any values
!            in it as defaults.  This is nice for keeping your
!            configuration the same and automating upgrades/installs.
  
!            This program will build the horde library containing only the
!            routines necessary for the options you configured it for.
  
!            At this point, you're horde library and IMP libraries are
!            built.
  
  
***************
*** 178,182 ****
             left alone to begin with.
  
! 	   'horde/imp/config/defaults.php3' contains a large number of
             defaults that you'll need to configure for your system, such as
             the default IMAP server, whether or not users can pick a
--- 286,290 ----
             left alone to begin with.
  
!            'horde/imp/config/defaults.php3' contains a large number of
             defaults that you'll need to configure for your system, such as
             the default IMAP server, whether or not users can pick a
***************
*** 205,503 ****
             screen to alert your users to important information in a timely way.
  
- =-=-=-=-=-
- B) Scripts
- =-=-=-=-=-
- 
- 
-            Scripts make everyone's life much easier.  Here are the two current
-            methods for setting up IMP using scripts.  
- 
- 	   Of the two methods, setup.php3 is the preferred method.
- 
- 
- 	   ==========
- 	   Setup.php3
- 	   ==========
- 
- 	   "setup.php3" is the name of a PHP system that will allow you
-            to configure IMP (out of the box) via the web.  For security reasons,
-            it is disabled by default, but you can enable it by saying:
- 
- 		 cd <horde dir> 
- 		 sh ./install.sh
- 
-            You should be able to point your browser to:
- 
-                  http://<your imp server>/<your horde home>/setup.php3
- 
-            When you are done be sure to disable it again!
- 
- 		cd <horde dir>
- 		sh ./secure.sh
- 
-            At this point you can walk through the graphical setup program
-            and configure nearly all aspects of IMP.  Well, at least the major aspects. 
- 
- 	   It should be noted that it does *NOT* do extended LDAP or database
- 	   configuration at this time, please examing the DATABASE file for
- 	   information regarding database configuration, and the file
- 	   'horde/imp/config/ldap.php3' for LDAP configuration.
- 
- 	   Additionally, there are several lower-level configuration parameters
-            that you may change directly by editing various config files in the
- 	   <horde>/imp/config directory. Most of them have fairly self-explanatory
- 	   names, or are commented to describe their functionality.
- 
- 
- 
- 	   ===========
- 	   impsetup.pl
- 	   ===========
- 
-            *** NOTE *** This is really outdated *** NOTE***
-            impsetup.pl was originally started by Jason (same as the setup.php3)
-            and as he started to work on the setup.php3 process he dumped it off
-            onto Ivan.  Ivan has since slapped it together and finished it up.
-            To use the script all you have to do is:
- 
-                  cd <impdir>/config/scripts
-                  ./impsetup.pl    (you may have to do perl ./impsetup.pl)
- 
-            Fill out all options under each of the sections and after
-            you finish them you should have a functioning IMP installation.  
-            Please note that if you use this procedure, you need to chmod 000
-            horde/setup.php3 since you won't be using it and IMP won't run
-            while it is readable (for security reasons).
- 
- 
- 
- ============
- IMP Packages
- ------------
- 
- 
-                 Packages are by far the easiest way to install any program.  
-            The reason I say this is because most of the work is done for you.
-            By the use of scripts the maintainer of the package takes care of
-            most configuration issues and the program is (most of the time)
-            pretty much plug and play.
- 
- 	        Setting up IMP can be a pain (as seen above) there are several
-            steps you must take in order to get everything installed and
-            operational.  Currently there are 2 types of packaging out there in
-            use.  (there are probably more but these are the ones I know
-            of). They are:  RPM (RedHat Package Management) which has a .rpm
-            extension, Debian Package format which has a .deb extension.
- 
-                There is currently a Debian package being maintained by Ivan  
-            Moore II.  It is available from http://horde.tdyc.com/
-            and will shortly be available within the Debian distribution.  This
-            package takes care of most configuration issues and still allows you
-            to customize your IMP installation. This package also detects 
-            Postgres and MySql installations and will automagically configure
-            either for use with IMP. After installing this package you will
-            have a functional IMP installation.
- 
- 	       There is currently an RPM package being maintained by Dale Lovelace
- 	   <dale@redhat.com> . It is available from http://ftp.horde.org/.
- 
- 
- 
- --------------------------
- Installation Notes for IMP 
- ==========================
- 
- 
- Security Notes:
- 
-    index.php3 is the root of the frame system. If you want IMP to use a secure
-    connection (SSL), then you need to somehow make sure that users access IMP
-    as https://your.server.here/your/path/to/imp/, not as http://blah... 
- 
-    Also, note that the file setup.php3 can be used to configure IMP
-    over the web. This is insecure. For this reason, it should not be
-    readable while IMP is in use, and IMP, in fact, checks to make sure
-    that it is not.
- 
-    All caching flags have been flipped in order to make sure that no 
-    caching takes place.  You can turn on web local caching within your
-    defaults.php3 file (default->cache_pages) but it isn't recommended
-    as it is a security risk.  Netscape doesn't handle non-cached pages
-    very well and if you are in a compose window and you resize your
-    screen you will lose the data inside of it. Mozilla/Netscape5 will change 
-    this.
- 
- Language Notes:
- 
-    Netscape for some reason reports language choices in reverse order.  So
- if you have french as your primary language and english as a secondary and
- you go to the IMP page, it may show up in English.
- 
- 
- ----------------------
- Database Configuration
- ======================
- 
- 
- One of the biggest problems people have while installing IMP is getting
- the database setup.  Questions range from how to install the database
- to how to configure it for IMP.  While it's not our job to help you
- install your database, we are working on ways to help you configure it.
- 
- There is now a separate text file for help with database configuration.
- Please checkout DATABASE in the same directory for further assistance.
- 
- 
- 
  
! -----------------------
! PHP3 and Apache Changes
! =======================
  
  
! Well, not necessarily Apache, but your Web Server in general.  This piece
! will cover what changes to your PHP3 and Web Server configuration you
! need to do for things to work 100% (or pretty close).  
  
! ==php3.ini==
! 
! In your php3.ini file there are a few things you need to do so that 
! content appears the way it should and also so that you can use key
! features such as IMAP.  :)
! 
! Under the Dynamic Extensions section:
! 
! ===Start===
! 
! ;;;;;;;;;;;;;;;;;;;;;;
! ; Dynamic Extensions ;
! ;;;;;;;;;;;;;;;;;;;;;;
! ; if you wish to have an extension loaded automaticly, use the
! ; following syntax:  extension=modulename.extension
! ; for example, on windows,
! ; extension=msql.dll
! ; or under UNIX,
! ; extension=msql.so
! ; Note that it should be the name of the module only, no directory information
! ; needs to go here.  Specify the location of the extension with the extension_dir directive above.
! extension=imap.so      ; Added for IMAP support
! extension=mysql.so     ; Added for MySql support
! extension=pgsql.so     ; Added for PostgreSql support
! extension=ldap.so      ; Added for LDAP support
! 
! ===End===
! 
! You'll need to add the appropriate extensions for what you'll be using.  
! Remember that if your running this server on a Windows box you'll be using
! .dll extensions instead of .so extensions.   
! 
! ===Apache's srm.conf===
! 
! Now this file can look different depending on version and configuration so
! I will just show the actual line within the file that we are concerned
! with.
! 
! DirectoryIndex index.html index.php3
! 
! You need to make sure that index.php3 is listed in your DirectoryIndex
! line in order for IMP to show up properly. I'm sure this line is 
! called different things with different servers but the basic idea is
! that you want the index.php3 file to be a default in the same sense that
! index.html is.  
! 
! 
! ===== Putting IMP as Apache's web-root ==========
! 
! A lot of people would like to have IMP be Apache's web-root, so that they
! can simply specify a server and not have to type anything else in. If you
! want to do this, you need to add these lines to your httpd.conf:
! 
! ===Start===
! DocumentRoot /home/httpd/htdocs/horde/imp
! Alias /horde/ /home/httpd/htdocs/horde/
! ===End===
! 
! Where "/home/httpd/htdocs/horde/" is where ever you have installed the
! Horde package (with IMP under it).
! 
! Note that these lines are probably already in your httpd.conf somewhere,
! and it might be best to just modify them, or add them individually in the
! location the other references to "DocumentRoot" and "Alias" are.
! 
! 
! ====== Using Apache's config files to handle phplib prepends ========
  
- # Added for HORDE
- <Directory /usr/share/horde>
- Options Indexes FollowSymLinks
- AllowOverride None
- order allow,deny
- allow from all
- php3_include_path /etc/horde:/usr/lib/phplib
- php3_auto_prepend_file /etc/horde/prepend.php3
- php3_magic_quotes_gpc Off
- </Directory>
  
  
! Adding something like the above to either Apaches httpd.conf or access.conf
! (it doesn't seem to matter which conf file it goes in anymore) will allow
! per directory loading of the required phplib files.  Otherwise if you throw
! the prepend line into your php3.ini file, these files will be loaded for
! every page that is loaded on your server which could be bad if one of the
! phplib files were to get hosed.  Doing the above limits your possible problems
! due to a mistake or bad php or whatever to just your horde web tree.
  
! To explain the above I'll break it down.
  
! The first 4 lines:
  
!   Options Indexes FollowSymLinks
!   AllowOverride None
!   order allow,deny
!   allow from all
  
! are normal Apache settings.  You can change them to whatever you want, I just
! used the defaults.
  
! The next 3 lines are what we need for things to work:
  
! php3_include_path /etc/horde:/usr/lib/phplib
! php3_auto_prepend_file /etc/horde/prepend.php3
! php3_magic_quotes_gpc Off
  
! the include path will have both your phplib include path, ie..where your
! core phplib files are, and the path to where you placed your horde phplib
! files.  The default location is in horde/phplib but for a Debian install,
! which is where the above lines are from, I moved all the horde config
! files into /etc/horde.  These included the files out of horde/phplib.
  
! So your configuration may look something like this:
  
! (for this example let's say your web tree is /home/httpd/html and your
! phplib files are storged in /home/httpd/phplib and your horde files are
! in /home/httpd/html/horde.  And let's say you left your horde phplib files
! where they were, in /home/httpd/html/horde/phplib)
  
! Your Directory config would look like this:
  
- <Directory /home/httpd/html/horde>
- Options Indexes FollowSymLinks
- AllowOverride None
- order allow,deny
- allow from all
- php3_include_path /home/httpd/html/horde:/home/httpd/phplib
- php3_auto_prepend_file /home/httpd/phplib/prepend.php3
- php3_magic_quotes_gpc Off
- </Directory>
  
  
- Now keep in mind you really need to read the README in the phplib directory
- of horde as there are some things you need to take care of in that prepend
- file.
  
  
! ---------------------
  Getting Help with IMP
! =====================
  
  There is an online, user-editable FAQ at http://faq.horde.org/. Use it, and
--- 313,460 ----
             screen to alert your users to important information in a timely way.
  
  
! ++++++++++++++++++++++++
! Additional Notes for IMP 
! ++++++++++++++++++++++++
! 
!   ----------------------
!   Database Configuration
!   ======================
! 
! 
!   One of the biggest problems people have while installing IMP is getting
!   the database setup.  Questions range from how to install the database
!   to how to configure it for IMP.  While it's not our job to help you
!   install your database, we are working on ways to help you configure it.
! 
!   There is now a separate text file for help with database configuration.
!   Please checkout DATABASE in the same directory for further assistance.
! 
!   ---------------
!   Security Notes:
!   ===============
!   index.php3 is the root of the frame system. If you want IMP to use a secure
!   connection (SSL), then you need to somehow make sure that users access IMP
!   as https://your.server.here/your/path/to/imp/, not as http://blah... 
! 
!   Also, note that the file setup.php3 can be used to configure IMP
!   over the web. This is insecure. For this reason, it should not be
!   readable while IMP is in use, and IMP, in fact, checks to make sure
!   that it is not.
! 
!   All caching flags have been flipped in order to make sure that no 
!   caching takes place.  You can turn on web local caching within your
!   defaults.php3 file (default->cache_pages) but it isn't recommended
!   as it is a security risk.  Netscape doesn't handle non-cached pages
!   very well and if you are in a compose window and you resize your
!   screen you will lose the data inside of it. Mozilla/Netscape5 will change 
!   this.
! 
!   ---------------
!   Language Notes:
!   ===============
!   Netscape for some reason reports language choices in reverse order.  So
!   if you have french as your primary language and english as a secondary and
!   you go to the IMP page, it may show up in English.
! 
! 
!   -------------------
!   Apache & PHP Notes:
!   ===================
! 
!   ===== Putting IMP as Apache's web-root ==========
! 
!   A lot of people would like to have IMP be Apache's web-root, so that they
!   can simply specify a server and not have to type anything else in. If you
!   want to do this, you need to add these lines to your httpd.conf:
! 
!   ===Start===
!   DocumentRoot /home/httpd/htdocs/horde/imp
!   Alias /horde/ /home/httpd/htdocs/horde/
!   ===End===
! 
!   Where "/home/httpd/htdocs/horde/" is where ever you have installed the
!   Horde package (with IMP under it).
! 
!   Note that these lines are probably already in your httpd.conf somewhere,
!   and it might be best to just modify them, or add them individually in the
!   location the other references to "DocumentRoot" and "Alias" are.
  
  
!   ====== Using Apache's config files to handle phplib prepends ========
  
!   # Added for HORDE
!   <Directory /usr/share/horde>
!   Options Indexes FollowSymLinks
!   AllowOverride None
!   order allow,deny
!   allow from all
!   php3_include_path /etc/horde:/usr/lib/phplib
!   php3_auto_prepend_file /etc/horde/prepend.php3
!   php3_magic_quotes_gpc Off
!   </Directory>
  
  
+   Adding something like the above to either Apaches httpd.conf or access.conf
+   (it doesn't seem to matter which conf file it goes in anymore) will allow
+   per directory loading of the required phplib files.  Otherwise if you throw
+   the prepend line into your php3.ini file, these files will be loaded for
+   every page that is loaded on your server which could be bad if one of the
+   phplib files were to get hosed.  Doing the above limits your possible problems
+   due to a mistake or bad php or whatever to just your horde web tree.
  
!   To explain the above I'll break it down.
  
!   The first 4 lines:
  
!     Options Indexes FollowSymLinks
!     AllowOverride None
!     order allow,deny
!     allow from all
  
!   are normal Apache settings.  You can change them to whatever you want, I just
!   used the defaults.
  
!   The next 3 lines are what we need for things to work:
  
!     php3_include_path /etc/horde:/usr/lib/phplib
!     php3_auto_prepend_file /etc/horde/prepend.php3
!     php3_magic_quotes_gpc Off
  
!   the include path will have both your phplib include path, ie..where your
!   core phplib files are, and the path to where you placed your horde phplib
!   files.  The default location is in horde/phplib but for a Debian install,
!   which is where the above lines are from, I moved all the horde config
!   files into /etc/horde.  These included the files out of horde/phplib.
  
!   So your configuration may look something like this:
  
!   (for this example let's say your web tree is /home/httpd/html and your
!   phplib files are stored in /home/httpd/phplib and your horde files are
!   in /home/httpd/html/horde.  And let's say you left your horde phplib files
!   where they were, in /home/httpd/html/horde/phplib)
  
!     Your Directory config would look like this:
  
!     <Directory /home/httpd/html/horde>
!     Options Indexes FollowSymLinks
!     AllowOverride None
!     order allow,deny
!     allow from all
!     php3_include_path /home/httpd/html/horde:/home/httpd/phplib
!     php3_auto_prepend_file /home/httpd/phplib/prepend.php3
!     php3_magic_quotes_gpc Off
!     </Directory>
  
  
+   Now keep in mind you really need to read the README in the phplib directory
+   of horde as there are some things you need to take care of in that prepend
+   file.
  
  
  
! +++++++++++++++++++++
  Getting Help with IMP
! +++++++++++++++++++++
  
  There is an online, user-editable FAQ at http://faq.horde.org/. Use it, and
diff -r -N -C 2 imp-2.2.0-pre4/docs/PACKAGES imp-2.2.0-pre5/docs/PACKAGES
*** imp-2.2.0-pre4/docs/PACKAGES	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/docs/PACKAGES	Wed Oct 20 03:12:34 1999
***************
*** 0 ****
--- 1,43 ----
+ Information on IMP Packages
+ Copyright 1998,1999 Charles J. Hagenbuch <chuck@horde.org>
+ Copyright 1999 Ivan E. Moore II <rkrusty@tdyc.com>
+ Copyright 1999 Mike Hardy <mikeh@spark.com>
+ Copyright 1999 Doug Lumpkin <dougel@thecalling.net>
+ 
+ This code is licensed under the GNU Public License.
+ See the file COPYING in this directory.
+ 
+ Last Updated: 10/19/1999  [DEL]
+ 
+ 
+ ============
+ IMP Packages
+ ------------
+ 
+ 
+                 Packages are by far the easiest way to install any program.  
+            The reason I say this is because most of the work is done for you.
+            By the use of scripts the maintainer of the package takes care of
+            most configuration issues and the program is (most of the time)
+            pretty much plug and play.
+ 
+ 	        Setting up IMP can be a pain there are several steps you must
+            take in order to get everything installed and operational.  Currently 
+            there are 2 types of packaging out there in use.  (there are probably
+            more but these are the ones I know of). They are:  RPM (RedHat Package
+            Management) which has a .rpm extension, Debian Package format which has
+            a .deb extension.
+ 
+                There is currently a Debian package being maintained by Ivan  
+            Moore II.  It is available from http://horde.tdyc.com/
+            and will shortly be available within the Debian distribution.  This
+            package takes care of most configuration issues and still allows you
+            to customize your IMP installation. This package also detects 
+            Postgres and MySql installations and will automagically configure
+            either for use with IMP. After installing this package you will
+            have a functional IMP installation.
+ 
+ 	       There is currently an RPM package being maintained by Dale Lovelace
+ 	   <dale@redhat.com> . It is available from http://ftp.horde.org/.
+ 
+ 
diff -r -N -C 2 imp-2.2.0-pre4/folders.php3 imp-2.2.0-pre5/folders.php3
*** imp-2.2.0-pre4/folders.php3	Thu Aug 19 14:24:14 1999
--- imp-2.2.0-pre5/folders.php3	Tue Oct  5 16:53:45 1999
***************
*** 5,10 ****
   File: folders.php3
   $Author: chuck $
!  $Revision: 2.10.2.3 $
!  $Date: 1999/08/19 18:24:14 $
   
   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: folders.php3
   $Author: chuck $
!  $Revision: 2.10.2.5 $
!  $Date: 1999/10/05 20:53:45 $
   
   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 89,94 ****
      
    case RENAME_FOLDER:
!     if ($old_mailbox && $moved_mailbox) {
!       if (!(imap_renamemailbox($imp->stream, "{$imp->server:$imp->port}$old_mailbox", "{$imp->server:$imp->port}$preamble" . "$moved_mailbox"))) {
  	$errormsg = $lang->rename_folder_error;
        }
--- 89,94 ----
      
    case RENAME_FOLDER:
!     if (!empty($old_mailbox) && !empty($new_mailbox)) {
!       if (!(imap_renamemailbox($imp->stream, "{$imp->server:$imp->port}$old_mailbox", "{$imp->server:$imp->port}$preamble" . $new_mailbox))) {
  	$errormsg = $lang->rename_folder_error;
        }
***************
*** 133,137 ****
  require("$default->include_dir/folders/header.inc");
  
! $options = mailbox_list(false);
  if ($default->use_imap_subscribe) {
    $newlist = full_mailbox_list(false);
--- 133,137 ----
  require("$default->include_dir/folders/header.inc");
  
! $options = mailbox_list(false, false, false, false);
  if ($default->use_imap_subscribe) {
    $newlist = full_mailbox_list(false);
diff -r -N -C 2 imp-2.2.0-pre4/index.php3 imp-2.2.0-pre5/index.php3
*** imp-2.2.0-pre4/index.php3	Thu Aug 26 09:41:21 1999
--- imp-2.2.0-pre5/index.php3	Sun Sep  5 14:05:50 1999
***************
*** 8,15 ****
  if ($imp_configured && $imp_lib_configured && ! $imp_configurable) {
    /* Bring in the horde library for the WebClient class */
!   if (!defined("HORDE_LIB"))
!     include '../lib/horde.lib';
!     include './config/defaults.php3';
!  
    /* Detect that browser */
    $this_client = new WebClient;
--- 8,15 ----
  if ($imp_configured && $imp_lib_configured && ! $imp_configurable) {
    /* Bring in the horde library for the WebClient class */
!   if (!defined("HORDE_LIB")) include '../lib/horde.lib';
!   if (!defined('IMP_LIB'))   include './lib/imp.lib';
!   include './config/defaults.php3';
!   
    /* Detect that browser */
    $this_client = new WebClient;
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/build.pl imp-2.2.0-pre5/lib/src/build.pl
*** imp-2.2.0-pre4/lib/src/build.pl	Tue Aug 17 13:20:19 1999
--- imp-2.2.0-pre5/lib/src/build.pl	Sat Sep 18 23:09:24 1999
***************
*** 83,87 ****
  		      # Imp specific objects
  		      'objects/IMAPServer.object',
- 		      'objects/ImpSession.object',
  		      'objects/ImpDefaults.object',
  		      'objects/LDAPServer.object',
--- 83,86 ----
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/config/imp.config imp-2.2.0-pre5/lib/src/config/imp.config
*** imp-2.2.0-pre4/lib/src/config/imp.config	Tue Aug 17 13:20:20 1999
--- imp-2.2.0-pre5/lib/src/config/imp.config	Sat Sep 18 23:09:25 1999
***************
*** 14,18 ****
  need_file( 'IMAPServer.object',        'IMAPServer Object');
  need_file( 'ImpDefaults.object',       'ImpDefaults Object');
- need_file( 'ImpSession.object',        'IMP Session Object');
  need_file( 'LDAPServer.object',        'IMP - LDAPServer Object' );
  
--- 14,17 ----
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/db/v1/functions/dummy/imp_get_from.func imp-2.2.0-pre5/lib/src/db/v1/functions/dummy/imp_get_from.func
*** imp-2.2.0-pre4/lib/src/db/v1/functions/dummy/imp_get_from.func	Wed Apr 28 07:41:29 1999
--- imp-2.2.0-pre5/lib/src/db/v1/functions/dummy/imp_get_from.func	Mon Oct  4 14:04:40 1999
***************
*** 1,3 ****
  function imp_get_from ($user, $server) {
!    return "$user@$server";
  }
--- 1,3 ----
  function imp_get_from ($user, $server) {
!    return false;
  }
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/defines/ImpLibVersion.def imp-2.2.0-pre5/lib/src/defines/ImpLibVersion.def
*** imp-2.2.0-pre4/lib/src/defines/ImpLibVersion.def	Fri Aug 27 14:34:03 1999
--- imp-2.2.0-pre5/lib/src/defines/ImpLibVersion.def	Wed Oct 20 13:17:19 1999
***************
*** 1 ****
! define("IMP_VERSION", "2.2.0-pre4");
\ No newline at end of file
--- 1 ----
! define("IMP_VERSION", "2.2.0-pre5");
\ No newline at end of file
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/functions/decode_mime_string.func imp-2.2.0-pre5/lib/src/functions/decode_mime_string.func
*** imp-2.2.0-pre4/lib/src/functions/decode_mime_string.func	Wed Jul 14 17:56:05 1999
--- imp-2.2.0-pre5/lib/src/functions/decode_mime_string.func	Wed Oct 13 22:41:45 1999
***************
*** 39,42 ****
--- 39,46 ----
      $encoded_text = str_replace('=', '%', $encoded_text);
      $decoded = urldecode($encoded_text);
+     
+     if (strtolower($charset) == 'windows-1251') {
+       $decoded = convert_cyr_string($decoded, 'w', 'k');
+     }
      break;
      
***************
*** 44,47 ****
--- 48,55 ----
    case 'b':
      $decoded = urldecode(base64_decode($encoded_text));
+     
+     if (strtolower($charset) == 'windows-1251') {
+       $decoded = convert_cyr_string($decoded, 'w', 'k');
+     }
      break;
      
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/functions/get_barefrom.func imp-2.2.0-pre5/lib/src/functions/get_barefrom.func
*** imp-2.2.0-pre4/lib/src/functions/get_barefrom.func	Tue Aug 24 13:16:37 1999
--- imp-2.2.0-pre5/lib/src/functions/get_barefrom.func	Mon Oct  4 14:04:42 1999
***************
*** 1,14 ****
  function get_barefrom () {
!   /* format the bare (ie, just address@server.domain format) correctly */
!   global $default, $imp;
!   
!   if ($default->user_change_from) {
!     $barefrom = imp_get_from($imp->user, $imp->server);
!   }
!   if (empty($barefrom))
!     $barefrom = $imp->user;
!   if (!strstr($barefrom, '@')) /* allow proper use of user@server usernames */
!     $barefrom .= '@' . $imp->from_server;
!   
!   return $barefrom;
  }
--- 1,18 ----
  function get_barefrom () {
!     /* format the bare (ie, just address@server.domain format) correctly */
!     global $default, $imp, $_barefrom;
!     
!     if ($default->user_change_from) {
! 	if (empty($_barefrom))
! 	    $_barefrom = imp_get_from($imp->user, $imp->server);
!     }
! 
!     if (empty($_barefrom))
! 	$_barefrom = $imp->user;
!     
!     if (!strstr($_barefrom, '@')) { /* allow proper use of user@server usernames */
! 	$_barefrom .= '@' . $imp->from_server;
!     }
!     
!     return $_barefrom;
  }
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/functions/mailbox_list.func imp-2.2.0-pre5/lib/src/functions/mailbox_list.func
*** imp-2.2.0-pre4/lib/src/functions/mailbox_list.func	Fri Aug 13 12:48:22 1999
--- imp-2.2.0-pre5/lib/src/functions/mailbox_list.func	Tue Oct 12 22:15:14 1999
***************
*** 1,6 ****
  /* obtain a list of mailboxes */
! function mailbox_list ($header=false, $options='', $full_list=false, $abbrev=false) {
    global $imp, $default, $lang;
    
    if ($default->use_imap_subscribe && !$full_list) {
      $mboxes = imap_listsubscribed($imp->stream, '{' . "$imp->server:$imp->port" . '}', "$imp->folders*");
--- 1,8 ----
  /* obtain a list of mailboxes */
! function mailbox_list ($header=false, $full_list=false, $abbrev=false, $inbox=true) {
    global $imp, $default, $lang;
    
+   $options = '';
+   
    if ($default->use_imap_subscribe && !$full_list) {
      $mboxes = imap_listsubscribed($imp->stream, '{' . "$imp->server:$imp->port" . '}', "$imp->folders*");
***************
*** 26,32 ****
  	  /* Check to see if we need to do special Cyrus labeling */
  	  if (strlen($default->personal_folders) > 0) {
! 	    if (strcmp($default->personal_folders,
! 		       substr($label,0,strlen($default->personal_folders)))==0) {
! 	      $label = str_replace("$default->personal_folders",'', $label);
  	    }
  	  }
--- 28,33 ----
  	  /* Check to see if we need to do special Cyrus labeling */
  	  if (strlen($default->personal_folders) > 0) {
! 	    if (strcmp($default->personal_folders, substr($label, 0, strlen($default->personal_folders))) == 0) {
! 	      $label = substr($label, strlen($default->personal_folders));
  	    }
  	  }
***************
*** 45,50 ****
    }
    
!   $options = '<option value="INBOX">INBOX</option>' . $options;
!   if ($header) { $options = '<option value="">' . $lang->imp->selected_messages . '</option>' . $options; }
    
    return $options;
--- 46,51 ----
    }
    
!   if ($inbox) $options = '<option value="INBOX">INBOX</option>' . $options;
!   if ($header) $options = '<option value="">' . $lang->imp->selected_messages . '</option>' . $options;
    
    return $options;
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/functions/mime_view_html.func imp-2.2.0-pre5/lib/src/functions/mime_view_html.func
*** imp-2.2.0-pre4/lib/src/functions/mime_view_html.func	Thu May 20 00:39:18 1999
--- imp-2.2.0-pre5/lib/src/functions/mime_view_html.func	Sat Sep 18 23:54:03 1999
***************
*** 10,29 ****
  
     /* now render impotent evil client-side-executable code */
!    $data = eregi_replace("<script", "<imp_cleaned_script_tag", $data);
!    $data = eregi_replace("</script", "</imp_cleaned_script_tag", $data);
     
!    $data = eregi_replace("<embed", "<imp_cleaned_embed_tag", $data);
!    $data = eregi_replace("</embed", "</imp_cleaned_embed_tag", $data);
! 
!    $data = eregi_replace("<java", "<imp_cleaned_java_tag", $data);
!    $data = eregi_replace("</java", "</imp_cleaned_java_tag", $data);
! 
!    $data = eregi_replace("<object", "<imp_cleaned_object_tag", $data);
!    $data = eregi_replace("</object", "</imp_cleaned_object_tag", $data);
! 
!    $data = eregi_replace("<style", "<imp_cleaned_style_tag", $data);
!    $data = eregi_replace("</style", "</imp_cleaned_style_tag", $data);
! 
!    $data = eregi_replace("href=\"(.*)script:", "href=\"imp_cleaned_\\1script:", $data);
     
     return $data;
--- 10,23 ----
  
     /* now render impotent evil client-side-executable code */
!    $data = eregi_replace("<([^>]*)script", "<imp_cleaned_script_tag", $data);
!    $data = eregi_replace("<([^>]*)embed", "<imp_cleaned_embed_tag", $data);
!    $data = eregi_replace("<([^>]*)java", "<imp_cleaned_java_tag", $data);
!    $data = eregi_replace("<([^>]*)object", "<imp_cleaned_object_tag", $data);
!    $data = eregi_replace("<([^>]*)style", "<imp_cleaned_style_tag", $data);
!    $data = eregi_replace("href=\"(.*)script:", "href=\"imp_cleaned_script:", $data);
     
!    /* check for {..} and mocha urls, re: recent bugtraq advisory */
!    $data = eregi_replace("<([^>]*)&{.*}([^>]*)>", "<&{;}\\3>", $data);
!    $data = eregi_replace("<([^>]*)mocha:([^>]*)>", "<imp_cleaned_mocha:\\2>", $data);
     
     return $data;
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/functions/unsub_mailbox_list.func imp-2.2.0-pre5/lib/src/functions/unsub_mailbox_list.func
*** imp-2.2.0-pre4/lib/src/functions/unsub_mailbox_list.func	Wed Jul 28 18:44:09 1999
--- imp-2.2.0-pre5/lib/src/functions/unsub_mailbox_list.func	Sun Sep  5 07:30:33 1999
***************
*** 16,20 ****
        $j = 0;
        while (($j < count($sub_list)) && (!$match)) {
! 	if ($full_list[$i] == $sub_list[$j]) {
  	  $match = true;
  	}
--- 16,20 ----
        $j = 0;
        while (($j < count($sub_list)) && (!$match)) {
! 	if (isset($sub_list[$j]) && $full_list[$i] == $sub_list[$j]) {
  	  $match = true;
  	}
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/objects/ImpDefaults.object imp-2.2.0-pre5/lib/src/objects/ImpDefaults.object
*** imp-2.2.0-pre4/lib/src/objects/ImpDefaults.object	Thu Aug 26 20:19:13 1999
--- imp-2.2.0-pre5/lib/src/objects/ImpDefaults.object	Tue Oct  5 16:34:41 1999
***************
*** 15,22 ****
    
    /* URL Configuraton */
-   var $localhost = 'localhost';				/* hostname of local host */
    var $root_url = '';                        /* imp base url */
    var $graphics_url = '/graphics';                    /* imp specfic graphics */
-   var $change_password = false;              /* set to an url to have a change password link */
    var $return_link = false;
    
--- 15,20 ----
***************
*** 112,115 ****
--- 110,118 ----
    var $answered_flag   = 'a';
    var $attachment_flag = 'f';
+ 
+   /* Password Options */
+   var $change_password = false;              /* set to an url to have a change password link */
+   var $poppassd_server = '/dev/null';
+   var $poppassd_port = '0';
    
    
diff -r -N -C 2 imp-2.2.0-pre4/lib/src/objects/ImpSession.object imp-2.2.0-pre5/lib/src/objects/ImpSession.object
*** imp-2.2.0-pre4/lib/src/objects/ImpSession.object	Mon Aug 23 13:50:17 1999
--- imp-2.2.0-pre5/lib/src/objects/ImpSession.object	Wed Dec 31 19:00:00 1969
***************
*** 1,199 ****
- class ImpSession {
-   
-   var $classname = 'ImpSession';
-   var $persistent_slots = array('data');
-   var $data = array();
-   
-   // protocol variables
-   var $server;
-   var $port;
-   var $servtype;
-   var $user;
-   var $pass;
-   
-   // session vars
-   var $key;     // session key
-   var $mailbox; // current mailbox
-   var $folders; // folders var
-   var $sortby;  // sort criteria
-   var $sortdir; // sort ordering
-   var $msgl;    // ordered message listing
-   var $delhide; // hide deleted messages
-   var $from_server; // from server
-   var $offset;
-   
-   
-   // class constructor
-   function ImpSession () {
-     global $default;
-     
-     // sane defaults
-     $this->server = $default->server;
-     $this->port = $default->port;
-     $this->servtype = $default->servtype;
-     $this->mailbox = 'INBOX';
-     $this->folders = $default->folders;
-     $this->sortby = $default->sort_crit;
-     $this->sortdir = $default->sort_dir;
-     $this->from_server = $default->from_server;
-   } // Constructor
-   
-   
-   // class methods
-   function authenticate ($flags=0) {
-     global $REMOTE_ADDR, $default;
-     
-     if ($this->servtype == 'pop3')
-       $connstr = '{' . $this->server . ':' . $this->port . '/pop3}';
-     else if ($this->servtype == 'news') {
-       $connstr = '{' . $this->server . ':' . $this->port . '/nntp}#news';
-       $flags = $flags | OP_ANONYMOUS;
-     } else // default to imap connections
-       $connstr = '{' . $this->server . ':' . $this->port . '}' . $this->mailbox;
-     
-     if ($flags == 0)
-       $this->stream = @imap_open($connstr, $this->user, $this->pass);
-     else
-       $this->stream = @imap_open($connstr, $this->user, $this->pass, $flags);
-     
-     if (!$this->stream) {
-       if ($default->log_stats || $default->log_auth) {
- 	openlog($default->log_ident, LOG_PID, $default->log_stats_facil);
- 	if ($default->log_stats)
- 	  syslog($default->log_prio, "ImpSession->authenticate $REMOTE_ADDR login FAIL $this->server:$this->port");
- 	if ($default->log_auth)
- 	  syslog($default->log_prio | $default->log_auth_facil, "FAILED $REMOTE_ADDR to $this->server:$this->port as $this->user");
- 	closelog();
-       }
-       global $sess;
-       $sess->unregister('imp');
-       $this->relogin();
-     }
-   } // authenticate()
-   
-   function relogin () {
-     global $sidebar;
-     if (!isset($sidebar) || !$sidebar) {
-       header("Location: login.php3?reason=logout");
-       exit;
-     }
-   } // relogin()
-   
-   function construct () {
-     global $imapuser, $pass, $server, $port, $servtype, $folders, $default, $sess, $auth;
-     
-     $this->user = $imapuser;
-     $this->pass = $pass;
-     
-     if ($default->use_server_list) {
-       include './config/servers.php3';
-       global $IMAPServer;
-     }
-     
-     if ($default->use_server_list && ($iserver = @$IMAPServers[$IMAPServer])) {
-       $this->server   = $iserver->server;
-       $this->port     = $iserver->port;
-       $this->folders  = $iserver->folders;
-       $this->servtype = $iserver->servtype;
-       $this->from_server = $iserver->from_server;
-     } else {
-       // only set these if they are there - there are already sane defaults
-       if (isset($server) && $server) $this->server = $server;
-       if (isset($port) && $port) $this->port = $port;
-       if (isset($folders) && $folders) $this->folders = $folders;
-       if (isset($servtype) && $servtype) $this->servtype = $servtype;
-       if (isset($from_server) && $from_server) $this->from_server = $from_server;
-     }
-     
-     if (isset($sortby) && $sortby) $this->sortby = $sortby;
-     if (isset($sortdir) && $sortdir) $this->sortdir = $sortdir;
-     if (isset($mailbox) && $mailbox) $this->mailbox = $mailbox;
-     
-     $delhide = false;
-     
-     // internal
-     $this->config();
-     $this->setSorting();
-     $this->setMailbox();
-     $this->setLabel();
-   } // construct()
-   
-   // lots of small functions to do sanity checking and consult the defaults
-   function setSorting () {
-     global $sortby, $sortdir;
-     if (isset($sortby))
-       $this->sortby = $sortby;
-     if (isset($sortdir))
-       $this->sortdir = $sortdir;
-   } // setSorting()
-   
-   function setLabel () {
-     if (strlen($this->folders) == 0)
-       $this->label = $this->mailbox;
-     else
-       $this->label = str_replace($this->folders, '', $this->mailbox);
-   } // setLabel()
-   
-   function setLang ($lang) {
-     setcookie('chuckmIMPlang', $lang, 0, '/', '', 0);
-   } // setLang()
-   
-   function setMailbox () {
-     global $mailbox;
-     if (isset($mailbox) && $mailbox)
-       $this->mailbox = $mailbox;
-   } // setMailbox()
-   
-   /* Make any adjustments that are required due to the server type, etc. */ 
-   function config () {
-     global $default;
-     
-     if ($this->servtype == 'pop3')
-       $default->user_use_folders = false;
-   } // config()
-   
-   /* this sets up the $data var for phplib to serialize the object,
-      making everything nice and tidy. */
-   function pickle () {
-     $this->data = array();
-     $this->data['server'] = $this->server;
-     $this->data['port'] = $this->port;
-     $this->data['servtype'] = $this->servtype;
-     $this->data['user'] = $this->user;
-     $this->data['pass'] = $this->pass;
-     $this->data['mailbox'] = $this->mailbox;
-     $this->data['key'] = $this->key;
-     $this->data['msgl'] = $this->msgl;
-     $this->data['folders'] = $this->folders;
-     $this->data['sortby'] = $this->sortby;
-     $this->data['sortdir'] = $this->sortdir;
-     $this->data['delhide'] = $this->delhide;
-     $this->data['offset'] = $this->offset;
-   } // pickle
-   
-   /* retrieve everything from $this->data, which phplib has so nicely
-      saved for us. */
-   function unpickle () {
-     $this->server = $this->data['server'];
-     $this->port = $this->data['port'];
-     $this->servtype = $this->data['servtype'];
-     $this->user = $this->data['user'];
-     $this->pass = $this->data['pass'];
-     $this->mailbox = $this->data['mailbox'];
-     $this->key = $this->data['key'];
-     $this->msgl = $this->data['msgl'];
-     $this->folders = $this->data['folders'];
-     $this->sortby = $this->data['sortby'];
-     $this->sortdir = $this->data['sortdir'];
-     $this->delhide = $this->data['delhide'];
-     $this->offset = $this->data['offset'];
-     
-     // also go through initialization routines
-     $this->config();
-     $this->setSorting();
-     $this->setMailbox();
-     $this->setLabel();
-     $this->config();
-   } // unpickle
-   
- } // End ImpSession
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/cs/compose.help imp-2.2.0-pre5/locale/cs/compose.help
*** imp-2.2.0-pre4/locale/cs/compose.help	Fri Aug 27 02:35:22 1999
--- imp-2.2.0-pre5/locale/cs/compose.help	Wed Oct 13 21:56:23 1999
***************
*** 23,28 ****
  $help->add(
  	COMPOSE_HELP_BCC,
! 	'PoloŸka Strytá-kopie:',
! 	'PoloŸka "skrytá kopie" je podobná poloŸce "kopie", jenŸe pøíjemci zprávy neuvidí v¹echny pøíjemce v hlavièce.'
  );
  $help->add(
--- 23,28 ----
  $help->add(
  	COMPOSE_HELP_BCC,
! 	'PoloŸka Skrytá-kopie:',
! 	'PoloŸka "Skrytá kopie" je podobná poloŸce "kopie", jenŸe pøíjemci zprávy neuvidí v¹echny pøíjemce uvedené v této poloŸce.'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/cs/compose.lang imp-2.2.0-pre5/locale/cs/compose.lang
*** imp-2.2.0-pre4/locale/cs/compose.lang	Fri Aug 27 02:35:22 1999
--- imp-2.2.0-pre5/locale/cs/compose.lang	Wed Oct 13 21:56:23 1999
***************
*** 71,74 ****
--- 71,75 ----
  $lang->status_message_postponed = 'Zpráva odloŸena';
  $lang->status_composition = 'Psaní zprávy';
+ $lang->status_cancel = 'Psaní zprávy zru¹eno';
  
  $lang->contacts = 'Kontakty';
diff -r -N -C 2 imp-2.2.0-pre4/locale/cs/contacts.lang imp-2.2.0-pre5/locale/cs/contacts.lang
*** imp-2.2.0-pre4/locale/cs/contacts.lang	Fri Aug 27 02:35:22 1999
--- imp-2.2.0-pre5/locale/cs/contacts.lang	Wed Oct 13 21:56:24 1999
***************
*** 5,8 ****
--- 5,9 ----
  /* plain strings */
  
+ $lang->all_fields = 'Prosím vyplòte v¹echna políèka kontaktu.';
  $lang->error_delete_address = '<tr><th>Chyba; poloŸka nebyla odstranìna ze seznamu kontaktù.</th></tr>';
  $lang->error_address_chars = '<tr><th>Neplatný znak v email-adrese. Tento znak nebyl vloŸen; mùŸete zmìnit výslenou podobu.</th></tr>';
diff -r -N -C 2 imp-2.2.0-pre4/locale/cs/mailbox.lang imp-2.2.0-pre5/locale/cs/mailbox.lang
*** imp-2.2.0-pre4/locale/cs/mailbox.lang	Fri Aug 27 02:35:23 1999
--- imp-2.2.0-pre5/locale/cs/mailbox.lang	Wed Oct 13 21:56:24 1999
***************
*** 36,45 ****
     function pagenav ($page, $page_count) {
        global $this_client;
!       if ( $this_client == '' ) { $this_client = new WebClient; }
  
!       if ( $this_client->lynx ) {
!       return "Strana $page z $page_count";
        } else {
!       return "strana <input type=\"text\" name=\"page\" value=\"$page\" size=\"1\"> z $page_count";
        }
     }
--- 36,45 ----
     function pagenav ($page, $page_count) {
        global $this_client;
!       if ($this_client == '') { $this_client = new WebClient; }
  
!       if ($this_client->lynx) {
!         return "Strana $page z $page_count";
        } else {
!         return "<input type=\"text\" name=\"strana\" value=\"$page\" size=\"2\"> z $page_count";
        }
     }
***************
*** 99,102 ****
--- 99,103 ----
  $lang->showing_deleted = 'Zobrazuji smazané zprávy';
  $lang->deleted_summary = 'smazané zprávy skryty nejsou zobrazeny';
+ $lang->empty_mailbox = 'V této schránce nejsou Ÿádné dopisy.';
  
  $lang->reverse_sort = 'Obrátí poøadí øazení (od novìj¹ích èi vìt¹ích k nejstar¹ím èi nejmen¹ím';
diff -r -N -C 2 imp-2.2.0-pre4/locale/cs/message.lang imp-2.2.0-pre5/locale/cs/message.lang
*** imp-2.2.0-pre4/locale/cs/message.lang	Fri Aug 27 02:35:23 1999
--- imp-2.2.0-pre5/locale/cs/message.lang	Wed Oct 13 21:56:24 1999
***************
*** 38,42 ****
  
  $lang->attachment = 'pøíloha';
! $lang->source = 'Puvodní zpráva';
  $lang->no_subject = '[Nevyplnìný pøedmìt]';
  
--- 38,42 ----
  
  $lang->attachment = 'pøíloha';
! $lang->source = 'Pùvodní zpráva';
  $lang->no_subject = '[Nevyplnìný pøedmìt]';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/cs/status.lang imp-2.2.0-pre5/locale/cs/status.lang
*** imp-2.2.0-pre4/locale/cs/status.lang	Fri Aug 27 02:35:24 1999
--- imp-2.2.0-pre5/locale/cs/status.lang	Wed Oct 13 21:56:24 1999
***************
*** 8,12 ****
     
     function mailbox_status ($message, $unread, $recent) {
!       return "$message&nbsp;&nbsp;|&nbsp&nbsp;$unread nových, $recent nepøeètených";
     }
     
--- 8,12 ----
     
     function mailbox_status ($message, $unread, $recent) {
!       return "$message&nbsp;&nbsp;|&nbsp;&nbsp;$unread nových, $recent nepøeètených";
     }
     
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/compose.help imp-2.2.0-pre5/locale/da/compose.help
*** imp-2.2.0-pre4/locale/da/compose.help	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/compose.help	Thu Sep 23 21:39:37 1999
***************
*** 29,38 ****
  	COMPOSE_HELP_SUBJECT,
  	'Emne: Felt',
! 	'Dette felt indeholder beskedens emne.'
  );
  $help->add(
  	COMPOSE_HELP_ATTACH,
  	'Vedhæftelser',
! 	'Denne liste viser de vedhæftelser, der er til beskeden. For at vedhæfte noget til denne besked, vælger du en fil via "Gennemse" knappen og klikker på vedhæft.'
  );
  $help->add(
--- 29,38 ----
  	COMPOSE_HELP_SUBJECT,
  	'Emne: Felt',
! 	'Dette felt indeholder meddelelsens emne.'
  );
  $help->add(
  	COMPOSE_HELP_ATTACH,
  	'Vedhæftelser',
! 	'Denne liste viser de vedhæftelser, der er til meddelelsen. For at vedhæfte noget til denne meddelelse, vælger du en fil via "Gennemse" knappen og klikker på vedhæft.'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/contacts.lang imp-2.2.0-pre5/locale/da/contacts.lang
*** imp-2.2.0-pre4/locale/da/contacts.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/contacts.lang	Thu Sep 23 21:39:38 1999
***************
*** 31,35 ****
  $lang->action_update_address = 'Opdatere en post i kontaktlisten';
  $lang->action_delete_address = 'Fjern en post i kontaktlisten';
! $lang->action_insert_address = 'Indsæt en post i din nye besked';
  
  $lang->button_add_address = 'Tilføj denne adresse';
--- 31,35 ----
  $lang->action_update_address = 'Opdatere en post i kontaktlisten';
  $lang->action_delete_address = 'Fjern en post i kontaktlisten';
! $lang->action_insert_address = 'Indsæt en post i din nye meddelelse';
  
  $lang->button_add_address = 'Tilføj denne adresse';
***************
*** 38,42 ****
  $lang->button_insert_address = 'Indsæt denne kontakt';
  
! $lang->alert_no_compose = 'Husk venligst, at du kun kan bruge "indsæt" funktionen når du vælger "kontakter" fra den nye besked.';
  
  $lang->no_ldap_server = 'Ingen LDAP server specifieret.';
--- 38,42 ----
  $lang->button_insert_address = 'Indsæt denne kontakt';
  
! $lang->alert_no_compose = 'Husk venligst, at du kun kan bruge "indsæt" funktionen når du vælger "kontakter" fra den nye meddelelse.';
  
  $lang->no_ldap_server = 'Ingen LDAP server specifieret.';
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/folders.help imp-2.2.0-pre5/locale/da/folders.help
*** imp-2.2.0-pre4/locale/da/folders.help	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/folders.help	Thu Sep 23 21:39:38 1999
***************
*** 9,13 ****
  	FOLDERS_HELP_SUBSCRIBE,
  	'Abonner',
! 	'Dette tillader dig at abonnere på en IMAP mappe på mail serveren. Dette er brugbart, når du skal organisere dine email beskeder i kategorier, og gemme beskeder i seperate mapper. For at gøre dette, kunne du bruge et serverbaseret værktøj som procmail eller maildrop. For mere information om at sortere dine mails, kontakt din mail-server administrator.'
  );
  $help->add(
--- 9,13 ----
  	FOLDERS_HELP_SUBSCRIBE,
  	'Abonner',
! 	'Dette tillader dig at abonnere på en IMAP mappe på mail serveren. Dette er brugbart, når du skal organisere dine email meddelelser i kategorier, og gemme meddelelser i seperate mapper. For at gøre dette, kunne du bruge et serverbaseret værktøj som procmail eller maildrop. For mere information om at sortere dine mails, kontakt din mail-server administrator.'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/folders.lang imp-2.2.0-pre5/locale/da/folders.lang
*** imp-2.2.0-pre4/locale/da/folders.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/folders.lang	Thu Sep 23 21:39:38 1999
***************
*** 11,15 ****
  
  $lang->folders_title = 'Post mapper';
! $lang->confirm_delete = 'Hvis du sletter en mappe, sletter du også alle de beskeder der ligger i mappen.\nEr du sikker på at du ønsker at fortsætte?';
  
  $lang->subscribe_label = 'Vedligehold mappe abonnementer';
--- 11,15 ----
  
  $lang->folders_title = 'Post mapper';
! $lang->confirm_delete = 'Hvis du sletter en mappe, sletter du også alle de meddelelser der ligger i mappen.\nEr du sikker på at du ønsker at fortsætte?';
  
  $lang->subscribe_label = 'Vedligehold mappe abonnementer';
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/horde.lang imp-2.2.0-pre5/locale/da/horde.lang
*** imp-2.2.0-pre4/locale/da/horde.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/horde.lang	Thu Sep 23 21:39:38 1999
***************
*** 1,5 ****
  <?php
  
! $this->imp->selected_messages = 'Valgt besked til:';
  
  ?>
--- 1,6 ----
  <?php
  
! $this->imp->selected_messages = 'Valgt meddelelse til:';
! $this->imp->download = 'download';
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/ldap.search.lang imp-2.2.0-pre5/locale/da/ldap.search.lang
*** imp-2.2.0-pre4/locale/da/ldap.search.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/ldap.search.lang	Thu Sep 23 21:39:39 1999
***************
*** 3,7 ****
  $lang = new HordeLocaleLang();
  
! $lang->alert_no_compose = 'Bemærk venligst, at du kun kan bruge "indsæt"-funktionen, når du står i et nyt besked vindue.';
  
  $lang->no_ldap_server = 'Ingen LDAP server var specificeret.';
--- 3,7 ----
  $lang = new HordeLocaleLang();
  
! $lang->alert_no_compose = 'Bemærk venligst, at du kun kan bruge "indsæt"-funktionen, når du står i et nyt meddelelse vindue.';
  
  $lang->no_ldap_server = 'Ingen LDAP server var specificeret.';
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/login.help imp-2.2.0-pre5/locale/da/login.help
*** imp-2.2.0-pre4/locale/da/login.help	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/login.help	Thu Sep 23 21:39:39 1999
***************
*** 24,28 ****
  	LOGIN_HELP_FOLDERS,
  	'Mapper',
! 	'"Mapper" er hvor dine postmapper lever relativt til dit hjemmekatalog.  Hvis dine postmapper er i $HOME/Mail/, så behøver du kun at skrive Mail/. (Husk at unix er meget følsom over for store og små bogstaver).'
  );
  $help->add(
--- 24,28 ----
  	LOGIN_HELP_FOLDERS,
  	'Mapper',
! 	'"Mapper" er hvor dine mapper lever relativt til dit hjemmekatalog.  Hvis dine mapper er i $HOME/Mail/, så behøver du kun at skrive Mail/. (Husk at unix er meget følsom over for store og små bogstaver).'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/login.lang imp-2.2.0-pre5/locale/da/login.lang
*** imp-2.2.0-pre4/locale/da/login.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/login.lang	Thu Sep 23 21:39:39 1999
***************
*** 5,9 ****
  
  $lang->welcome_to_imp		= 'Velkommen til IMP';
! $lang->javascript_needed	= 'IMP kræver JavaScript for at udføre bestemte besked funktioner.';
  $lang->user_name		= 'Brugernavn';
  $lang->password			= 'Kodeord';
--- 5,9 ----
  
  $lang->welcome_to_imp		= 'Velkommen til IMP';
! $lang->javascript_needed	= 'IMP kræver JavaScript for at udføre bestemte meddelelse funktioner.';
  $lang->user_name		= 'Brugernavn';
  $lang->password			= 'Kodeord';
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/mailbox.lang imp-2.2.0-pre5/locale/da/mailbox.lang
*** imp-2.2.0-pre4/locale/da/mailbox.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/mailbox.lang	Thu Sep 23 21:39:39 1999
***************
*** 11,15 ****
        
        $action_text = $lang->$action;
!       return "Postmappe: $current_mbox: Fejl: Meddelelse $action_text Fejlet";
     }
     
--- 11,15 ----
        
        $action_text = $lang->$action;
!       return "Mappe: $current_mbox: Fejl: Meddelelse $action_text Fejlet";
     }
     
***************
*** 21,25 ****
        
        $action_text = $lang->$action;
!       return "Postmappe: $current_mbox: $action_text $num $messages";
     }
     
--- 21,25 ----
        
        $action_text = $lang->$action;
!       return "Mappe: $current_mbox: $action_text $num $messages";
     }
     
***************
*** 31,35 ****
        
        $action_text = $lang->$action;
!       return "Postmappe: $current_mbox: $action_text $num $messages til $targetMbox";
     }
     
--- 31,35 ----
        
        $action_text = $lang->$action;
!       return "Mappe: $current_mbox: $action_text $num $messages til $targetMbox";
     }
     
***************
*** 76,84 ****
  $lang->select_all = 'Marker alle';
  $lang->select_none = 'Fjern markering';
  $lang->empty_trash = 'Tøm skraldespand';
  
  $lang->no_subject = '[Intet emne]';
  $lang->undisclosed_recipients = 'Modtager ej fundet';
! $lang->mailbox = 'Postmappe';
  
  $lang->message = 'Meddelelse';
--- 76,86 ----
  $lang->select_all = 'Marker alle';
  $lang->select_none = 'Fjern markering';
+ $lang->hide_deleted = 'Skjul slettede meddelelser';
+ $lang->show_deleted = 'Vis slettede meddelelser';
  $lang->empty_trash = 'Tøm skraldespand';
  
  $lang->no_subject = '[Intet emne]';
  $lang->undisclosed_recipients = 'Modtager ej fundet';
! $lang->mailbox = 'Mappe';
  
  $lang->message = 'Meddelelse';
***************
*** 88,92 ****
  $lang->deleted = 'Slettet';
  $lang->undeletion = 'Fortryd sletning';
! $lang->undeleted = 'Uslettet';
  $lang->move = 'Flytning';
  $lang->moved = 'Flyttet';
--- 90,94 ----
  $lang->deleted = 'Slettet';
  $lang->undeletion = 'Fortryd sletning';
! $lang->undeleted = 'Genskabt';
  $lang->move = 'Flytning';
  $lang->moved = 'Flyttet';
***************
*** 95,100 ****
--- 97,107 ----
  $lang->expunge = 'Slette';
  $lang->expunged = 'Renset';
+ $lang->hiding_deleted = 'Skjuler slettede meddelelser';
+ $lang->showing_deleted = 'Viser slettede meddelelser';
+ $lang->deleted_summary = 'Slettet meddelelse(r) skjult fra visning';
+ $lang->empty_mailbox = 'Der er ingen meddelelser i denne mappe.';
  
  $lang->reverse_sort = 'Omvendt (nyest eller størst til ældst eller mindst) sorteringsmåde.';
  
+ $lang->refresh = 'Opdatér mappe';
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/menu.lang imp-2.2.0-pre5/locale/da/menu.lang
*** imp-2.2.0-pre4/locale/da/menu.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/menu.lang	Thu Sep 23 21:39:40 1999
***************
*** 7,15 ****
  $lang->contacts = 'Kontakter';
  $lang->login = 'Login';
! $lang->check_inbox = 'Check indbakke';
! $lang->compose = 'Ny email';
  $lang->folders = 'Mapper';
  $lang->manage_files = 'Styre filer';
  $lang->prefs = 'Foretrukne';
  $lang->view_log = 'Se på log';
  $lang->logout = 'Log ud';
--- 7,16 ----
  $lang->contacts = 'Kontakter';
  $lang->login = 'Login';
! $lang->inbox = 'Indbakke';
! $lang->compose = 'Ny meddelelse';
  $lang->folders = 'Mapper';
  $lang->manage_files = 'Styre filer';
  $lang->prefs = 'Foretrukne';
+ $lang->change_password = 'Skift Password';
  $lang->view_log = 'Se på log';
  $lang->logout = 'Log ud';
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/message.lang imp-2.2.0-pre5/locale/da/message.lang
*** imp-2.2.0-pre4/locale/da/message.lang	Fri Jun 18 15:49:05 1999
--- imp-2.2.0-pre5/locale/da/message.lang	Thu Sep 23 21:39:40 1999
***************
*** 58,61 ****
--- 58,62 ----
  $lang->saveas = 'Gem som';
  $lang->compose = 'Opret ny meddelelse';
+ $lang->resume = 'Fortsæt';
  $lang->add_to_contacts = 'Tilføj til kontakter';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/newuser.start.txt imp-2.2.0-pre5/locale/da/newuser.start.txt
*** imp-2.2.0-pre4/locale/da/newuser.start.txt	Fri Jun 18 15:49:06 1999
--- imp-2.2.0-pre5/locale/da/newuser.start.txt	Thu Sep 23 21:39:40 1999
***************
*** 13,17 ****
  <b>Postmappe Listen</b>
  <p align="justify">
! Indholdet af din indbakke mappe vil blive vist så snart du logger ind.  postmappelisten viser indholdet af hver meddelelsens emne (meddelelsens status, afsendelsesdato, afsender, emne og størrelse).  Hver kolonne har en overskrift.  Klikker du på overskriften, vil listen blive sorteret efter det du har trykket på.
  </p>
  <p>
--- 13,17 ----
  <b>Postmappe Listen</b>
  <p align="justify">
! Indholdet af din indbakke mappe vil blive vist så snart du logger ind.  Mappelisten viser indholdet af hver meddelelsens emne (meddelelsens status, afsendelsesdato, afsender, emne og størrelse).  Hver kolonne har en overskrift.  Klikker du på overskriften, vil listen blive sorteret efter det du har trykket på.
  </p>
  <p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/da/spelling.lang imp-2.2.0-pre5/locale/da/spelling.lang
*** imp-2.2.0-pre4/locale/da/spelling.lang	Fri Jun 18 15:49:06 1999
--- imp-2.2.0-pre5/locale/da/spelling.lang	Thu Sep 23 21:39:40 1999
***************
*** 4,8 ****
  require('./config/lang.php3');
  
! $lang->spelling_title = 'Staveforslag til besked';
  $lang->select_lang_for_ispell = 'Sprog';
  
--- 4,8 ----
  require('./config/lang.php3');
  
! $lang->spelling_title = 'Staveforslag til meddelelse';
  $lang->select_lang_for_ispell = 'Sprog';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/compose.help imp-2.2.0-pre5/locale/de/compose.help
*** imp-2.2.0-pre4/locale/de/compose.help	Wed Apr 28 07:41:37 1999
--- imp-2.2.0-pre5/locale/de/compose.help	Tue Oct  5 15:41:26 1999
***************
*** 4,37 ****
  
  This is the help for the compose screen.
  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
  
- */
  $help->add(
  	COMPOSE_HELP_FROM,
  	'Von: Feld',
! 	'Die Adresse, das in der Von: Zeile beim Empf&auml;ngers erscheinen wird. Das sollte Ihre normale E-Mail Adresse sein.'
  );
  $help->add(
  	COMPOSE_HELP_TO,
  	'An: Feld',
! 	'Die Adresse(n), an die diese Nachricht verschickt werden soll. Es k&ouml;nnen mehrere Adresse angegeben werden. Diese Nachricht wird an alle versandt werden.'
  );
  $help->add(
  	COMPOSE_HELP_CC,
  	'Kopie: Feld',
! 	'Die Adressen, an die die Nachricht zus&auml;tzlich zu den im An: Feld geschickt werden soll.'
  );
  $help->add(
  	COMPOSE_HELP_BCC,
  	'Bcc: Feld',
! 	'Diese Feld ist &auml;hnlich wie das Kopie: Feld, der Empf&auml;nger wird aber diese Adressaten nicht sehen.'
  );
  $help->add(
--- 4,31 ----
  
  This is the help for the compose screen.
+ */
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  $help->add(
  	COMPOSE_HELP_FROM,
  	'Von: Feld',
! 	'Die Adresse, die in der Von: Zeile beim Empf&auml;nger erscheinen wird. Das sollte Ihre normale eMail Adresse sein.'
  );
  $help->add(
  	COMPOSE_HELP_TO,
  	'An: Feld',
! 	'Die Adresse(n), an die diese Nachricht verschickt werden soll. Es k&ouml;nnen mehrere Adressen angegeben werden. Diese Nachricht wird an alle Adressaten versandt werden.'
  );
  $help->add(
  	COMPOSE_HELP_CC,
  	'Kopie: Feld',
! 	'Die Adressen, an die eine Kopie der Nachricht zus&auml;tzlich zu den im An: Feld genannten geschickt werden soll.'
  );
  $help->add(
  	COMPOSE_HELP_BCC,
  	'Bcc: Feld',
! 	'Diese Feld ist &auml;hnlich wie das Kopie: Feld, der Empf&auml;nger aus dem An: Feld wird aber diese Adressaten nicht sehen.'
  );
  $help->add(
***************
*** 43,47 ****
  	COMPOSE_HELP_ATTACH,
  	'Anlagen',
! 	'Diese Liste zeigt an, welche Anlagen im Moment mit dieser Nachricht verschickt werden sollen. Um eine Anlage hinzuzuf&uuml;gen, w&uml;hlen Sie bitte eine Datei mit dem "Browse" Knopf aus und dr&uuml;cken Sie "Anlage".'
  );
  $help->add(
--- 37,41 ----
  	COMPOSE_HELP_ATTACH,
  	'Anlagen',
! 	'Diese Liste zeigt an, welche Anlagen mit dieser Nachricht verschickt werden sollen. Um eine Anlage hinzuzuf&uuml;gen, w&auml;hlen Sie bitte eine Datei mit dem "Durchsuchen" Knopf aus und dr&uuml;cken Sie "Anlage".'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/compose.lang imp-2.2.0-pre5/locale/de/compose.lang
*** imp-2.2.0-pre4/locale/de/compose.lang	Wed Apr 28 07:41:37 1999
--- imp-2.2.0-pre5/locale/de/compose.lang	Tue Oct  5 15:41:26 1999
***************
*** 1,32 ****
  <?php
  
! /*
!  
!  File: compose.lang
!  $Author: mhardy $
!  $Revision: 2.0 $
!  $Date: 1999/04/28 11:41:37 $
!  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@osmos.ml.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
  
  class ComposeLocaleLang extends HordeLocaleLang {
!    
!    function ComposeLocaleLang () {
!       $this->HordeLocaleLang();
!    }
!    
!    function forwarded_from ($message_source) {
!       return "----- Weitergeleitete Nachricht von $message_source -----";
!    }
!    
  }
  
--- 1,17 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  class ComposeLocaleLang extends HordeLocaleLang {
!   
!   function ComposeLocaleLang () {
!     $this->HordeLocaleLang();
!   }
!   
!   function forwarded_from ($message_source) {
!     return "----- Weitergeleitete Nachricht von $message_source -----";
!   }
!   
  }
  
***************
*** 34,42 ****
  $lang = new ComposeLocaleLang();
  require('./config/lang.php3');
! require("./locale/de/openwin.lang");
  
  /* plain strings */
! 
! $lang->action_send = 'Abschicken';
  $lang->action_postpone = 'Zur&uuml;ckstellen';
  $lang->action_reply = 'Antworten:';
--- 19,26 ----
  $lang = new ComposeLocaleLang();
  require('./config/lang.php3');
! require('./locale/de/openwin.lang');
  
  /* plain strings */
! $lang->action_send = 'Nachricht senden';
  $lang->action_postpone = 'Zur&uuml;ckstellen';
  $lang->action_reply = 'Antworten:';
***************
*** 55,63 ****
  $lang->to_string = 'An';
  $lang->cc_string = 'Kopie';
! $lang->bcc_string = 'Bcc';
  $lang->attach_string = 'Anlage';
  $lang->attach_string_plural = 'Anlagen';
  
! $lang->file_name = 'Dateiname';
  $lang->file_size = 'Dateigr&ouml;&szlig;e';
  $lang->total_size = 'Gesamtgr&ouml;&szlig;e';
--- 39,47 ----
  $lang->to_string = 'An';
  $lang->cc_string = 'Kopie';
! $lang->bcc_string= 'Bcc';
  $lang->attach_string = 'Anlage';
  $lang->attach_string_plural = 'Anlagen';
  
! $lang->file_name = 'Datei Name';
  $lang->file_size = 'Dateigr&ouml;&szlig;e';
  $lang->total_size = 'Gesamtgr&ouml;&szlig;e';
***************
*** 65,70 ****
  $lang->sign_message = 'Nachricht digital signieren?';
  
! $lang->button_attach = 'Attach';
! $lang->button_cancel = 'Nachricht l&ouml;schen';
  $lang->button_delete_attach = 'Anlagen l&ouml;schen';
  $lang->button_spellcheck = 'Rechtschreibung';
--- 49,54 ----
  $lang->sign_message = 'Nachricht digital signieren?';
  
! $lang->button_attach = 'Anh&auml;ngen';
! $lang->button_cancel = 'Nachricht abbrechen';
  $lang->button_delete_attach = 'Anlagen l&ouml;schen';
  $lang->button_spellcheck = 'Rechtschreibung';
***************
*** 72,87 ****
  $lang->button_postpone = 'Nachricht zur&uuml;ckstellen';
  $lang->button_send = 'Nachricht senden';
! $lang->button_bounce = 'Nachricht weitersenden';
  
! $lang->fwd_string = 'Fwd:';  # sounds funny
  $lang->forward_end_string = 'Ende der weitergeleiteten Nachricht';
  
! $lang->alert_specify_file = 'Dateiname der Anlage ausw&auml;hlen.';
! $lang->alert_select_attach_delete = 'Zu l&ouml;schende Anlagen ausw&auml;hlen.';
  $lang->alert_need_text = 'Leere Nachrichten k&ouml;nnen nicht versandt werden.';
! $lang->alert_no_signing_support = 'Nur Netscape v4.03+ unterst&uuml;tzt digitale Signaturen';
  
  $lang->sig_valid_error = "<h2><font color=red>&Uuml;berpr&uuml;fung der Signatur fehlgeschlagen. </font> Nachricht wurde <u>NICHT</u> verschickt!<h2>";
! $lang->status_bounce_success = 'Nachricht wurde erfolgreich weitergesandt.';
  $lang->status_send_success = 'Nachricht wurde erfolgreich versandt.';
  $lang->status_send_save_error = 'Nachricht wurde erfolgreich versandt, Fehler: speichern nach';
--- 56,71 ----
  $lang->button_postpone = 'Nachricht zur&uuml;ckstellen';
  $lang->button_send = 'Nachricht senden';
! $lang->button_bounce = 'Nachricht zur&uuml;cksenden (bounce)';
  
! $lang->fwd_string = 'Fwd:';
  $lang->forward_end_string = 'Ende der weitergeleiteten Nachricht';
  
! $lang->alert_specify_file = 'Datei der Anlage ausw&auml;hlen.';
! $lang->alert_select_attach_delete = 'Zu l&ouml;schende Anlage(n) ausw&auml;hlen.';
  $lang->alert_need_text = 'Leere Nachrichten k&ouml;nnen nicht versandt werden.';
! $lang->alert_no_signing_support = 'Digitale Signaturen werden nur von Netscape v4.03+ unterst&uuml;tzt';
  
  $lang->sig_valid_error = "<h2><font color=red>&Uuml;berpr&uuml;fung der Signatur fehlgeschlagen. </font> Nachricht wurde <u>NICHT</u> verschickt!<h2>";
! $lang->status_bounce_success = 'Nachricht wurde erfolgreich zur&uuml;ckgesandt (bounce).';
  $lang->status_send_success = 'Nachricht wurde erfolgreich versandt.';
  $lang->status_send_save_error = 'Nachricht wurde erfolgreich versandt, Fehler: speichern nach';
***************
*** 90,97 ****
  $lang->status_message_postponed = 'Nachricht zur&uuml;ckgestellt';
  $lang->status_composition = 'Nachricht erstellen';
  
  $lang->contacts = 'Kontakte';
  
! $lang->alert_attach_file = 'Den Anlage Knopf dr&uuml;cken, um diese Datei anzuh&auml;ngen';
  $lang->alert_need_recipient = 'Sie m&uuml;ssen einen Empf&auml;nger angeben.';
  ?>
--- 74,83 ----
  $lang->status_message_postponed = 'Nachricht zur&uuml;ckgestellt';
  $lang->status_composition = 'Nachricht erstellen';
+ $lang->status_cancel = 'Nachricht erstellen wurde abgebrochen';
  
  $lang->contacts = 'Kontakte';
  
! $lang->alert_attach_file = 'Den Anlage Knopf dr&uuml;cken, um eine Datei anzuh&auml;ngen.';
  $lang->alert_need_recipient = 'Sie m&uuml;ssen einen Empf&auml;nger angeben.';
+ 
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/contacts.help imp-2.2.0-pre5/locale/de/contacts.help
*** imp-2.2.0-pre4/locale/de/contacts.help	Wed Apr 28 11:30:35 1999
--- imp-2.2.0-pre5/locale/de/contacts.help	Tue Oct  5 15:41:27 1999
***************
*** 6,19 ****
  
  */
  $help->add(
  	CONTACTS_HELP_SEARCH,
! 	'LDAP Search',
! 	'The LDAP directory is an index of usernames, real names, and email addresses.  You can seach it using the to the listed, such as Name or Email Address.  Simply enter your search criteria in the box and choose "Start Search" to display the results.'
  );
  $help->add(
  	CONTACTS_HELP_RESULTS,
! 	'LDAP Results',
! 	'This area displays the results of your LDAP search.  Selecting a name from the drop-down list will add that person\'s email address to the insertion list.  You can insert the contains of your insertion list in different fields in your message by using the buttons below it.'
! );
  
  ?>
--- 6,22 ----
  
  */
+ 
+ /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de> */
+ 
  $help->add(
  	CONTACTS_HELP_SEARCH,
! 	'LDAP Suche',
! 	'Das LDAP Verzeichnis ist ein Index mit Benutzernamen und eMail Adressen. Dieses Verzeichnis k&ouml;nnen Sie nach Name oder eMail Adresse durchsuchen. Geben Sie einfach die Suchkriterien in dem Textfeld an und gehen sie auf &quot;Start Suche&quot;, um das Ergebnis zu sehen.'
  );
  $help->add(
  	CONTACTS_HELP_RESULTS,
! 	'LDAP Ergebnisse',
! 	'Dieses Feld zeigt die Ergebnisse Ihrer LDAP Suche. W&auml;hlen Sie einen Namen aus der Ergebnisliste und die eMail Adresse der Person wird zu einer Liste, in der Sie dann w&auml;hlen k&ouml;nnen, in welches Feld Sie die Adresse ein&uuml;gen wollen, hinzugef&uuml;gt.'
! ); /* FIXME: Not a good translation at all! */
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/contacts.lang imp-2.2.0-pre5/locale/de/contacts.lang
*** imp-2.2.0-pre4/locale/de/contacts.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/contacts.lang	Tue Oct  5 15:41:27 1999
***************
*** 1,9 ****
  <?php
  
! /* 
! 
! Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
! */
  
  $lang = new HordeLocaleLang();
--- 1,6 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  $lang = new HordeLocaleLang();
***************
*** 11,20 ****
  /* plain strings */
  
  $lang->error_delete_address = '<tr><th>Es ist ein Fehler aufgetreten; der Eintrag wurde nicht aus der Kontaktliste gel&ouml;scht.</th></tr>';
! $lang->error_address_chars = '<tr><th>Sie haben in der Mail Adresse ein nicht zul&auml;ssiges Zeichen verwendet. Sie wurde ohne dieses hinzugef&uuml;gt; editieren Sie den Eintrag falls notwendig.</th></tr>';
  $lang->error_nickname_chars = '<tr><th>Sie haben im Namensk&uuml;rzel ein nicht zul&auml;ssiges Zeichen verwendet. Es wurde ohne dieses hinzugef&uuml;gt; editieren Sie den Eintrag falls notwendig.</th></tr>';
  $lang->error_fullname_chars = '<tr><th>Sie haben im Namen ein nicht zul&auml;ssiges Zeichen verwendet. Er wurde ohne dieses hinzugef&uuml;gt; editieren Sie den Eintrag falls notwendig.</th></tr>';
  $lang->error_create_address = '<tr><th>Es ist ein Fehler aufgetreten; der Eintrag wurde nicht erzeugt.</th></tr>';
! $lang->error_update_address = '<tr><th>Es ist ein Fehler aufgetreten; der Eintrag wurde nicht ge&auml;ndert.</th></tr>';
  
  $lang->addressbook_title = 'Kontaktliste';
--- 8,19 ----
  /* plain strings */
  
+ $lang->all_fields = 'Bitte f&uuml;llen Sie alle Felder aus!';
+ 
  $lang->error_delete_address = '<tr><th>Es ist ein Fehler aufgetreten; der Eintrag wurde nicht aus der Kontaktliste gel&ouml;scht.</th></tr>';
! $lang->error_address_chars = '<tr><th>Sie haben in der eMail Adresse ein nicht zul&auml;ssiges Zeichen verwendet. Sie wurde ohne dieses hinzugef&uuml;gt; editieren Sie den Eintrag falls notwendig.</th></tr>';
  $lang->error_nickname_chars = '<tr><th>Sie haben im Namensk&uuml;rzel ein nicht zul&auml;ssiges Zeichen verwendet. Es wurde ohne dieses hinzugef&uuml;gt; editieren Sie den Eintrag falls notwendig.</th></tr>';
  $lang->error_fullname_chars = '<tr><th>Sie haben im Namen ein nicht zul&auml;ssiges Zeichen verwendet. Er wurde ohne dieses hinzugef&uuml;gt; editieren Sie den Eintrag falls notwendig.</th></tr>';
  $lang->error_create_address = '<tr><th>Es ist ein Fehler aufgetreten; der Eintrag wurde nicht erzeugt.</th></tr>';
! $lang->error_update_address = '<tr><th>Es ist ein Fehler aufgetreten; der Eintrag wurde nicht ge&auml;ndert.</th></tr>'; 
  
  $lang->addressbook_title = 'Kontaktliste';
***************
*** 26,30 ****
  $lang->new_fullname_string = 'Neuer Name';
  $lang->delete_string = 'L&ouml;schen';
! $lang->change_string = 'Diesen Kontakt l&ouml;schen';
  
  $lang->insert_into_to = ' Einf&uuml;gen in An: ';
--- 25,29 ----
  $lang->new_fullname_string = 'Neuer Name';
  $lang->delete_string = 'L&ouml;schen';
! $lang->change_string = 'Diesen Kontakt l&ouml;schen'; 
  
  $lang->insert_into_to = ' Einf&uuml;gen in An: ';
***************
*** 32,48 ****
  $lang->insert_into_bcc = ' Einf&uuml;gen in Bcc: ';
  $lang->close_window = ' Fenster schlie&szlig;en ';
! $lang->before_search = 'Hier werden die LDAP Suchergebnisse angezeigt.';
  
  $lang->action_add_address = 'Eintrag zur Kontaktliste hinzuf&uuml;gen';
  $lang->action_update_address = 'Eintrag der Kontaktliste &uuml;berarbeiten';
  $lang->action_delete_address = 'Eintrag aus der Kontaktliste entfernen';
! $lang->action_insert_address = 'Eintrag in das &quot;Erstellen&quot; Fenster einf&uuml;gen';
  
  $lang->button_add_address = 'Diese Adresse hinzuf&uuml;gen';
  $lang->button_update_address = 'Diesen Kontakt &uuml;berarbeiten';
  $lang->button_delete_address = 'Diesen Kontakt l&ouml;schen';
! $lang->button_insert_address = 'Diesen Kontakt hinzuf&uuml;gen';
  
! $lang->alert_no_compose = 'Bitte beachten Sie, da&szlig; &quot;Einf&uuml;gen&quot; nur zur Verf&uuml;gung steht, wenn Sie die Kontakte aus dem &quot;Erstellen&quot; Fenster aufrufen.';
  
  $lang->no_ldap_server = 'Es wurde kein LDAP Server angegeben.';
--- 31,47 ----
  $lang->insert_into_bcc = ' Einf&uuml;gen in Bcc: ';
  $lang->close_window = ' Fenster schlie&szlig;en ';
! $lang->before_search = 'Hier werden die LDAP Suchergebnisse angezeigt.'; 
  
  $lang->action_add_address = 'Eintrag zur Kontaktliste hinzuf&uuml;gen';
  $lang->action_update_address = 'Eintrag der Kontaktliste &uuml;berarbeiten';
  $lang->action_delete_address = 'Eintrag aus der Kontaktliste entfernen';
! $lang->action_insert_address = 'Eintrag in das &quot;Erstellen&quot; Fenster einf&uuml;gen';  
  
  $lang->button_add_address = 'Diese Adresse hinzuf&uuml;gen';
  $lang->button_update_address = 'Diesen Kontakt &uuml;berarbeiten';
  $lang->button_delete_address = 'Diesen Kontakt l&ouml;schen';
! $lang->button_insert_address = 'Diesen Kontakt hinzuf&uuml;gen'; 
  
! $lang->alert_no_compose = 'Bitte beachten Sie, da&szlig; &quot;Einf&uuml;gen&quot; nur zur Verf&uuml;gung steht, wenn Sie die Kontakte aus dem &quot;Erstellen&quot; Fenster aufrufen.'; 
  
  $lang->no_ldap_server = 'Es wurde kein LDAP Server angegeben.';
***************
*** 50,60 ****
  $lang->no_ldap_bind = 'Anmeldung am LDAP Server fehlgeschlagen.';
  
! $lang->too_many_results = 'Zuviele Ergebnisse. Versuchen Sie, die Suche einzugrenzen.';
  
  $lang->ldap_add = ' Hinzuf&uuml;gen ';
  $lang->ldap_clear = ' L&ouml;schen ';
! $lang->ldap_insertaddr = ' In Kontaktliste einf&uuml;gen ';
  
! $lang->ldap_no_results = 'Keine geeigneten Eintr&auml;ge gefunden.';
  
  $lang->search = 'Durchsuche das';
--- 49,59 ----
  $lang->no_ldap_bind = 'Anmeldung am LDAP Server fehlgeschlagen.';
  
! $lang->too_many_results = 'Zuviele Ergebnisse. Versuchen Sie, die Suche einzugrenzen.'; 
  
  $lang->ldap_add = ' Hinzuf&uuml;gen ';
  $lang->ldap_clear = ' L&ouml;schen ';
! $lang->ldap_insertaddr = ' In Kontaktliste einf&uuml;gen '; 
  
! $lang->ldap_no_results = 'Keine geeigneten Eintr&auml;ge gefunden.'; 
  
  $lang->search = 'Durchsuche das';
***************
*** 73,77 ****
  $lang->is = 'ist';
  $lang->sounds = 'klingt wie';
! $lang->submit_button = ' Suche starten ';
  
  $lang->add_contact = ' Kontakt hinzuf&uuml;gen ';
--- 72,77 ----
  $lang->is = 'ist';
  $lang->sounds = 'klingt wie';
! $lang->submit_button = ' Suche starten '; 
! $lang->mailalternateaddress = 'Alternative Adresse';
  
  $lang->add_contact = ' Kontakt hinzuf&uuml;gen ';
***************
*** 82,87 ****
  $lang->ldapresults = 'LDAP Resultate';
  $lang->select = 'Ausw&auml;hlen ';
! $lang->add_to_contacts = 'Add To Contacts';
! $lang->submit = 'Submit';
  
  ?>
--- 82,87 ----
  $lang->ldapresults = 'LDAP Resultate';
  $lang->select = 'Ausw&auml;hlen ';
! $lang->add_to_contacts = 'Erg&auml;nze Kontakte';
! $lang->submit = 'Abschicken';
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/folders.help imp-2.2.0-pre5/locale/de/folders.help
*** imp-2.2.0-pre4/locale/de/folders.help	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/folders.help	Tue Oct  5 15:41:27 1999
***************
*** 5,42 ****
  This is the help for the folders screen.
  
-  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
- 
-  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
-  
-  You should have received a copy of the GNU Public
-  License along with this package; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
- 
  */
  $help->add(
! 	FOLDERS_HELP_SUBSCRIBE,
! 	'Abonnieren',
! 	'Diese Option erm&ouml;glicht Ihnen, einen Mail Ordner des Mail Servers explizit zu "abonnieren". Dies ist n&uuml;tzlich, um Ihre Nachrichten nach Kategorieren zu organisieren und in unterschiedlichen Ordnern zu speichern. Um dies zu erreichen, k&ouml;nnten Sie ein serverseitiges Tool wie etwa procmail oder maildrop verwenden. Kontaktieren Sie bitte Ihren Mail Server Administrator, um Informationen &uuml;ber das Sortieren eingehender Nachrichten zu erfahren.'
! );
! $help->add(
! 	FOLDERS_HELP_UNSUBSCRIBE,
! 	'Deabonnieren',  # sounds funny
! 	'Diese Option erlaubt Ihnen, zuvor von Ihrem entfernten Mail Server abonnierte Ordner wieder zu entfernen.'
  );
  $help->add(
! 	FOLDERS_HELP_CREATE,
! 	'Erstellen',
! 	'Diese Option dient dazu, einen neuen Ordner f&uuml;r Ihre Mail am entfernten Mail Server zu erstellen.'
! );
  $help->add(
! 	FOLDERS_HELP_RENAME,
! 	'Umbenennen',
! 	'Diese Option erm&ouml;glicht es, einen bestehenden Ordner auf dem entfernten Mail Server umzubenennen.'
  );
  $help->add(
! 	FOLDERS_HELP_DELETE,
! 	'L&ouml;schen',
! 	'Mit dieser Option l&ouml;schen Sie einen bestehenden Ordner des entfernten Mail Servers.'
  );
  ?>
--- 5,36 ----
  This is the help for the folders screen.
  
  */
+ 
+ /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
+ /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
+                                                                                                 $help->add(
+      FOLDERS_HELP_SUBSCRIBE,
+      'Abonnieren',
+      'Diese Option erm&ouml;glicht es Ihnen, einen Mail Ordner des Mail Servers explizit zu &quot;abonnieren&quot;. Dies ist n&uuml;tzlich, um Ihre Nachrichten nach Kategorieren zu organisieren und in unterschiedlichen Ordnern zu speichern. Um dies zu erreichen, k&ouml;nnten Sie ein serverseitiges Tool wie etwa procmail oder maildrop verwenden. Kontaktieren Sie bitte Ihren Mail Server Administrator, um Informationen &uuml;ber das Sortieren eingehender Nachrichten zu erfahren.'
+ ); 
  $help->add(
!      FOLDERS_HELP_UNSUBSCRIBE,
!      'Deabonnieren',  # sounds funny
!      'Diese Option erlaubt Ihnen, zuvor von Ihrem entfernten Mail Server abonnierte Ordner wieder zu entfernen.' 
  );
  $help->add(
!      FOLDERS_HELP_CREATE,
!      'Erstellen',
!      'Diese Option dient dazu, einen neuen Ordner f&uuml;r Ihre Mail am entfernten Mail Server zu erstellen.'
! ); 
  $help->add(
!      FOLDERS_HELP_RENAME,
!      'Umbenennen',
!      'Diese Option erm&ouml;glicht es, einen bestehenden Ordner auf dem entfernten Mail Server umzubenennen.'
  );
  $help->add(
!      FOLDERS_HELP_DELETE,
!      'L&ouml;schen',
!      'Mit dieser Option l&ouml;schen Sie einen bestehenden Ordner des entfernten Mail Servers.'
  );
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/folders.lang imp-2.2.0-pre5/locale/de/folders.lang
*** imp-2.2.0-pre4/locale/de/folders.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/folders.lang	Tue Oct  5 15:41:27 1999
***************
*** 1,52 ****
  <?php
  
! /*
!  
!  File: folders.lang
!  $Author: mhardy $
!  $Revision: 2.0 $
!  $Date: 1999/04/28 11:41:38 $
! 
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
!  
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
! 
! 
  $lang = new HordeLocaleLang();
  
! $lang->delete_folder_error = '<tr><th colspan=5>Es ist ein Fehler aufgetreten; der Ordner wurde nicht gel&ouml;scht</th></tr>';
! $lang->unsub_folder_error = '<tr><th colspan=5>Es ist ein Fehler aufgetreten; das Abonnement des Ordners wurde nicht aufgehoben</th></tr>';
! $lang->create_folder_error = '<tr><th colspan=5>Es ist ein Fehler aufgetreten; der neue Ordner wurde nicht erstellt</th></tr>';
! $lang->subscribe_folder_error = '<tr><th colspan=5>Es ist ein Fehler aufgetreten; der Ordner wurde nicht abonniert</th></tr>';
! $lang->rename_folder_error = '<tr><th colspan=5>Es ist ein Fehler aufgetreten; der Ordner wurde nicht umbenannt</th></tr>';
! $lang->none_selected = '<tr><th colspan=5>An error occured; no folders were selected</th></tr>';
  
  $lang->folders_title = 'Mail Ordner';
  $lang->confirm_delete = 'Mit dem Order werden auch all Nachrichten darin gel&ouml;scht.\nSind Sie sicher, dass Sie das tun wollen?';
  
- $lang->unsub_label = 'Abonnement f&uuml;r Ordner aufheben';  ### sounds funny
  $lang->subscribe_label = 'Ordner abonnieren';
  $lang->rename_label = 'Ordner umbenennen';
  $lang->delete_label = 'Ordner l&ouml;schen';
! $lang->create_label = 'Neuen Ordner erstellen';
  
  $lang->available = 'Verf&uuml;gbare Ordner:';
  $lang->selected = 'Ausgew&auml;hlte Ordner:';
! $lang->add_caption = "Ordner hinzuf&uuml;gen";
! $lang->remove_caption = "Ordner entfernen";
  
! $lang->unsub = 'Deabonnieren';  # sounds funny
  $lang->subscribe = 'Abonnieren';
! $lang->rename = 'Umbenennen';
! $lang->renameTo = 'in';
! $lang->delete = 'L&ouml;schen';
! $lang->create = 'Erstellen';
  
  $lang->unsub_button = ' Ordner nicht mehr abonnieren ';
--- 1,36 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 
  $lang = new HordeLocaleLang();
  
! $lang->delete_folder_error = '<b>Fehler</b>: der Ordner wurde nicht gel&ouml;scht.';
! $lang->unsub_folder_error = '<b>Fehler</b>: das Abonnement des Ordners wurde nicht aufgehoben.';
! $lang->create_folder_error = '<b>Fehler</b>: der neue Ordner wurde nicht erstellt.';
! $lang->subscribe_folder_error = '<b>Fehler</b>: der Ordner wurde nicht abonniert.';
! $lang->rename_folder_error = '<b>Fehler</b>: der Ordner wurde nicht umbenannt.';
! $lang->none_selected = '<b>Fehler</b>: es wurden keine Ordner ausgew&auml;hlt.';
  
  $lang->folders_title = 'Mail Ordner';
  $lang->confirm_delete = 'Mit dem Order werden auch all Nachrichten darin gel&ouml;scht.\nSind Sie sicher, dass Sie das tun wollen?';
  
  $lang->subscribe_label = 'Ordner abonnieren';
  $lang->rename_label = 'Ordner umbenennen';
  $lang->delete_label = 'Ordner l&ouml;schen';
! $lang->create_label = 'Einen neuen Ordner erstellen';
! $lang->unsub_label = 'Abonnement f&uuml;r Ordner aufheben';
  
  $lang->available = 'Verf&uuml;gbare Ordner:';
  $lang->selected = 'Ausgew&auml;hlte Ordner:';
! $lang->add_caption = 'Ordner hinzuf&uuml;gen';
! $lang->remove_caption = 'Ordner entfernen';
  
! $lang->unsub = 'Abonnement aufheben';
  $lang->subscribe = 'Abonnieren';
! $lang->rename = 'Ordner:';
! $lang->renameTo = 'Umbenennen in';
! $lang->delete = 'Ordner:';
! $lang->create = 'Ordner:';
  
  $lang->unsub_button = ' Ordner nicht mehr abonnieren ';
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/horde.lang imp-2.2.0-pre5/locale/de/horde.lang
*** imp-2.2.0-pre4/locale/de/horde.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/horde.lang	Tue Oct  5 15:41:28 1999
***************
*** 1,5 ****
  <?php
! 
  $this->imp->selected_messages = 'Selektierte Mail nach:';
  
  ?>
--- 1,8 ----
  <?php
!  
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de> */
!                                                                                                 
  $this->imp->selected_messages = 'Selektierte Mail nach:';
+ $this->imp->download = 'Lokal Speichern';
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/ldap.result.lang imp-2.2.0-pre5/locale/de/ldap.result.lang
*** imp-2.2.0-pre4/locale/de/ldap.result.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/ldap.result.lang	Tue Oct  5 15:41:28 1999
***************
*** 1,18 ****
  <?php
  
! /*
! 
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
!  
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
! 
! */
! 
! $lang = new HordeLocaleLang();
  
  $lang->before_search = 'Sobald Sie eine LDAP Suche ausgef&uuml;hrt haben, wird in diesem Fenster das Suchergebnis dargestellt.';
--- 1,7 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 $lang = new HordeLocaleLang();
  
  $lang->before_search = 'Sobald Sie eine LDAP Suche ausgef&uuml;hrt haben, wird in diesem Fenster das Suchergebnis dargestellt.';
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/ldap.search.lang imp-2.2.0-pre5/locale/de/ldap.search.lang
*** imp-2.2.0-pre4/locale/de/ldap.search.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/ldap.search.lang	Tue Oct  5 15:41:28 1999
***************
*** 1,18 ****
  <?php
  
! /*
! 
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
!  
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
! 
! */
! 
! $lang = new HordeLocaleLang();
  
  $lang->alert_no_compose = 'Beachten Sie, dass Sie nur dann eine Mail Adresse einf&uuml;gen k&ouml;nnen, wenn Sie eine neue Mail erstellen.';
--- 1,7 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 $lang = new HordeLocaleLang();
  
  $lang->alert_no_compose = 'Beachten Sie, dass Sie nur dann eine Mail Adresse einf&uuml;gen k&ouml;nnen, wenn Sie eine neue Mail erstellen.';
***************
*** 26,47 ****
  $lang->ldap_add = ' Hinzuf&uuml;gen ';
  $lang->ldap_clear = ' L&ouml;schen ';
! $lang->ldap_insert = ' Einf&uuml;gen ';
  $lang->ldap_insertcc = ' Einf&uuml;gen in Cc: ';
  $lang->ldap_insertbcc = ' Einf&uuml;gen in Bcc: ';
  $lang->ldap_insertaddr = ' In Kontaktliste aufnehmen ';
  
! $lang->ldap_no_results = 'Es wurden keine entsprechenden Eintr&auml;ge gefunden..';
! 
  
! $lang->uid = 'Die UID';
! $lang->mail = 'Die E-Mail Adresse';
! $lang->sn = 'Der Nachname';
  $lang->givenname = 'Der Vorname';
! $lang->ou = 'Die Organisationseinheit';
  $lang->cn = 'Der Name';
  $lang->begins = 'beginnt mit';
  $lang->contains = 'beinhaltet';
  $lang->ends = 'endet mit';
! $lang->is_strict = 'ist genau';
  $lang->is = 'ist';
  $lang->sounds = 'klingt wie';
--- 15,35 ----
  $lang->ldap_add = ' Hinzuf&uuml;gen ';
  $lang->ldap_clear = ' L&ouml;schen ';
! $lang->ldap_insert = ' Einf&uuml;gen in An: ';
  $lang->ldap_insertcc = ' Einf&uuml;gen in Cc: ';
  $lang->ldap_insertbcc = ' Einf&uuml;gen in Bcc: ';
  $lang->ldap_insertaddr = ' In Kontaktliste aufnehmen ';
  
! $lang->ldap_no_results = 'Es wurden keine entsprechenden Eintr&auml;ge gefunden.';
  
! $lang->uid = 'Die UID (User IDentity)';
! $lang->mail = 'Die eMail Adresse';
! $lang->sn = 'Der Nachnahme';
  $lang->givenname = 'Der Vorname';
! $lang->ou = 'Organisation';
  $lang->cn = 'Der Name';
  $lang->begins = 'beginnt mit';
  $lang->contains = 'beinhaltet';
  $lang->ends = 'endet mit';
! $lang->is_strict = 'ist (exakt)';
  $lang->is = 'ist';
  $lang->sounds = 'klingt wie';
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/login.help imp-2.2.0-pre5/locale/de/login.help
*** imp-2.2.0-pre4/locale/de/login.help	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/login.help	Tue Oct  5 15:41:28 1999
***************
*** 5,37 ****
  This is the help for the login screen.
  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
  
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
  
- */
  $help->add(
! 	LOGIN_HELP_USERNAME,
! 	'Benutzername',
! 	'Dies ist der Benutzername, der Sie gegen&uuml;ber dem horde System identifiziert, z.B. "jorcutt"'
  );
  $help->add(
! 	LOGIN_HELP_PASSWORD,
! 	'Passwort',
! 	'Dies ist das "geheime" Wort, das Ihren Zugang vor anderen sch&uuml;tzt. Achten Sie darauf, dass niemand anderer es erf&auml;hrt'
  );
  $help->add(
! 	LOGIN_HELP_SERVER,
! 	'Server',
! 	'Dies ist der entfernte Server, der Ihre IMAP Mail verwaltet. Der "port" gibt die Port Adresse an, auf welcher der IMAP Daemon wartet - meist 143'
  );
  $help->add(
! 	LOGIN_HELP_FOLDERS,
! 	'Verzeichnis',
! 	'Achtung: Unter "Verzeichnis" werden alle Nachrichten abgelegt,	<b><i>relativ zu Ihrem Home-Directory. </i></b> Sind Ihre Nachrichten z.B. in $HOME/Mail/ abgelegt, dann brauchen Sie lediglich Mail/ als "Verzeichnis" einzugeben (Achtung, Unix Systeme unterscheiden zwischen Gro&szlig;- und Kleinschreibung).'
  );
  $help->add(
--- 5,32 ----
  This is the help for the login screen.
  
! */
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  $help->add(
!      LOGIN_HELP_USERNAME,
!      'Benutzername',
!      'Dies ist der Benutzername, der Sie gegen&uuml;ber dem horde System identifiziert, z.B. &quot;jorcutt&quot;'
  );
  $help->add(
!      LOGIN_HELP_PASSWORD,
!      'Passwort',
!      'Dies ist das &quot;geheime&quot; Wort, das Ihren Zugang vor anderen sch&uuml;tzt. Achten Sie darauf, dass niemand anderer es erf&auml;hrt!'
  );
  $help->add(
!      LOGIN_HELP_SERVER,
!      'Server',
!      'Dies ist der entfernte Server, der Ihre IMAP Mail verwaltet. Der &quot;port&quot; gibt die Port Adresse an, auf welcher der IMAP Daemon wartet - meist 143'
  );
  $help->add(
!      LOGIN_HELP_FOLDERS,
!      'Verzeichnis',
!      'Achtung: Unter "Verzeichnis" werden alle Nachrichten abgelegt,  <b><i>relativ zu Ihrem Home-Directory. </i></b> Sind Ihre Nachrichten z.B. in $HOME/Mail/ abgelegt, dann brauchen Sie lediglich Mail/ als "Verzeichnis" einzugeben (Achtung, Unix Systeme unterscheiden zwischen Gro&szlig;- und Kleinschreibung).'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/login.lang imp-2.2.0-pre5/locale/de/login.lang
*** imp-2.2.0-pre4/locale/de/login.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/login.lang	Tue Oct  5 15:41:29 1999
***************
*** 1,17 ****
  <?php
  
! /*
! 
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
!  
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
! 
! */
! 
  $lang = new HordeLocaleLang();
  require('./config/lang.php3');
--- 1,7 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 
  $lang = new HordeLocaleLang();
  require('./config/lang.php3');
***************
*** 20,32 ****
  $lang->javascript_needed	= 'Einige Funktionen von IMP ben&ouml;tigen Javascript.';
  $lang->user_name		= 'Benutzername';
! $lang->password			= 'Passwort';
  $lang->server			= 'Server';
  $lang->server_port		= 'Port';
  $lang->folders			= 'Verzeichnis';
  $lang->log_in			= 'Anmelden';
! $lang->language                 = 'Sprache';
  
  $lang->login = '';
! $lang->timeout = 'Sie haben entweder Ihr Username/Passwort falsch eingegeben oder Ihre Anmeldung liegt zu lange zur&uuml;ck. Bitte versuchen Sie es noch einmal!';
  $lang->logout = 'Sie wurden abgemeldet. Vielen Dank f&uuml;r die Benutzung von IMP! F&uuml;r eine erneute Anmeldung verwenden Sie bitte das anschlie&szlig;ende Formular.';
  $lang->nocert = 'Zur Benutzung dieses Servers ben&ouml;tigen Sie ein g&uuml;ltiges Zertifikat!';
--- 10,22 ----
  $lang->javascript_needed	= 'Einige Funktionen von IMP ben&ouml;tigen Javascript.';
  $lang->user_name		= 'Benutzername';
! $lang->password		= 'Passwort';
  $lang->server			= 'Server';
  $lang->server_port		= 'Port';
  $lang->folders			= 'Verzeichnis';
  $lang->log_in			= 'Anmelden';
! $lang->language          = 'Sprache';
  
  $lang->login = '';
! $lang->timeout = 'Sie haben entweder Ihr Benutzername/Passwort falsch eingegeben oder Ihre Anmeldung liegt zu lange zur&uuml;ck. Bitte versuchen Sie es noch einmal!';
  $lang->logout = 'Sie wurden abgemeldet. Vielen Dank f&uuml;r die Benutzung von IMP! F&uuml;r eine erneute Anmeldung verwenden Sie bitte das anschlie&szlig;ende Formular.';
  $lang->nocert = 'Zur Benutzung dieses Servers ben&ouml;tigen Sie ein g&uuml;ltiges Zertifikat!';
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/mailbox.lang imp-2.2.0-pre5/locale/de/mailbox.lang
*** imp-2.2.0-pre4/locale/de/mailbox.lang	Thu May 20 00:39:20 1999
--- imp-2.2.0-pre5/locale/de/mailbox.lang	Tue Oct  5 15:41:29 1999
***************
*** 1,31 ****
  <?php
  
! /*
! 
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
!  
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
! 
! */
! 
! class MailboxLocaleLang extends HordeLocaleLang {
!    
!    function MailboxLocaleLang () {
        $this->HordeLocaleLang();
!    }
!    
!    function error ($current_mbox, $action) {
        global $lang;
        
        $action_text = $lang->$action;
!       return "Mailbox: $current_mbox: Fehler: Nachricht $action_text fehlgeschlagen";   # sounds funny
!    }
!    
!    function success1 ($current_mbox, $action, $num, $plural = false) {
        global $lang;
        
--- 1,22 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 
! if ($language == 'de') {
!   class MailboxLocaleLang extends HordeLocaleLang {
!     
!     function MailboxLocaleLang () {
        $this->HordeLocaleLang();
!     }
!     
!     function error ($current_mbox, $action) {
        global $lang;
        
        $action_text = $lang->$action;
!       return "Mailbox: $current_mbox: Fehler: Nachricht $action_text fehlgeschlagen";
!     }
!     
!     function success1 ($current_mbox, $action, $num, $plural = false) {
        global $lang;
        
***************
*** 35,41 ****
        $action_text = $lang->$action;
        return "Mailbox: $current_mbox: $action_text $num $messages";
!    }
!    
!    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
        global $lang;
        
--- 26,32 ----
        $action_text = $lang->$action;
        return "Mailbox: $current_mbox: $action_text $num $messages";
!     }
!     
!     function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
        global $lang;
        
***************
*** 45,71 ****
        $action_text = $lang->$action;
        return "Mailbox: $current_mbox: $action_text $num $messages nach $targetMbox";
!    }
!    
!    function pagenav ($page, $page_count) {
        global $this_client;
!       if ( $this_client == '' ) { $this_client = new WebClient; }
! 
!       if ( $this_client->lynx ) {
!       return "Seite $page von $page_count";
        } else {
!       return "[Seite <input type=\"text\" name=\"page\" value=\"$page\" size=\"1\"> von $page_count]";
        }
!    }
!    
!    function overview ($begin, $end, $nummsgs) {
!        if($nummsgs == 0) {
! 	   return "0 Nachrichten";
!        }	elseif($nummsgs == 1) {
! 	   return "1 Nachricht";
!        } else {
!            return "$begin - $end von $nummsgs Nachrichten";
!        }
!    }
!    
  }
  
--- 36,62 ----
        $action_text = $lang->$action;
        return "Mailbox: $current_mbox: $action_text $num $messages nach $targetMbox";
!     }
!     
!     function pagenav ($page, $page_count) {
        global $this_client;
!       if ($this_client == '') { $this_client = new WebClient; }
!       
!       if ($this_client->lynx) {
! 	return "Seite $page von $page_count";
!       } else {
! 	return "[Seite <input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> von $page_count]";
!       }
!     }
!     
!     function overview ($begin, $end, $nummsgs) {
!       if ($nummsgs == 0) {
! 	return "0 Nachrichten";
!       } else if ($nummsgs == 1) {
! 	return "1 Nachricht";
        } else {
! 	return "$begin - $end von $nummsgs Nachrichten";
        }
!     }
!   }
  }
  
***************
*** 78,82 ****
  $lang->move_link = '[Verschieben]';
  $lang->copy_link = '[Kopieren]';
! $lang->selected_mail = 'selektierte Nachrichten';
  
  $lang->sort_by_label =  'Sortieren nach';
--- 69,73 ----
  $lang->move_link = '[Verschieben]';
  $lang->copy_link = '[Kopieren]';
! $lang->selected_mail = 'ausgew&auml;hlte Nachrichten';
  
  $lang->sort_by_label =  'Sortieren nach';
***************
*** 87,92 ****
  $lang->to_label = 'An';
  
! $lang->select_all = 'Alle selektieren';
! $lang->select_none = 'Alle deselektieren';  
  $lang->empty_trash = 'Papierkorb leeren';
  
--- 78,85 ----
  $lang->to_label = 'An';
  
! $lang->select_all = 'Alle ausw&auml;hlen';
! $lang->select_none = 'Keine ausw&auml;hlen';
! $lang->hide_deleted = 'Verstecke Gel&ouml;schte';
! $lang->show_deleted = 'Zeige Gel&ouml;schte';
  $lang->empty_trash = 'Papierkorb leeren';
  
***************
*** 100,104 ****
  $lang->deletion = 'L&ouml;schen';
  $lang->deleted = 'Gel&ouml;scht';
! $lang->undeletion = 'Wiederherstellen'; 
  $lang->undeleted = 'Wiederhergestellt';
  $lang->move = 'Verschieben';
--- 93,97 ----
  $lang->deletion = 'L&ouml;schen';
  $lang->deleted = 'Gel&ouml;scht';
! $lang->undeletion = 'Wiederherstellen';
  $lang->undeleted = 'Wiederhergestellt';
  $lang->move = 'Verschieben';
***************
*** 108,114 ****
  $lang->expunge = 'Entfernen';
  $lang->expunged = 'Entfernt';
  
  $lang->reverse_sort = 'Umgekehrte Sortierreihenfolge (neueste oder gr&ouml;sste nach &auml;lteste oder kleinste).';
  
! $lang->refresh = 'Refresh Mailbox';
  ?>
--- 101,111 ----
  $lang->expunge = 'Entfernen';
  $lang->expunged = 'Entfernt';
+ $lang->hiding_deleted = 'Verstecke gel&ouml;schte Nachrichten';
+ $lang->showing_deleted = 'Zeige gel&ouml;schte Nachrichten';
+ $lang->deleted_summary = 'gel&ouml;schte Nachricht(en) versteckt';
+ $lang->empty_mailbox = 'Keine Nachrichten.';
  
  $lang->reverse_sort = 'Umgekehrte Sortierreihenfolge (neueste oder gr&ouml;sste nach &auml;lteste oder kleinste).';
  
! $lang->refresh = 'Mailbox neu laden';
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/menu.lang imp-2.2.0-pre5/locale/de/menu.lang
*** imp-2.2.0-pre4/locale/de/menu.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/menu.lang	Tue Oct  5 15:41:29 1999
***************
*** 1,39 ****
  <?php
  
! /*
!  
!  File: menu.lang
!  $Author: mhardy $
!  $Revision: 2.0 $
!  $Date: 1999/04/28 11:41:38 $
!  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
! 
! $lang = new HordeLocaleLang();
! require("./locale/de/openwin.lang");
  
  $lang->login_again = 'Bitte melden Sie sich erneut an';
  $lang->contacts = 'Kontakte';
  $lang->login = 'Anmelden';
! $lang->check_inbox = 'Inbox pr&uuml;fen';   # sounds funny
  $lang->compose = 'Erstellen';
  $lang->folders = 'Ordner';
  $lang->manage_files = 'Dateimanagement';
  $lang->prefs = 'Einstellungen';
  $lang->view_log = 'Log ansehen';
  $lang->logout = 'Abmelden';
  $lang->faq = 'FAQ';
! $lang->ldap_search = 'LDAP-Suche';
  $lang->problem = 'Problem?';
! $lang->signup = 'Signup';   # sounds funny
  $lang->horde = 'Horde';
  
--- 1,24 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 $lang = new HordeLocaleLang();
! require('./locale/de/openwin.lang');
  
  $lang->login_again = 'Bitte melden Sie sich erneut an';
  $lang->contacts = 'Kontakte';
  $lang->login = 'Anmelden';
! $lang->inbox = 'Eingang';
  $lang->compose = 'Erstellen';
  $lang->folders = 'Ordner';
  $lang->manage_files = 'Dateimanagement';
  $lang->prefs = 'Einstellungen';
+ $lang->change_password = 'Passwort &auml;ndern';
  $lang->view_log = 'Log ansehen';
  $lang->logout = 'Abmelden';
  $lang->faq = 'FAQ';
! $lang->ldap_search = 'LDAP Suche';
  $lang->problem = 'Problem?';
! $lang->signup = 'Eintragen';
  $lang->horde = 'Horde';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/message.lang imp-2.2.0-pre5/locale/de/message.lang
*** imp-2.2.0-pre4/locale/de/message.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/message.lang	Tue Oct  5 15:41:29 1999
***************
*** 1,22 ****
  <?php
  
! /*
!  
!  File: message.lang
!  $Author: mhardy $
!  $Revision: 2.0 $
!  $Date: 1999/04/28 11:41:38 $
!  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
! 
  class MessageLocaleLang extends HordeLocaleLang {
     
--- 1,7 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 
  class MessageLocaleLang extends HordeLocaleLang {
     
***************
*** 26,30 ****
     
     function message_status ($current_mbox, $msg_index, $num) {
!       return "$current_mbox: $msg_index von $num";   # check, sounds funny
     }
     
--- 11,15 ----
     
     function message_status ($current_mbox, $msg_index, $num) {
!       return "$current_mbox: $msg_index von $num";
     }
     
***************
*** 32,36 ****
        return "Zur&uuml;ck zu $current_mbox";
     }
!    
     function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
        global $lang;
--- 17,21 ----
        return "Zur&uuml;ck zu $current_mbox";
     }
! 
     function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
        global $lang;
***************
*** 42,51 ****
        return "Mailbox: $current_mbox: $action_text $num $messages nach $targetMbox";
     }
  }
  
  
  $lang = new MessageLocaleLang();
! $lang->imp->selected_messages = 'Diese Nachricht nach:';  # sounds funny
! require("./locale/de/openwin.lang");
  
  $lang->move_link = '[Verschieben]';
--- 27,37 ----
        return "Mailbox: $current_mbox: $action_text $num $messages nach $targetMbox";
     }
+ 
  }
  
  
  $lang = new MessageLocaleLang();
! $lang->imp->selected_messages = 'Diese Nachricht nach:';
! require('./locale/de/openwin.lang');
  
  $lang->move_link = '[Verschieben]';
***************
*** 60,79 ****
  $lang->date = 'Datum';
  $lang->to = 'An';
! $lang->from = 'Von ';
  $lang->cc = 'Kopie';
! $lang->replyto = 'Antworte an';   # sounds funny
  $lang->subject = 'Betreff';
  $lang->parts = 'Teile';
  
! $lang->prev = '[vorige]';
  $lang->next = '[n&auml;chste]';
  $lang->delete = 'L&ouml;schen';
  $lang->reply = 'Antworten';
! $lang->replyall = 'Allen antworten';   # sounds funny
  $lang->forward = 'Weiterschicken';
  $lang->bounce = 'Weiterleiten';
! $lang->saveas = 'Speichern unter'; 
  $lang->compose = 'Nachricht erstellen';
! $lang->add_to_contacts = 'Zu Kontakte zuf&uuml;gen';
  
  $lang->delete_error = '<tr><th colspan=2>Es ist ein Fehler aufgetreten; Ihre Nachricht wurde nicht gel&ouml;scht.</td></tr>';
--- 46,66 ----
  $lang->date = 'Datum';
  $lang->to = 'An';
! $lang->from = 'Von';
  $lang->cc = 'Kopie';
! $lang->replyto = 'Antwort-An';
  $lang->subject = 'Betreff';
  $lang->parts = 'Teile';
  
! $lang->prev = '[vorherige]';
  $lang->next = '[n&auml;chste]';
  $lang->delete = 'L&ouml;schen';
  $lang->reply = 'Antworten';
! $lang->replyall = 'Allen antworten';
  $lang->forward = 'Weiterschicken';
  $lang->bounce = 'Weiterleiten';
! $lang->saveas = 'Speichern Unter';
! $lang->resume = 'Wiederaufnehmen';
  $lang->compose = 'Nachricht erstellen';
! $lang->add_to_contacts = 'Zu Kontakte hinzuf&uuml;gen';
  
  $lang->delete_error = '<tr><th colspan=2>Es ist ein Fehler aufgetreten; Ihre Nachricht wurde nicht gel&ouml;scht.</td></tr>';
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/newuser.entro.txt imp-2.2.0-pre5/locale/de/newuser.entro.txt
*** imp-2.2.0-pre4/locale/de/newuser.entro.txt	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/newuser.entro.txt	Tue Oct  5 15:41:30 1999
***************
*** 1,3 ****
  <p align="justify">
! Diese Einf&uuml;hrung hat Ihnen hoffentlich eine grundlegendes Verst&auml;ndnis verschafft, wie ein webMail-Programm funktioniert. Sie werden sicherlich bald damit umgehen k&ouml;nnen, sobald Sie gesehen haben, wie einfach und komfortabel man damit E-Mail lesen und schicken kann und wie man damit ein IMAP-Konto verwalten kann.
! </p>
--- 1,8 ----
+ <!-- /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de> */ -->
+ 
  <p align="justify">
! Diese Einf&uuml;hrung hat Ihnen hoffentlich ein grundlegendes Verst&auml;ndnis verschafft, wie
! ein webMail-Programm funktioniert. Sie werden sicherlich bald damit umgehen k&ouml;nnen, sobald
! Sie gesehen haben, wie einfach und komfortabel man damit E-Mail lesen und schicken kann und wie
! man damit ein IMAP-Konto verwalten kann.
! </p>  
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/newuser.intro.txt imp-2.2.0-pre5/locale/de/newuser.intro.txt
*** imp-2.2.0-pre4/locale/de/newuser.intro.txt	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/newuser.intro.txt	Tue Oct  5 15:41:30 1999
***************
*** 1,3 ****
  <p align="justify">
! Herzlich willkommen zum IMAP webMail Programm (IMP)! Mit dem intuitiven IMP Interface werden Sie in der Lage sein, auf Ihr IMAP E-Mail Konto mit einem normalen Web-Browser zuzugreifen und das Konto zu verwalten.
! </p>
--- 1,6 ----
+ <!-- /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de> */ -->
+ 
  <p align="justify">
! Herzlich willkommen zum IMAP webMail Programm (IMP)! Mit dem intuitiven IMP Interface werden Sie in der Lage sein, auf Ihr IMAP E-Mail Konto mit einem normalen Web-Browser zuzugreifen und das
! Konto zu verwalten.
! </p>  
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/newuser.lang imp-2.2.0-pre5/locale/de/newuser.lang
*** imp-2.2.0-pre4/locale/de/newuser.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/newuser.lang	Tue Oct  5 15:41:30 1999
***************
*** 1,26 ****
  <?php
  
! /*
! 
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
! 
  $lang = new HordeLocaleLang();
  
  $lang->newuser_title = 'IMP Dokumentation f&uuml;r neue Benutzer';
! $lang->intro_title = 'Webmail Einf&uuml;hrung';
  
  $lang->header_intro = 'Einf&uuml;hrung';
  $lang->header_start = 'Die ersten Schritte';   # sounds funny
  $lang->header_entro = 'Schlussfolgerung';
! $lang->intro_return = 'Zur&uuml;ck zum Login Schirm';
  
  ?>
--- 1,16 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
!                                                                                                 
  $lang = new HordeLocaleLang();
  
  $lang->newuser_title = 'IMP Dokumentation f&uuml;r neue Benutzer';
! $lang->intro_title = 'Webmail Einf&uuml;hrung'; 
  
  $lang->header_intro = 'Einf&uuml;hrung';
  $lang->header_start = 'Die ersten Schritte';   # sounds funny
  $lang->header_entro = 'Schlussfolgerung';
! $lang->intro_return = 'Zur&uuml;ck zur Anmeldung'; 
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/newuser.start.txt imp-2.2.0-pre5/locale/de/newuser.start.txt
*** imp-2.2.0-pre4/locale/de/newuser.start.txt	Wed Aug  4 17:53:52 1999
--- imp-2.2.0-pre5/locale/de/newuser.start.txt	Tue Oct  5 15:41:31 1999
***************
*** 1,53 ****
! <b>Anmelden</b>
  <p align="justify">
  Jede IMP Sitzung beginnt mit dem Login-Fenster. Bevor Sie den
  webMailer benutzen k&ouml;nnen, m&uuml;ssen Sie sich mit dem
  Benutzernamen und Passwort, das Sie von Ihrem Netzwerk-Administrator
! erhalten haben, f&uuml;r Ihr IMAP Konto anmelden.
  </p>
  <p align="justify">
! Beginnen Sie, indem Sie Username und Passwort in die entsprechenden
! Felder eintragen. Danach m&uuml;ssen Sie den IMAP Mail-Server angeben,
! mit dem Sie Verbindung aufnehmen wollen.
  </p>
! 
  <p align="justify">
! Sobald Sie diese Felder ausgef&uuml;llt haben, klicken Sie bitte auf
! den "Anmelden" Knopf um fortzufahren.
  <hr size="1" width="98%" align="center" noshade>
  </p>
! 
  <b>Die Mailbox-Liste</b>
  <p align="justify">
! Der Inhalt Ihres  Inbox Ordners wird sofort nach dem Anmelden
  angezeigt. Die Mailbox-Liste zeigt die Kopfzeilen jeder Nachricht an
  (Status, Sendedatum, Absender, Betreff-Zeile und
  Gr&ouml;&szlig;e). Jede Spalte hat eine &Uuml;berschrift. Wenn Sie auf
! diese &Uuml;berschrift klicken, wird die Liste nach dieser Spalte sortiert.
  </p>
! 
  <p>
! Um eine Nachricht anzuzeigen, klicken Sie bitte auf die Betreff-Zeile
! der Nachricht. Damit gelangen Sie zum "Nachricht-Fenster".
  <hr size="1" width="98%" align="center" noshade>
  </p>
! 
  <b>Das Nachricht-Fenster</b>
  <p align=justify">
  Das Nachricht-Fenster zeigt den Inhalt der ausgew&auml;hlten Nachricht
  an. Von dort k&ouml;nnen Sie die Anlagen der Nachricht anschauen, auf
! die angezeigte Nachricht antworten, diese l&ouml;schen, oder zur
  n&auml;chsten Nachricht des ausgew&auml;hlten Ordners weiterschalten.
  <hr size="1" width="98%" align="center" noshade>
  </p>
! 
  <b>Das Erstellen-Fenster</b>
! <p align="justify">
  Sie k&ouml;nnen auf verschiedene Arten Nachrichten verschicken. Sie
  k&ouml;nnen eine neue Nachricht schreiben oder vielleicht auf eine
! erhaltene Nachricht antworten. In jedem Fall wird dazu das
  Erstellen-Fenster ge&ouml;ffnet.
  </p>
! 
  <p align="justify">
  Das Erstellen-Fenster erlaubt Ihnen unter anderem, die
--- 1,59 ----
! <!-- /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de> */ -->
!                                                                                                 <b>Anmelden</b>
  <p align="justify">
  Jede IMP Sitzung beginnt mit dem Login-Fenster. Bevor Sie den
  webMailer benutzen k&ouml;nnen, m&uuml;ssen Sie sich mit dem
  Benutzernamen und Passwort, das Sie von Ihrem Netzwerk-Administrator
! erhalten haben bzw. falls Sie in einem lokalem UNIX Netzwerk sind, wird 
! es wahrscheinlich ihr normaler Benutzername/Passwort sein, f&uuml;r 
! Ihr IMAP Konto anmelden.
  </p>
  <p align="justify">
! Beginnen Sie, indem Sie Benutzername und Passwort in die entsprechenden
! Felder eintragen. Falls der Netzwerk-Administrator die Option eingeschaltet
! hat, k&ouml;nnen Sie noch einen IMAP Mail-Server angeben, mit dem Sie 
! Verbindung aufnehmen wollen.
  </p>
!  
  <p align="justify">
! Sobald Sie diese Felder ausgef&uuml;llt haben, klicken Sie bitte auf 
! den &quot;Anmelden&quot; Knopf um fortzufahren.
  <hr size="1" width="98%" align="center" noshade>
  </p>
!  
  <b>Die Mailbox-Liste</b>
  <p align="justify">
! Der Inhalt Ihres &quot;Eingang&quot; Ordners wird sofort nach dem Anmelden
  angezeigt. Die Mailbox-Liste zeigt die Kopfzeilen jeder Nachricht an
  (Status, Sendedatum, Absender, Betreff-Zeile und
  Gr&ouml;&szlig;e). Jede Spalte hat eine &Uuml;berschrift. Wenn Sie auf
! diese &Uuml;berschrift oder auf das Bild daneben klicken, wird die Liste 
! nach dieser Spalte sortiert.
  </p>
!  
  <p>
! Um eine Nachricht anzuzeigen, klicken Sie bitte auf die Betreff-Zeile 
! der Nachricht. Damit gelangen Sie zum &quot;Nachricht-Fenster&quot;.
  <hr size="1" width="98%" align="center" noshade>
  </p>
!  
  <b>Das Nachricht-Fenster</b>
  <p align=justify">
  Das Nachricht-Fenster zeigt den Inhalt der ausgew&auml;hlten Nachricht
  an. Von dort k&ouml;nnen Sie die Anlagen der Nachricht anschauen, auf
! die angezeigte Nachricht antworten, diese l&ouml;schen oder zur
  n&auml;chsten Nachricht des ausgew&auml;hlten Ordners weiterschalten.
  <hr size="1" width="98%" align="center" noshade>
  </p>
!   
  <b>Das Erstellen-Fenster</b>
! <p align="justify"> 
  Sie k&ouml;nnen auf verschiedene Arten Nachrichten verschicken. Sie
  k&ouml;nnen eine neue Nachricht schreiben oder vielleicht auf eine
! erhaltene Nachricht antworten indem Sie auf den Absendernamen in der
! Nachrichten Liste klicken. In jedem Fall wird dazu das
  Erstellen-Fenster ge&ouml;ffnet.
  </p>
!  
  <p align="justify">
  Das Erstellen-Fenster erlaubt Ihnen unter anderem, die
***************
*** 58,64 ****
  angeraten) und geben Sie Ihre Nachricht im gro&szlig;en unteren Feld
  des Fensters ein. Wenn Sie fertig sind mit der Eingabe der Nachricht,
! k&ouml;nnen Sie die Rechtschreibung der Nachricht kontrollieren
  lassen. Wenn Sie die Erstellung der Nachricht beendet haben, klicken
! Sie bitte auf den "Absenden" Knopf, um Ihre Nachricht an den
  Empf&auml;nger abzuschicken.
! </p>
--- 64,71 ----
  angeraten) und geben Sie Ihre Nachricht im gro&szlig;en unteren Feld
  des Fensters ein. Wenn Sie fertig sind mit der Eingabe der Nachricht,
! k&ouml;nnen Sie die Rechtschreibung der Nachricht kontrollieren 
  lassen. Wenn Sie die Erstellung der Nachricht beendet haben, klicken
! Sie bitte auf den &quot;Absenden&quot; Knopf, um Ihre Nachricht an den
  Empf&auml;nger abzuschicken.
! </p> 
! 
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/passwd.lang imp-2.2.0-pre5/locale/de/passwd.lang
*** imp-2.2.0-pre4/locale/de/passwd.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/de/passwd.lang	Tue Oct  5 15:41:54 1999
***************
*** 0 ****
--- 1,25 ----
+ <?php
+ 
+ /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de> */
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->changing_passwd		= 'Mail Passwort &auml;ndern';
+ $lang->user_name			= 'Benutzername';
+ $lang->old_password			= 'Altes Passwort';
+ $lang->new_password			= 'Neues Passwort';
+ $lang->retype				= 'Noch einmal';
+ $lang->change_passwd		= '&Auml;ndere Passwort';
+ 
+ $lang->error[ 'error' ]		= 'Fehler';
+ $lang->error[ 'errormsg' ]	= 'Der folgende Fehler trat bei der Ausf&uuml;hrung auf:';
+ $lang->error[ 'nopermission' ] = '&Auml;nderung des Passworts nicht erlaubt';
+ $lang->error[ 'setting' ] 	= 'Server und Port m&uuml;ssen stimmen';
+ $lang->error[ 'username' ]	= 'Falscher Benutzername. Der Benutzername mu&szlig; von einem Benutzer sein, der momentan angemeldet ist.';
+ $lang->error[ 'old_pass' ]	= 'Altes Passwort falsch';
+ $lang->error[ 'new_pass_ne' ] = 'Neues Passwort stimmt bei der zweiten Abfrage nicht mit der ersten Abfrage &uuml;berein.'; /* FIXME: Need better Translation */
+ $lang->error[ 'short_pass' ] = 'Neues Passwort zu kurz';
+ $lang->error[ 'no_connect' ]	= 'Keine Verbindung zum Passwort Server';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/prefs.lang imp-2.2.0-pre5/locale/de/prefs.lang
*** imp-2.2.0-pre4/locale/de/prefs.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/prefs.lang	Tue Oct  5 15:41:31 1999
***************
*** 1,39 ****
  <?php
  
! /*
!  
!  File: prefs.lang
!  $Author: mhardy $
!  $Revision: 2.0 $
!  $Date: 1999/04/28 11:41:38 $
!  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
! 
  
  $lang = new HordeLocaleLang();
  require('./config/lang.php3');
  
! $lang->signature_error = '<tr><th>Es ist ein Fehler aufgetreten. Ihre Unterschrift wurde nicht erneuert.</th></tr>'; # erneuert sounds funny
! $lang->language_error = '<tr><th>Es ist ein Fehler aufgetreten. Ihre Spracheinstellung wurde nicht erneuert.</th></tr>';
! $lang->from_error = '<tr><th>Es ist ein Fehler aufgetreten. Ihre &quot;Von&quot; Adresse wurde nicht erneuert.</th></tr>';
! $lang->fullname_error = '<tr><th>Es ist ein Fehler aufgetreten; Ihr vollst&auml;ndiger Name wurde nicht erneuert.</th></tr>';
  
  $lang->save_button = ' Einstellungen speichern ';
  
! $lang->edit_from = '&quot;Von&quot; Zeile editieren';
! $lang->edit_fullname = 'Vollst&auml;ndigen Namen editieren';
  $lang->edit_lang = 'Bevorzugte Sprache w&auml;hlen';
! $lang->edit_sig = 'Unterschrift editieren';
! 
! $lang->prefs_title = 'IMP Einstellungen';
! 
  ?>
--- 1,25 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  $lang = new HordeLocaleLang();
  require('./config/lang.php3');
  
! $lang->signature_error = '<tr><th>Es ist ein Fehler aufgetreten. Ihre Unterschrift wurde nicht aktualisiert.</th></tr>';
! $lang->language_error = '<tr><th>Es ist ein Fehler aufgetreten. Ihre Spracheinstellung wurde nicht aktualisiert.</th></tr>';
! $lang->from_error = '<tr><th>Es ist ein Fehler aufgetreten. Ihre &quot;Von&quot; Adresse wurde nicht aktualisiert.</th></tr>';
! $lang->fullname_error = '<tr><th>Es ist ein Fehler aufgetreten; Ihr vollst&auml;ndiger Name wurde nicht aktualisiert.</th></tr>'; 
  
  $lang->save_button = ' Einstellungen speichern ';
+ $lang->updated = 'Einstellungen wurden aktualisiert.';
  
! $lang->edit_from = '&quot;Von&quot; Zeile &auml;ndern';
! $lang->edit_fullname = 'Vollst&auml;ndigen Namen &auml;ndern';
  $lang->edit_lang = 'Bevorzugte Sprache w&auml;hlen';
! $lang->edit_sig = 'Unterschrift bearbeiten';
! $lang->sig_dashes = 'Bindestriche vor Unterschrift (\'-- \')';
!  
! $lang->prefs_title = 'IMP Einstellungen'; 
!  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/select.lang imp-2.2.0-pre5/locale/de/select.lang
*** imp-2.2.0-pre4/locale/de/select.lang	Wed Apr 28 07:41:38 1999
--- imp-2.2.0-pre5/locale/de/select.lang	Tue Oct  5 15:41:31 1999
***************
*** 1,21 ****
  <?php
  
! /*
!  
!  File: select.lang
!  $Author: mhardy $
!  $Revision: 2.0 $
!  $Date: 1999/04/28 11:41:38 $
!  
!  Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch>
! 
!  IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
  
  $lang = new HordeLocaleLang();
--- 1,6 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  $lang = new HordeLocaleLang();
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/spelling.lang imp-2.2.0-pre5/locale/de/spelling.lang
*** imp-2.2.0-pre4/locale/de/spelling.lang	Fri May  7 18:48:55 1999
--- imp-2.2.0-pre5/locale/de/spelling.lang	Tue Oct  5 15:41:32 1999
***************
*** 7,10 ****
  $lang->select_lang_for_ispell = 'Sprache';
  
! $lang->no_errors = 'Keine Rechtschreibfehler gefunden.';
  ?>
--- 7,10 ----
  $lang->select_lang_for_ispell = 'Sprache';
  
! $lang->no_errors = 'Keine Rechtschreibfehler gefunden.'; 
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/de/status.lang imp-2.2.0-pre5/locale/de/status.lang
*** imp-2.2.0-pre4/locale/de/status.lang	Tue Jul 20 06:48:28 1999
--- imp-2.2.0-pre5/locale/de/status.lang	Tue Oct  5 15:41:32 1999
***************
*** 1,5 ****
  <?php
  
! /* Checked and update 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */
  
  class StatusLocaleLang extends HordeLocaleLang {
--- 1,6 ----
  <?php
  
! /* Checked and updated 1999/04/18 by Fritz Zaucker <zaucker@ee.ethz.ch> */ 
! /* Checked and updated 1999/09/22 by Kai Duebbert <kai@duebbert.de>     */
  
  class StatusLocaleLang extends HordeLocaleLang {
***************
*** 21,26 ****
  $lang->status_title = 'Statuszeile';
  $lang->newmail_msg = 'Sie haben neue Nachrichten!';
! $lang->login_msg = 'Willkommen bei IMP. Loggen Sie sich bitte ein.';
! $lang->green = 'All is well';
  
  ?>
--- 22,27 ----
  $lang->status_title = 'Statuszeile';
  $lang->newmail_msg = 'Sie haben neue Nachrichten!';
! $lang->login_msg = 'Willkommen bei IMP. Bitte melden Sie sich an.';
! $lang->green = 'Alles im Gr&uuml;nen Bereich'; /* FIXME: Ok, little Joke */
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/en/folders.help imp-2.2.0-pre5/locale/en/folders.help
*** imp-2.2.0-pre4/locale/en/folders.help	Wed Apr 28 07:41:39 1999
--- imp-2.2.0-pre5/locale/en/folders.help	Mon Sep 27 17:04:31 1999
***************
*** 24,28 ****
  	FOLDERS_HELP_RENAME,
  	'Rename',
! 	'This options allows you to rename an existing IMAP folder on the remote mail server.'
  );
  $help->add(
--- 24,28 ----
  	FOLDERS_HELP_RENAME,
  	'Rename',
! 	'This option allows you to rename an existing IMAP folder on the remote mail server.'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/en/message.lang imp-2.2.0-pre5/locale/en/message.lang
*** imp-2.2.0-pre4/locale/en/message.lang	Wed Aug  4 21:46:28 1999
--- imp-2.2.0-pre5/locale/en/message.lang	Wed Oct  6 19:23:10 1999
***************
*** 45,48 ****
--- 45,49 ----
  $lang->from = 'From';
  $lang->cc = 'Cc';
+ $lang->bcc = 'Bcc';
  $lang->replyto = 'Reply-To';
  $lang->subject = 'Subject';
diff -r -N -C 2 imp-2.2.0-pre4/locale/en/passwd.lang imp-2.2.0-pre5/locale/en/passwd.lang
*** imp-2.2.0-pre4/locale/en/passwd.lang	Sat Aug 14 00:44:07 1999
--- imp-2.2.0-pre5/locale/en/passwd.lang	Wed Sep 15 22:40:11 1999
***************
*** 19,23 ****
  $lang->error[ 'new_pass_ne' ] = 'New password not correctly retyped';
  $lang->error[ 'short_pass' ] = 'New password too short';
! $lang->errot[ 'no_connect' ]	= 'Could not connect to password Server';
  
  ?>
--- 19,23 ----
  $lang->error[ 'new_pass_ne' ] = 'New password not correctly retyped';
  $lang->error[ 'short_pass' ] = 'New password too short';
! $lang->error[ 'no_connect' ]	= 'Could not connect to password Server';
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fi/login.help imp-2.2.0-pre5/locale/fi/login.help
*** imp-2.2.0-pre4/locale/fi/login.help	Sun Aug 22 06:48:00 1999
--- imp-2.2.0-pre5/locale/fi/login.help	Tue Sep  7 07:04:40 1999
***************
*** 18,28 ****
  $help->add(
  	LOGIN_HELP_SERVER,
! 	'Server',
! 	'This is the remote IMAP server that contains your mail.  The port (if required) is the internet port on which imapd is listening. (eg. 143)'
  );
  $help->add(
  	LOGIN_HELP_FOLDERS,
! 	'Folders',
! 	'"Folders" is where your mail folders live relative to your home directory.  If your mail folders are in $HOME/Mail/, then all you need to enter is Mail/. (remember that unix is case-sensitive).'
  );
  $help->add(
--- 18,28 ----
  $help->add(
  	LOGIN_HELP_SERVER,
! 	'Palvelin',
! 	'Postipalvelin, jossa sähköpostisi ovat. Se on yleensä IMAP-palvelin, mutta IMP tukee myös POP-palvelimia. Portti tarkoittaa sen portin numeroa, jota postipalvelimesi kuuntelee, IMAP-palvelimilla yleensä 143.'
  );
  $help->add(
  	LOGIN_HELP_FOLDERS,
! 	'Kansiot',
! 	'"Kansiot" tarkoittaa polkua hakemistoon, joka sisältää postikansiosi. Jos postikansioidesi sijaintipaikka on $HOME/Mail, syötä tähän kenttään Mail/ (muista, että unix-järjestelmissä kirjainkoko on merkitsevä).'
  );
  $help->add(
diff -r -N -C 2 imp-2.2.0-pre4/locale/fi/mailbox.lang imp-2.2.0-pre5/locale/fi/mailbox.lang
*** imp-2.2.0-pre4/locale/fi/mailbox.lang	Sun Aug 22 06:48:00 1999
--- imp-2.2.0-pre5/locale/fi/mailbox.lang	Tue Sep  7 07:04:40 1999
***************
*** 100,103 ****
--- 100,104 ----
  $lang->showing_deleted = 'Näytetään poistetut viestit';
  $lang->deleted_summary = 'kpl poistettuja viestejä on piilotettu listauksesta';
+ $lang->empty_mailbox = 'Tämä kansio on tyhjä.';
  
  $lang->reverse_sort = 'Käänteinen lajittelujärjestys (uusimmasta tai suurimmasta vanhimpaan tai pienimpään).';
diff -r -N -C 2 imp-2.2.0-pre4/locale/fi/newuser.start.txt imp-2.2.0-pre5/locale/fi/newuser.start.txt
*** imp-2.2.0-pre4/locale/fi/newuser.start.txt	Sun Aug 22 06:48:00 1999
--- imp-2.2.0-pre5/locale/fi/newuser.start.txt	Tue Sep  7 07:04:40 1999
***************
*** 13,20 ****
  <b>Kansion listaus</b>
  <p align="justify">
! Näet Saapuneet-kansion sisällön heti kirjauduttuasi sisään. Kansion listaus näyttää viestien otsakkeet (viestin tila, lähetyspäivämäärä, lähettäjä, otsikko ja koko) omissa sarakkeissaan. Kaikilla sarakkeilla on otsikko. Sarakeotsikon napsauttaminen lajittelee listauksen ko. sarakkeen mukaiseen järjestykseen.
  </p>
  <p>
! <b>Viesti luetaan napsauttamalla sen otsikkoa.</b> Siirryt Viestinäkymään.
  <hr size="1" width="98%" align="center" noshade>
  </p>
--- 13,20 ----
  <b>Kansion listaus</b>
  <p align="justify">
! Näet INBOX-kansion sisällön eli saapuneet viestit heti kirjauduttuasi sisään. Kansion listaus näyttää viestien otsakkeet (viestin tila, lähetyspäivämäärä, lähettäjä, otsikko ja koko) omissa sarakkeissaan. Kaikilla sarakkeilla on otsikko. Sarakeotsikon napsauttaminen lajittelee listauksen ko. sarakkeen mukaiseen järjestykseen.
  </p>
  <p>
! Viesti luetaan napsauttamalla sen <B>otsikkoa</B>. Siirryt Viestinäkymään.
  <hr size="1" width="98%" align="center" noshade>
  </p>
***************
*** 22,26 ****
  <b>Viestinäkymä</b>
  <p align=justify">
! Viestinäkymä näyttää valitun viestin sisällön. Viestinäkymässä voit selata viestin tiedostoliitteitä, vastata nykyiseen viestiin, poistaa nykyisen viestin tai siirtyä nykyisen postilaatikkosi seuraavaan viestiin.
  <hr size="1" width="98%" align="center" noshade>
  </p>
--- 22,26 ----
  <b>Viestinäkymä</b>
  <p align=justify">
! Viestinäkymä näyttää valitun viestin sisällön. Viestinäkymässä voit viestin lukemisen lisäksi selata viestin tiedostoliitteitä, vastata viestiin, poistaa nykyisen viestin tai siirtyä nykyisen postilaatikkosi seuraavaan viestiin.
  <hr size="1" width="98%" align="center" noshade>
  </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fi/openwin.lang imp-2.2.0-pre5/locale/fi/openwin.lang
*** imp-2.2.0-pre4/locale/fi/openwin.lang	Sun Aug 22 06:48:00 1999
--- imp-2.2.0-pre5/locale/fi/openwin.lang	Tue Sep  7 07:04:40 1999
***************
*** 13,17 ****
  $lang->contact_add_height = '200';
  $lang->compose_height = '650';
! $lang->compose_width = '630' ;
  
  ?>
--- 13,17 ----
  $lang->contact_add_height = '200';
  $lang->compose_height = '650';
! $lang->compose_width = '730' ;
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/compose.help imp-2.2.0-pre5/locale/fr/compose.help
*** imp-2.2.0-pre4/locale/fr/compose.help	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/compose.help	Tue Oct  5 16:08:28 1999
***************
*** 14,28 ****
  	COMPOSE_HELP_TO,
  	'Champ A:',
! 	'Il s\'agit des adresses des destinataires. Les adresses doivent être séparées par une virgule. Vous pouvez entrer le surnom d\'un des correspondant tel qu\'il apparaît dans votre carnet d\'adresse ; il sera alors automatiquement remplacé par son adresse e-mail.'
  );
  $help->add(
  	COMPOSE_HELP_CC,
  	'Champ Copie:',
! 	'Il s\'agit des adresses des correspondants à qui vous souhaitez envoyer le mail en copie. Comme pour le champ "A:", vous pouvez entrer le surnom d\'un des correspondant tel qu\'il apparaît dans votre carnet d\'adresse ; il sera alors automatiquement remplacé par son adresse e-mail.  Les adresses doivent être séparées par une virgule.'
  );
  $help->add(
  	COMPOSE_HELP_BCC,
  	'Champ Copie discrète:',
! 	'Ce champ est similaire au champ "Copie:", mais les destinataires du mail (champ A:) ne pourront pas voir la liste des adresses qui y sont placées.'
  );
  $help->add(
--- 14,28 ----
  	COMPOSE_HELP_TO,
  	'Champ A:',
! 	'Il s\'agit des adresses des destinataires. Les adresses doivent être séparées par une virgule. Vous pouvez entrer le surnom d\'un des correspondant tel qu\'il apparaît dans votre carnet d\'adresses ; il sera alors automatiquement remplacé par son adresse e-mail.'
  );
  $help->add(
  	COMPOSE_HELP_CC,
  	'Champ Copie:',
! 	'Il s\'agit des adresses des correspondants à qui vous souhaitez envoyer le mail en copie. Comme pour le champ "À:", vous pouvez entrer le surnom d\'un des correspondant tel qu\'il apparaît dans votre carnet d\'adresses ; il sera alors automatiquement remplacé par son adresse e-mail.  Les adresses doivent être séparées par une virgule.'
  );
  $help->add(
  	COMPOSE_HELP_BCC,
  	'Champ Copie discrète:',
! 	'Ce champ est similaire au champ "Copie:", mais les destinataires du mail (champ À:) ne pourront pas voir la liste des adresses qui y sont placées.'
  );
  $help->add(
***************
*** 34,38 ****
  	COMPOSE_HELP_ATTACH,
  	'Pièce à joindre',
! 	'Ce champ sert à joindre un document au mail. Pour ajouter une pièce jointe, choisisser un fichier à l\'aide du bouton "Browse", puis appuer sur "Valider". '
  );
  $help->add(
--- 34,38 ----
  	COMPOSE_HELP_ATTACH,
  	'Pièce à joindre',
! 	'Ce champ sert à joindre un document au mail. Pour ajouter une pièce jointe, choisir un fichier à l\'aide du bouton "Browse", puis appuyer sur "Valider". '
  );
  $help->add(
***************
*** 43,48 ****
  $help->add(
  	COMPOSE_HELP_ATTACHED,
! 	'Pièce attachées',
! 	'Ce champ liste les différentes pièces jointes à ce message. Pour ajouter une pièce jointe, choisisser un fichier à l\'aide du bouton "Browse", puis appuer sur "Valider". Pour supprimer une pièce jointe, sélectionnée la au moyen de la case à cocher, puis appuer sur le bouton "Supprimer la sélection".'
  );
  ?>
--- 43,48 ----
  $help->add(
  	COMPOSE_HELP_ATTACHED,
! 	'Pièces attachées',
! 	'Ce champ liste les différentes pièces jointes à ce message. Pour ajouter une pièce jointe, choisir un fichier à l\'aide du bouton "Browse", puis appuer sur "Valider". Pour supprimer une pièce jointe, la sélectionner au moyen de la case à cocher, puis appuyer sur le bouton "Supprimer la sélection".'
  );
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/compose.lang imp-2.2.0-pre5/locale/fr/compose.lang
*** imp-2.2.0-pre4/locale/fr/compose.lang	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/compose.lang	Tue Oct  5 16:08:28 1999
***************
*** 5,10 ****
   File: compose.lang
   $Author: chuck $
!  $Revision: 1.21 $
!  $Date: 1999/05/07 22:48:56 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@osmos.ml.org>
--- 5,10 ----
   File: compose.lang
   $Author: chuck $
!  $Revision: 1.21.4.2 $
!  $Date: 1999/10/05 20:08:28 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@osmos.ml.org>
***************
*** 49,53 ****
  $lang->reply_to_string = 'Répondre à';
  $lang->subject_string = 'Sujet';
! $lang->to_string = 'A';
  $lang->cc_string = 'Copie';
  $lang->bcc_string = 'Copie discrète';
--- 49,53 ----
  $lang->reply_to_string = 'Répondre à';
  $lang->subject_string = 'Sujet';
! $lang->to_string = 'À';
  $lang->cc_string = 'Copie';
  $lang->bcc_string = 'Copie discrète';
***************
*** 86,91 ****
  $lang->status_message_postponed = 'L\'envoi du message a été différé';
  $lang->status_composition = 'Rédaction d\'un message';
  
! $lang->contacts = 'Carnet d\'adresse';
  
  $lang->alert_attach_file = 'Il faut appuyer sur le boutton "Valider" pour joindre le fichier sélectionné au mail';
--- 86,92 ----
  $lang->status_message_postponed = 'L\'envoi du message a été différé';
  $lang->status_composition = 'Rédaction d\'un message';
+ $lang->status_cancel = 'Rédaction du message annulée';
  
! $lang->contacts = 'Carnet d\'adresses';
  
  $lang->alert_attach_file = 'Il faut appuyer sur le boutton "Valider" pour joindre le fichier sélectionné au mail';
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/contacts.lang imp-2.2.0-pre5/locale/fr/contacts.lang
*** imp-2.2.0-pre4/locale/fr/contacts.lang	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/contacts.lang	Tue Oct  5 16:08:29 1999
***************
*** 5,16 ****
  /* plain strings */
  
! $lang->error_delete_address = '<tr><th>Suite à une erreur, l\'enregistrement n\'a pas été supprimé de votre carnet d\'adresse.</th></tr>';
  $lang->error_address_chars = '<tr><th>Vous avez utilisé un caractère illégal dans l\'adresse e-mail. L\'enregistrement a été effectué sans tenir compte de l\'adresse; Vous pouvez modifier l\'enregistrement afin de saisir une adresse correcte.</th></tr>';
! $lang->error_nickname_chars = '<tr><th>Vous avez utilisé un caractère illégal dans le surnom. L\'enregistrement a été effectué sans tenir compte de l\'adresse; Vous pouvez modifier l\'enregistrement afin de saisir un surnom correcte.</th></tr>';
! $lang->error_fullname_chars = '<tr><th>Vous avez utilisé un caractère illégal dans le nom. L\'enregistrement a été effectué sans tenir compte de l\'adresse; Vous pouvez modifier l\'enregistrement afin de saisir un nom correcte.</th></tr>';
  $lang->error_create_address = '<tr><th>Suite à une erreur, l\'enregistrement n\'a pu être créé.</th></tr>';
  $lang->error_update_address = '<tr><th>Suite à une erreur, l\'enregistrement n\'a pu être modifié.</th></tr>';
  
! $lang->submit = 'Go';
  $lang->addressbook_title = 'Carnet d\'adresses';
  $lang->address_string = 'Adresse';
--- 5,17 ----
  /* plain strings */
  
! $lang->all_fields = 'Remplissez chaque champs';
! $lang->error_delete_address = '<tr><th>Suite à une erreur, l\'enregistrement n\'a pas été supprimé de votre carnet d\'adresses.</th></tr>';
  $lang->error_address_chars = '<tr><th>Vous avez utilisé un caractère illégal dans l\'adresse e-mail. L\'enregistrement a été effectué sans tenir compte de l\'adresse; Vous pouvez modifier l\'enregistrement afin de saisir une adresse correcte.</th></tr>';
! $lang->error_nickname_chars = '<tr><th>Vous avez utilisé un caractère illégal dans le surnom. L\'enregistrement a été effectué sans tenir compte du surnom; Vous pouvez modifier l\'enregistrement afin de saisir un surnom correct.</th></tr>';
! $lang->error_fullname_chars = '<tr><th>Vous avez utilisé un caractère illégal dans le nom. L\'enregistrement a été effectué sans tenir compte du nom; Vous pouvez modifier l\'enregistrement afin de saisir un nom correct.</th></tr>';
  $lang->error_create_address = '<tr><th>Suite à une erreur, l\'enregistrement n\'a pu être créé.</th></tr>';
  $lang->error_update_address = '<tr><th>Suite à une erreur, l\'enregistrement n\'a pu être modifié.</th></tr>';
  
! $lang->submit = 'Valider';
  $lang->addressbook_title = 'Carnet d\'adresses';
  $lang->address_string = 'Adresse';
***************
*** 20,24 ****
  $lang->new_nickname_string = 'Nouveau surnom';
  $lang->new_fullname_string = 'Nouveau nom';
! $lang->delete_string = 'Supprime';
  $lang->change_string = 'Modifier cette adresse';
  
--- 21,25 ----
  $lang->new_nickname_string = 'Nouveau surnom';
  $lang->new_fullname_string = 'Nouveau nom';
! $lang->delete_string = 'Supprimer';
  $lang->change_string = 'Modifier cette adresse';
  
***************
*** 29,35 ****
  $lang->before_search = 'Les résultats de la recherche LDAP seront donnés ici.';
  
! $lang->action_add_address = 'Ajouter une entrée au carnet d\'adresse';
! $lang->action_update_address = 'Mettre à jour une entrée du carnet d\'adresse';
! $lang->action_delete_address = 'Supprimer une entrée du carnet d\'adresse';
  $lang->action_insert_address = 'Insérer une entrée dans la fenêtre de composition';
  
--- 30,36 ----
  $lang->before_search = 'Les résultats de la recherche LDAP seront donnés ici.';
  
! $lang->action_add_address = 'Ajouter une entrée au carnet d\'adresses';
! $lang->action_update_address = 'Mettre à jour une entrée du carnet d\'adresses';
! $lang->action_delete_address = 'Supprimer une entrée du carnet d\'adresses';
  $lang->action_insert_address = 'Insérer une entrée dans la fenêtre de composition';
  
***************
*** 39,43 ****
  $lang->button_insert_address = 'Insérer cette entrée';
  
! $lang->alert_no_compose = 'Attention, vous ne pouvez utiliser la fonction "Insérer" que lorsque vous avez lancer le "carnet d\\\'adresse" depuis la fenêtre de composition.';
  
  $lang->no_ldap_server = 'Aucun serveur LDAP n\'a été spécifié.';
--- 40,44 ----
  $lang->button_insert_address = 'Insérer cette entrée';
  
! $lang->alert_no_compose = 'Attention, vous ne pouvez utiliser la fonction "Insérer" que lorsque vous avez lancer le "carnet d\'adresses" depuis la fenêtre de composition.';
  
  $lang->no_ldap_server = 'Aucun serveur LDAP n\'a été spécifié.';
***************
*** 45,53 ****
  $lang->no_ldap_bind = 'Impossible de communiquer avec le serveur LDAP.';
  
! $lang->too_many_results = 'Il y a trop de résultats. Essayez de préciser les critères de recherche.  Please try to narrow the search scope.';
  
  $lang->ldap_add = ' Ajouter ';
  $lang->ldap_clear = ' Réinitialiser le formulaire ';
! $lang->ldap_insertaddr = ' Insérer dans le carnet d\'adresse ';
  
  $lang->ldap_no_results = 'Aucune réponse n\'a été trouvée.';
--- 46,54 ----
  $lang->no_ldap_bind = 'Impossible de communiquer avec le serveur LDAP.';
  
! $lang->too_many_results = 'Il y a trop de résultats. Essayez de préciser les critères de recherche.';
  
  $lang->ldap_add = ' Ajouter ';
  $lang->ldap_clear = ' Réinitialiser le formulaire ';
! $lang->ldap_insertaddr = ' Insérer dans le carnet d\'adresses ';
  
  $lang->ldap_no_results = 'Aucune réponse n\'a été trouvée.';
***************
*** 71,79 ****
  $lang->sounds = 'ressemble à';
  $lang->submit_button = ' Lancer la recherche ';
  
  $lang->add_contact = ' Ajouter ';
  $lang->del_contact = ' Supprimer ';
  $lang->update_contact = ' Modifier ';
! $lang->contacts = 'Contacts';
  
  $lang->ldapsearch = 'Recherche LDAP';
--- 72,81 ----
  $lang->sounds = 'ressemble à';
  $lang->submit_button = ' Lancer la recherche ';
+ $lang->mailalternateaddress = 'Autre adresse';
  
  $lang->add_contact = ' Ajouter ';
  $lang->del_contact = ' Supprimer ';
  $lang->update_contact = ' Modifier ';
! $lang->contacts = 'Carnet d\'adresses';
  
  $lang->ldapsearch = 'Recherche LDAP';
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/folders.help imp-2.2.0-pre5/locale/fr/folders.help
*** imp-2.2.0-pre4/locale/fr/folders.help	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/folders.help	Tue Oct  5 16:08:29 1999
***************
*** 13,17 ****
  $help->add(
  	FOLDERS_HELP_UNSUBSCRIBE,
! 	'S\'abonner',
  	'Cette option vous permet d\'annuler l\'abonnement à un répertoire du serveur IMAP distant.'
  );
--- 13,17 ----
  $help->add(
  	FOLDERS_HELP_UNSUBSCRIBE,
! 	'Se désabonner',
  	'Cette option vous permet d\'annuler l\'abonnement à un répertoire du serveur IMAP distant.'
  );
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/folders.lang imp-2.2.0-pre5/locale/fr/folders.lang
*** imp-2.2.0-pre4/locale/fr/folders.lang	Sat Jun 19 20:09:24 1999
--- imp-2.2.0-pre5/locale/fr/folders.lang	Tue Oct  5 16:08:29 1999
***************
*** 5,10 ****
   File: folders.lang
   $Author: chuck $
!  $Revision: 1.11 $
!  $Date: 1999/06/20 00:09:24 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: folders.lang
   $Author: chuck $
!  $Revision: 1.11.2.2 $
!  $Date: 1999/10/05 20:08:29 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 21,37 ****
  
  $lang->delete_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le dossier n\'a pas été effacé.</th></tr>';
! $lang->unsub_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le dossier n\'a pas été désabonné.</th></tr>';
  $lang->create_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le nouveau dossier n\'a pas été créé.</th></tr>';
! $lang->subscribe_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le dossier n\'a pas été abonné.</th></tr>';
  $lang->rename_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le dossier n\'a pas été renommé.</th></tr>';
  
  $lang->folders_title = 'Dossiers';
! $lang->confirm_delete = "Effacer un dossier entraîne la perte de tous les message qu'il contient.\\nÊtes vous sur de vouloir l'effacer?";
  
- $lang->unsub_label = 'Se désabonner à un dossier';
  $lang->subscribe_label = 'S\'abonner à un dossier';
  $lang->rename_label = 'Renommer un dossier';
  $lang->delete_label = 'Supprimer un dossier';
  $lang->create_label = 'Créer un nouveau dossier';
  
  $lang->unsub = 'Désabonnement';
--- 21,43 ----
  
  $lang->delete_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le dossier n\'a pas été effacé.</th></tr>';
! $lang->unsub_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; Vous n\'avez pas été désabonné de ce dossier.</th></tr>';
  $lang->create_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le nouveau dossier n\'a pas été créé.</th></tr>';
! $lang->subscribe_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; Vous n\'avez pas été abonné au dossier.</th></tr>';
  $lang->rename_folder_error = '<tr><th colspan=5>Une erreur s\'est produite ; le dossier n\'a pas été renommé.</th></tr>';
+ $lang->none_selected = '<tr><th colspan=5>Une erreur s\'est produite ; Aucun dossier n\'a été selectionné.</th></tr>';
  
  $lang->folders_title = 'Dossiers';
! $lang->confirm_delete = "Effacer un dossier entraîne la perte de tous les messages qu'il contient.\\nÊtes vous sur de vouloir l'effacer?";
! 
! $lang->available = 'Dossiers disponibles:';
! $lang->selected = 'Dossiers sélectionnés:';
! $lang->add_caption = "Ajouter la selection";
! $lang->remove_caption = "Retirer la selection";
  
  $lang->subscribe_label = 'S\'abonner à un dossier';
  $lang->rename_label = 'Renommer un dossier';
  $lang->delete_label = 'Supprimer un dossier';
  $lang->create_label = 'Créer un nouveau dossier';
+ $lang->unsub_label = 'Se désabonner d\'un dossier';
  
  $lang->unsub = 'Désabonnement';
***************
*** 42,50 ****
  $lang->create = 'Créer';
  
! $lang->unsub_button = ' désabonner ce dossier ';
! $lang->subscribe_button = ' abonner ce dossier ';
  $lang->rename_button = ' renommer ce dossier ';
  $lang->delete_button = ' supprimer ce dossier ';
  $lang->create_button = ' créer ce dossier ';
  
  ?>
--- 48,58 ----
  $lang->create = 'Créer';
  
! $lang->unsub_button = ' se désabonner de ce dossier ';
! $lang->subscribe_button = ' s\'abonner à ce dossier ';
  $lang->rename_button = ' renommer ce dossier ';
  $lang->delete_button = ' supprimer ce dossier ';
  $lang->create_button = ' créer ce dossier ';
  
+ // must start with at least five (5) hyphens (-)
+ $lang->select_spacer = '------------------------------';
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/horde.lang imp-2.2.0-pre5/locale/fr/horde.lang
*** imp-2.2.0-pre4/locale/fr/horde.lang	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/horde.lang	Tue Oct  5 16:08:29 1999
***************
*** 2,5 ****
--- 2,6 ----
  
  $this->imp->selected_messages = 'la sélection vers:';
+ $this->imp->download = 'Télécharger';
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/ldap.search.lang imp-2.2.0-pre5/locale/fr/ldap.search.lang
*** imp-2.2.0-pre4/locale/fr/ldap.search.lang	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/ldap.search.lang	Tue Oct  5 16:08:30 1999
***************
*** 3,7 ****
  $lang = new HordeLocaleLang;
  
! $lang->alert_no_compose = 'Veuillez noter que la fonction "Insérer" n\'est utilisable que depuis la fenêtre de Rédaction.';
  
  $lang->no_ldap_server = 'Aucun serveur LDAP n\'a été sélectionné.';
--- 3,7 ----
  $lang = new HordeLocaleLang;
  
! $lang->alert_no_compose = 'Veuillez noter que la fonction "Insérer" n\'est utilisable que depuis la fenêtre de rédaction.';
  
  $lang->no_ldap_server = 'Aucun serveur LDAP n\'a été sélectionné.';
***************
*** 16,22 ****
  $lang->ldap_insertcc = ' Ajouter en copie ';
  $lang->ldap_insertbcc = ' Ajouter en copie discrète ';
! $lang->ldap_insertaddr = ' Insert into Contacts ';
  
! $lang->ldap_no_results = 'Aucun résultat à votre requête.';
  
  
--- 16,22 ----
  $lang->ldap_insertcc = ' Ajouter en copie ';
  $lang->ldap_insertbcc = ' Ajouter en copie discrète ';
! $lang->ldap_insertaddr = ' Insérer dans le calepin ';
  
! $lang->ldap_no_results = 'Aucun résultat pour votre requête.';
  
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/login.lang imp-2.2.0-pre5/locale/fr/login.lang
*** imp-2.2.0-pre4/locale/fr/login.lang	Fri May  7 18:48:56 1999
--- imp-2.2.0-pre5/locale/fr/login.lang	Tue Oct  5 16:08:30 1999
***************
*** 5,9 ****
  
  $lang->welcome_to_imp = 'Bienvenue a IMP';
! $lang->javascript_needed = 'IMP requi\350re JavaScript pour certaines op\351rations sur les messages.';
  $lang->user_name= 'Utilisateur';
  $lang->password	= 'Mot de Passe';
--- 5,9 ----
  
  $lang->welcome_to_imp = 'Bienvenue a IMP';
! $lang->javascript_needed = 'IMP requière JavaScript pour certaines opérations sur les messages.';
  $lang->user_name= 'Utilisateur';
  $lang->password	= 'Mot de Passe';
***************
*** 14,20 ****
  $lang->language                 = 'Langue';
  
! $lang->login = '';
! $lang->timeout = 'Soit vous ne vous êtes pas correctement identifié, soit votre authentification a expirée. Merci de vous identifier de nouveau.';
! $lang->logout = 'Merci d\'avoir utiliser IMP.<br>Pour lire votre courrier, il suffit de vous identifier au moyen du formulaire ci-dessous.<br>';
  $lang->nocert = 'Vous devez posséder un certificat en cours de validité pour
  accéder à ce site.';
--- 14,20 ----
  $lang->language                 = 'Langue';
  
! $lang->login = 'Utilisateur';
! $lang->timeout = 'Soit vous ne vous êtes pas correctement identifié, soit votre authentification a expiré. Merci de vous identifier de nouveau.';
! $lang->logout = 'Merci d\'avoir utilisé IMP.<br>Pour lire votre courrier, il suffit de vous identifier au moyen du formulaire ci-dessous.<br>';
  $lang->nocert = 'Vous devez posséder un certificat en cours de validité pour
  accéder à ce site.';
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/mailbox.lang imp-2.2.0-pre5/locale/fr/mailbox.lang
*** imp-2.2.0-pre4/locale/fr/mailbox.lang	Thu May 20 00:39:21 1999
--- imp-2.2.0-pre5/locale/fr/mailbox.lang	Tue Oct  5 16:08:30 1999
***************
*** 50,61 ****
  $lang->selected_mail = 'la sélection';
  
  $lang->date_label = 'Date';
  $lang->from_label = 'De';
  $lang->subject_label = 'Objet';
  $lang->size_label = 'Taille';
! $lang->to_label = 'A';
  
  $lang->select_all = 'tout sélectionner';
  $lang->select_none = 'annuler la sélection';
  $lang->empty_trash = 'vider la corbeille';
  
--- 50,65 ----
  $lang->selected_mail = 'la sélection';
  
+ $lang->sort_by_label =  'Classement par';
+ 
  $lang->date_label = 'Date';
  $lang->from_label = 'De';
  $lang->subject_label = 'Objet';
  $lang->size_label = 'Taille';
! $lang->to_label = 'À';
  
  $lang->select_all = 'tout sélectionner';
  $lang->select_none = 'annuler la sélection';
+ $lang->hide_deleted = 'Masquer les messages effacés';
+ $lang->show_deleted = 'Montrer les messages effacés';
  $lang->empty_trash = 'vider la corbeille';
  
***************
*** 64,67 ****
--- 68,74 ----
  $lang->mailbox = 'Boîte';
  
+ $lang->message = 'Message';
+ $lang->messages = 'Messages';
+ 
  $lang->deletion = 'Suppression';
  $lang->deleted = 'supprimé';
***************
*** 74,80 ****
  $lang->expunge = 'Purge';
  $lang->expunged = 'purgé';
  
  $lang->reverse_sort = 'inverse l\'ordre de tri de la colonne sélectionnée';
  
! $lang->refresh = 'Refresh Mailbox';
  ?>
--- 81,91 ----
  $lang->expunge = 'Purge';
  $lang->expunged = 'purgé';
+ $lang->hiding_deleted = 'Messages supprimés invisibles';
+ $lang->showing_deleted = 'Messages supprimés visibles';
+ $lang->deleted_summary = 'Message(s) suprimé(s) absent(s) de la liste';
+ $lang->empty_mailbox = 'Pas de nouvelles, bonne nouvelle.';
  
  $lang->reverse_sort = 'inverse l\'ordre de tri de la colonne sélectionnée';
  
! $lang->refresh = 'Récupérer les nouveaux messages';
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/menu.lang imp-2.2.0-pre5/locale/fr/menu.lang
*** imp-2.2.0-pre4/locale/fr/menu.lang	Fri May  7 18:48:57 1999
--- imp-2.2.0-pre5/locale/fr/menu.lang	Tue Oct  5 16:08:30 1999
***************
*** 4,10 ****
  
  $lang->login_again = 'Veuillez vous reconnecter';
! $lang->contacts = 'contacts';
  //$lang->addressbook = 'calepin';
  $lang->login = 'connexion';
  $lang->check_inbox = 'relever';
  $lang->compose = 'nouveau';
--- 4,11 ----
  
  $lang->login_again = 'Veuillez vous reconnecter';
! $lang->contacts = 'carnet d\'adresses';
  //$lang->addressbook = 'calepin';
  $lang->login = 'connexion';
+ $lang->inbox = 'INBOX';
  $lang->check_inbox = 'relever';
  $lang->compose = 'nouveau';
***************
*** 12,15 ****
--- 13,17 ----
  $lang->manage_files = 'manage files';
  $lang->prefs = 'préférences';
+ $lang->change_password = 'Changer de mot de passe';
  $lang->view_log = 'voir log';
  $lang->logout = 'quitter';
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/message.lang imp-2.2.0-pre5/locale/fr/message.lang
*** imp-2.2.0-pre4/locale/fr/message.lang	Fri May  7 18:48:57 1999
--- imp-2.2.0-pre5/locale/fr/message.lang	Tue Oct  5 16:08:31 1999
***************
*** 5,10 ****
   File: message.lang
   $Author: chuck $
!  $Revision: 1.11 $
!  $Date: 1999/05/07 22:48:57 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: message.lang
   $Author: chuck $
!  $Revision: 1.11.4.2 $
!  $Date: 1999/10/05 20:08:31 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 24,28 ****
     
     function message_status ($current_mbox, $msg_index, $num) {
!       return "$current_mbox: $msg_index of $num";
     }
     
--- 24,28 ----
     
     function message_status ($current_mbox, $msg_index, $num) {
!       return "$current_mbox: $msg_index parmis les $num";
     }
     
***************
*** 55,64 ****
  
  $lang->date = 'Date';
! $lang->to = 'A';
  $lang->from = 'De';
  $lang->cc = 'Cc';
  $lang->replyto = 'Répondre à';
  $lang->subject = 'Objet';
! $lang->parts = 'pièces jointes';
  
  $lang->prev = '[prec]';
--- 55,64 ----
  
  $lang->date = 'Date';
! $lang->to = 'À';
  $lang->from = 'De';
  $lang->cc = 'Cc';
  $lang->replyto = 'Répondre à';
  $lang->subject = 'Objet';
! $lang->parts = 'Pièces jointes';
  
  $lang->prev = '[prec]';
***************
*** 70,73 ****
--- 70,74 ----
  $lang->bounce = 'rediriger';
  $lang->saveas = 'enregistrer sous';
+ $lang->resume = 'Répondre sans le texte';
  $lang->compose = 'Compose Message';
  $lang->add_to_contacts = 'enregistrer l\'adresse';
***************
*** 75,79 ****
  $lang->delete_error = '<tr><th colspan=2>Suite à une erreur, votre message n\'a pas été effacé.</td></tr>';
  
! $lang->copy_error = '<B>La copie a échouée.</B>';
  $lang->move_error = '<B>Le déplacement a échoué.</B>';
  
--- 76,80 ----
  $lang->delete_error = '<tr><th colspan=2>Suite à une erreur, votre message n\'a pas été effacé.</td></tr>';
  
! $lang->copy_error = '<B>La copie a échoué.</B>';
  $lang->move_error = '<B>Le déplacement a échoué.</B>';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/newuser.start.txt imp-2.2.0-pre5/locale/fr/newuser.start.txt
*** imp-2.2.0-pre4/locale/fr/newuser.start.txt	Fri May  7 18:48:57 1999
--- imp-2.2.0-pre5/locale/fr/newuser.start.txt	Tue Oct  5 16:08:31 1999
***************
*** 1,5 ****
  <b>S'identifier</b>
  <p align="justify">
! Toutes les sessions sur IMP commencent par l'écran d'idenntification. Avant de
  pouvoir utiliser les fonctionnalités d'IMP, vous devez vous identifier vis à
  vis du serveur IMAP au moyen d'un <i>nom d'utilisateur</i> et d'un <i>mot de
--- 1,5 ----
  <b>S'identifier</b>
  <p align="justify">
! Toutes les sessions sur IMP commencent par l'écran d'identification. Avant de
  pouvoir utiliser les fonctionnalités d'IMP, vous devez vous identifier vis à
  vis du serveur IMAP au moyen d'un <i>nom d'utilisateur</i> et d'un <i>mot de
***************
*** 7,15 ****
  </p>
  <p align="justify">
! Vous aurez éventuellement la possibilité de choisir le seveur de mail IMAP
  auquel vous voulez vous connecter.
  </p>
  <p align="justify">
! Une fois tousles champs remplis, cliquez sur le bouton <i>Entrez</i> pour
  continuer.
  <hr size="1" width="98%" align="center" noshade>
--- 7,15 ----
  </p>
  <p align="justify">
! Vous aurez éventuellement la possibilité de choisir le serveur de mail IMAP
  auquel vous voulez vous connecter.
  </p>
  <p align="justify">
! Une fois tous les champs remplis, cliquez sur le bouton <i>Entrez</i> pour
  continuer.
  <hr size="1" width="98%" align="center" noshade>
***************
*** 25,29 ****
  </p>
  <p>
! Pour visualiser le contenu d'un message, cliquez sur le <i>sujet</i> du message. 
  <hr size="1" width="98%" align="center" noshade>
  </p>
--- 25,29 ----
  </p>
  <p>
! Pour visualiser le contenu d'un message, cliquez sur son <i>sujet</i>. 
  <hr size="1" width="98%" align="center" noshade>
  </p>
***************
*** 42,51 ****
  </p>
  <p align="justify">
! La fenêtre de rédaction, vous permettra entre autres choses, de définir le
! destinataire du message, son sujet et bien sur le texte du message mais aussi
  d'y attacher des pièces jointes. Il suffit
  de remplir les champs appropriés dans la moitié supérieure de la fenêtre, et
  de taper votre message dans la moitié inférieure. Une fois le message écrit,
! vous pouvez choisir d'en vérifier l'orthographe. Il vousreste alors à
  l'envoyer en appuyant sur le bouton <i>envoyer</i>.
  </p>
--- 42,51 ----
  </p>
  <p align="justify">
! La fenêtre de rédaction, vous permettra, entre autres choses, de définir le
! destinataire du message, son sujet et bien sûr le texte du message mais aussi
  d'y attacher des pièces jointes. Il suffit
  de remplir les champs appropriés dans la moitié supérieure de la fenêtre, et
  de taper votre message dans la moitié inférieure. Une fois le message écrit,
! vous pouvez choisir d'en vérifier l'orthographe. Il vous reste alors à
  l'envoyer en appuyant sur le bouton <i>envoyer</i>.
  </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/prefs.lang imp-2.2.0-pre5/locale/fr/prefs.lang
*** imp-2.2.0-pre4/locale/fr/prefs.lang	Fri May  7 18:48:57 1999
--- imp-2.2.0-pre5/locale/fr/prefs.lang	Tue Oct  5 16:08:31 1999
***************
*** 5,10 ****
   File: prefs.lang
   $Author: chuck $
!  $Revision: 1.8 $
!  $Date: 1999/05/07 22:48:57 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: prefs.lang
   $Author: chuck $
!  $Revision: 1.8.4.2 $
!  $Date: 1999/10/05 20:08:31 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 27,36 ****
  $lang->fullname_error = '<tr><th>Une erreur s\'est produite ; votre nom n\'a pas été mis à jour.</th></tr>';
  
! $lang->save_button = ' sauvegarder les préférences ';
  
! $lang->edit_from = 'Editez votre adresse électronique';
! $lang->edit_fullname = 'Editez votre nom';
  $lang->edit_lang = 'Choisissez votre langue';
! $lang->edit_sig = 'Editez votre signature';
  
  $lang->prefs_title = 'IMP Préférences';
--- 27,39 ----
  $lang->fullname_error = '<tr><th>Une erreur s\'est produite ; votre nom n\'a pas été mis à jour.</th></tr>';
  
! $lang->save_button = 'sauvegarder les préférences';
! $lang->updated = 'Les préférences ont été mises à jour.';
  
! $lang->edit_from = 'Éditez votre adresse électronique';
! $lang->edit_fullname = 'Éditez votre nom';
  $lang->edit_lang = 'Choisissez votre langue';
! $lang->edit_sig = 'Éditez votre signature';
! $lang->sig_dashes = 'Préfixez la signature avec (\'-- \') et ne dépassez pas 4 lignes de 72 caractères';
! 
  
  $lang->prefs_title = 'IMP Préférences';
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/select.lang imp-2.2.0-pre5/locale/fr/select.lang
*** imp-2.2.0-pre4/locale/fr/select.lang	Fri May  7 18:48:57 1999
--- imp-2.2.0-pre5/locale/fr/select.lang	Tue Oct  5 16:08:32 1999
***************
*** 5,10 ****
   File: select.lang
   $Author: chuck $
!  $Revision: 1.5 $
!  $Date: 1999/05/07 22:48:57 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
   File: select.lang
   $Author: chuck $
!  $Revision: 1.5.4.1 $
!  $Date: 1999/10/05 20:08:32 $
   
   IMP: Copyright 1998 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 21,25 ****
  
  
! $lang->select_title = 'Séléction des répertoires d\'IMP';
  $lang->open_folder = 'Ouvrir ce répertoire :';
  
--- 21,25 ----
  
  
! $lang->select_title = 'Sélection des répertoires d\'IMP';
  $lang->open_folder = 'Ouvrir ce répertoire :';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/fr/status.lang imp-2.2.0-pre5/locale/fr/status.lang
*** imp-2.2.0-pre4/locale/fr/status.lang	Tue Jul 20 06:48:29 1999
--- imp-2.2.0-pre5/locale/fr/status.lang	Wed Sep 15 22:40:16 1999
***************
*** 19,23 ****
  $lang->status_title = 'Barre d\'état';
  $lang->newmail_msg = 'Vous avez du courrier !';
! $lang->login_msg = 'Bienvenue sur IMP. Merci de vous identifier.';
  
  ?>
--- 19,24 ----
  $lang->status_title = 'Barre d\'état';
  $lang->newmail_msg = 'Vous avez du courrier !';
! $lang->login_msg = 'Bienvenue dans IMP. Merci de vous identifier.';
! $lang->green = 'Tout va bien';
  
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/compose.help imp-2.2.0-pre5/locale/hu/compose.help
*** imp-2.2.0-pre4/locale/hu/compose.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/compose.help	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,43 ----
+ <?php
+ /*
+ compose.help
+ 
+ This is the help for the compose screen.
+ 
+ */
+ $help->add(
+ 	COMPOSE_HELP_FROM,
+ 	'Honnan:',
+ 	'Az a cím ami megjelenik a címzett fejlécében a honnan mezõben.  Ez általában a te e-mail címed.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_TO,
+ 	'Kinek:',
+ 	'Az(ok) a cím(ek) ahova küldöd az üzenetet (címzett).  Több címet is be lehet írni.  Az üzenet mindegyik címzetthez el lesz küldve.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_CC,
+ 	'Másolatot kap:',
+ 	'A másolatot kap mezõbe írhatod azokat a címeket amelyeknek utólagosan küldöd el az üzenetet. '
+ );
+ $help->add(
+ 	COMPOSE_HELP_BCC,
+ 	'Titkos másolatot kap:',
+ 	'A titkos másolatot kap olyan, mint a másolatot kap csak a címzett nem látja a további címzett listát.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_SUBJECT,
+ 	'Tárgy:',
+ 	'Ez a mezõ tartalmazza az üzenet tárgyát.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_ATTACH,
+ 	'Csatolás',
+ 	'Ez tartalmazza az üzenethez csatolt file-ok listáját.  Csatolás hozzáadása az üzenethez a tallózás gombbal kiválaszt egy file-t es rákattint a csatolás gombra.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_OPTIONS,
+ 	'Üzenet beállítások',
+ 	'A további üzenet beállítások itt találhatók.'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/compose.lang imp-2.2.0-pre5/locale/hu/compose.lang
*** imp-2.2.0-pre4/locale/hu/compose.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/compose.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,79 ----
+ <?php
+ 
+ class ComposeLocaleLang extends HordeLocaleLang {
+    
+    function ComposeLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function forwarded_from ($message_source) {
+       return "----- $message_source továbbított üzenet -----";
+    }
+    
+ }
+ 
+ 
+ $lang = new ComposeLocaleLang();
+ require('./config/lang.php3');
+ require('./locale/en/openwin.lang');
+ /* plain strings */
+ 
+ $lang->action_send = 'Üzenet küldése';
+ $lang->action_postpone = 'Üzenet halasztása';
+ $lang->action_reply = 'Válaszolás:';
+ $lang->action_reply_all = 'Válaszolás az összesre:';
+ $lang->action_forward = 'Továbbítás:';
+ $lang->action_add_attach = 'Szerkesztés: Hozzáadott csatolás...';
+ $lang->action_del_attach = 'Szerkesztés: Törölt csatolás...';
+ $lang->action_compose = 'Üzenet szerkesztése';
+ $lang->action_bounce = 'Üzenet visszaküldése';
+ 
+ $lang->quoting_string = 'Idézet';
+ $lang->date_string = 'Dátum';
+ $lang->from_string = 'Honnan';
+ $lang->reply_to_string = 'Válaszolás';
+ $lang->subject_string = 'Tárgy';
+ $lang->to_string = 'Kinek';
+ $lang->cc_string = 'Másolatot kap';
+ $lang->bcc_string= 'Titkos másolatot kap';
+ $lang->attach_string = 'File csatolása';
+ $lang->attach_string_plural = 'File csatolása';
+ 
+ $lang->file_name = 'File neve';
+ $lang->file_size = 'File mérete';
+ $lang->total_size = 'Összesített méret';
+ $lang->options = 'Opciók';
+ $lang->sign_message = 'Digitálisan jelölje az üzenetet?';
+ 
+ $lang->button_attach = 'Csatolás';
+ $lang->button_cancel = 'Üzenet elvetése';
+ $lang->button_delete_attach = 'Csatolás törlése';
+ $lang->button_spellcheck = 'Helyesírásellenõrzés';
+ $lang->spell_in=' ';
+ $lang->button_postpone = 'Üzenet halasztása';
+ $lang->button_send = 'Üzenet küldése';
+ $lang->button_bounce = 'Üzenet visszaküldése';
+ 
+ $lang->fwd_string = 'Továbbítás:';
+ $lang->forward_end_string = 'Továbbított üzenet vége';
+ 
+ $lang->alert_specify_file = 'Részletezned kell a file-t a csatoláshoz.';
+ $lang->alert_select_attach_delete = 'Ki kell választanod a csatolás(okat) a törlésre.';
+ $lang->alert_need_text = 'Szövegnek kell lennie az üzenetablakban mielõtt elküldenéd a levelet.';
+ $lang->alert_no_signing_support = 'A jelölés támogatása csak Netscape v4.03+ alatt lehetséges.';
+ 
+ $lang->sig_valid_error = "<h2><font color=red>Az aláírás ervényesítése nem sikerült. </font> Üzenet <u>NEM</u> lett elküldve!<h2>";
+ $lang->status_bounce_success = 'Az üzenet sikeresen vissza lett küldve.';
+ $lang->status_send_success = 'Az üzenet sikeresen el lett küldve.';
+ $lang->status_send_save_error = 'Az üzenet sikeresen el lett küldve, HIBA: nem lett elmentve';
+ $lang->status_error_fequired_field = 'Egy vagy több szükséges mezõ üresen lett hagyva.';
+ $lang->status_postpone_error = 'Hiba: Üzenet halasztása nem sikerült';
+ $lang->status_message_postponed = 'Üzenet el lett halasztva';
+ $lang->status_composition = 'Üzenet szerkesztés';
+ 
+ $lang->contacts = 'Címtár';
+ 
+ $lang->alert_attach_file = 'Kattintson a csatolás gombra, hogy ezt a file-t csatolja';
+ $lang->alert_need_recipient = 'Szükséged van egy átvevõre.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/contacts.lang imp-2.2.0-pre5/locale/hu/contacts.lang
*** imp-2.2.0-pre4/locale/hu/contacts.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/contacts.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,81 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ /* plain strings */
+ 
+ $lang->error_delete_address = '<tr><th>Egy hiba történt; a bejegyzés nem törlödött a címtár listából.</th></tr>';
+ $lang->error_address_chars = '<tr><th>Illegális karaktert használtál az email címben. Újra írd be e nélkül; szerkeszd át ha meg akarod változtatni ezt a bejegyzést.</th></tr>';
+ $lang->error_nickname_chars = '<tr><th>Illegális karaktert használtál a becenévnél. Újra írd be e nélkül; szerkeszd át ha meg akarod változtatni ezt a bejegyzést.</th></tr>';
+ $lang->error_fullname_chars = '<tr><th>Illegális karaktert használtál a teljes névnél. Újra írd be e nélkül; szerkeszd át ha meg akarod változtatni ezt a bejegyzést.</th></tr>';
+ $lang->error_create_address = '<tr><th>Egy hiba történt; a bejegyzés nem lett létrehozva.</th></tr>';
+ $lang->error_update_address = '<tr><th>Egy hiba történt; a bejegyzés nem lett megváltoztatva.</th></tr>';
+ 
+ $lang->addressbook_title = 'Címtár lista';
+ $lang->address_string = 'Cím';
+ $lang->nickname_string = 'Becenév';
+ $lang->fullname_string = 'Teljes név';
+ $lang->new_address_string = 'Új cím';
+ $lang->new_nickname_string = 'Új becenév';
+ $lang->new_fullname_string = 'Új teljes név';
+ $lang->delete_string = 'Törlés';
+ $lang->change_string = 'Címtár változtatása';
+ 
+ $lang->insert_into_to = ' Beszurás a Kinekhez: ';
+ $lang->insert_into_cc = ' Beszurás a másolatot kapba: ';
+ $lang->insert_into_bcc = ' Beszurás a titkos másolatot kapba: ';
+ $lang->close_window = ' Ablak bezárása ';
+ $lang->before_search = 'LDAP keresés eredményének kistája itt.';
+ 
+ $lang->action_add_address = 'Egy bejegyzés hozzáadása a címtár listához';
+ $lang->action_update_address = 'Egy bejegyzés frissítése a címtár listának';
+ $lang->action_delete_address = 'Egy bejegyzés eltávolítása a címtár listából';
+ $lang->action_insert_address = 'Egy bejegyzés beszürása a szerkesztõablakba';
+ 
+ $lang->button_add_address = 'Adja hozzá ezt a címet';
+ $lang->button_update_address = 'Frissítse ezt a címet';
+ $lang->button_delete_address = 'Törölje ezt a címet';
+ $lang->button_insert_address = 'Szurja be ezt a címet';
+ 
+ $lang->alert_no_compose = 'Gyözödj meg arról, hogy csak a beszurás funkciót használtad amikor elindítottad a címtárat a szerkesztõ ablakból.';
+ 
+ $lang->no_ldap_server = 'Nincs LDAP server jelezve.';
+ $lang->no_ldap_connection = 'Nem tudok kapcsolatot teremteni az LDAP Server-rel.';
+ $lang->no_ldap_bind = 'Nem tudok összeköttetést teremteni az LDAP server-rel.';
+ 
+ $lang->too_many_results = 'Túl sok eredmény.  Probáld szükíteni a keresési hatáskört.';
+ 
+ $lang->ldap_add = ' Hozzáadás ';
+ $lang->ldap_clear = ' Törlés ';
+ $lang->ldap_insertaddr = ' Beszurás a címtárba ';
+ 
+ $lang->ldap_no_results = 'Nem találtam alkalmas bejegyzést.';
+ 
+ $lang->search = 'Keresés a(z)';
+ $lang->directory = 'könyvtárban';
+ $lang->where = 'ahol a(z)';
+ $lang->uid = 'UID';
+ $lang->mail = 'E-Mail cím';
+ $lang->sn = 'Családi név';
+ $lang->givenname = 'Keresztnév';
+ $lang->ou = 'Szervezeti egység';
+ $lang->cn = 'Név';
+ $lang->begins = 'kezdõdik';
+ $lang->contains = 'tartalmaz';
+ $lang->ends = 'végzõdik';
+ $lang->is_strict = '';
+ $lang->is = '';
+ $lang->sounds = 'hangzik';
+ $lang->submit_button = ' Keresés indítása ';
+ 
+ $lang->add_contact = ' Hozzáadás a címtárhoz ';
+ $lang->del_contact = ' Törlés a címtárból ';
+ $lang->update_contact = ' Címtár frissítése ';
+ $lang->contacts = 'Címtár';
+ $lang->ldapsearch = 'LDAP keresés';
+ $lang->ldapresults = 'LDAP eredmény';
+ $lang->select = 'Választás ';
+ $lang->add_to_contacts = 'Hozzáadás a címtárhoz';
+ $lang->submit = 'Kész' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/folders.help imp-2.2.0-pre5/locale/hu/folders.help
*** imp-2.2.0-pre4/locale/hu/folders.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/folders.help	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,33 ----
+ <?php
+ /*
+ folders.help
+ 
+ This is the help for the folders screen.
+ 
+ */
+ $help->add(
+ 	FOLDERS_HELP_SUBSCRIBE,
+ 	'Jegyzés',
+ 	'Ezzel elõjegyezhetsz egy IMAP mappát a távoli levelezõserveren.  Ez hasznos arra, hogy kategórizáld az üzeneteidet és tárold õket különbözõ mappákban.  Hogy ezt használni tudjad szükséged van egy server oldali alkalmazásra pl.: procmail vagy maildrop.  További információkért fordulj a levelezõserver adminisztrátorához.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_UNSUBSCRIBE,
+ 	'Lemondás',
+ 	'Ezzel lemondhatsz egy IMAP mappát a távoli levelezõserveren.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_CREATE,
+ 	'Létrehozás',
+ 	'Ezzel létrehozhatsz egy új IMAP mappát a távoli levelezõserveren.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_RENAME,
+ 	'Átnevezés',
+ 	'Ezzel átnevezhetsz egy már meglévõ IMAP mappát a távoli levelezõserveren.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_DELETE,
+ 	'Törlés',
+ 	'Ezzel törölhetsz egy már meglévõ IMAP mappát a távoli levelezõserveren.'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/folders.lang imp-2.2.0-pre5/locale/hu/folders.lang
*** imp-2.2.0-pre4/locale/hu/folders.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/folders.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,41 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->delete_folder_error = '<b>Hiba</b>: A mappa nem lett törölve';
+ $lang->unsub_folder_error = '<b>Hiba</b>: A mappa nem lett lemondva';
+ $lang->create_folder_error = '<b>Hiba</b>: Az új mappa nem lett létrehozva';
+ $lang->subscribe_folder_error = '<b>Hiba</b>: A mappa nem lett jegyezve';
+ $lang->rename_folder_error = '<b>Hiba</b>: A mappa nem lett átnevezve';
+ $lang->none_selected = '<b>Hiba</b>: Nincs kiválasztott mappa';
+ 
+ $lang->folders_title = 'Levél mappák';
+ $lang->confirm_delete = 'A mappa törlésénél a benne lévõ levelek is törlödnek.\nBiztos vagy, hogy ezt akarod?';
+ 
+ $lang->subscribe_label = 'Mappa jegyzés managelése';
+ $lang->rename_label = 'Mappa átnevezése';
+ $lang->delete_label = 'Mappa törlése';
+ $lang->create_label = 'Új mappa készítése';
+ $lang->unsub_label = 'Mappáról való lemondás';
+ 
+ $lang->available = 'Létezo mappák:';
+ $lang->selected = 'Kiválasztott mappák:';
+ $lang->add_caption = "Mappa hozzáadása";
+ $lang->remove_caption = "Mappa eltávolítása";
+ 
+ $lang->unsub = 'Lemondás';
+ $lang->subscribe = 'Jegyzés';
+ $lang->rename = 'Eredeti mappa:';
+ $lang->renameTo = 'Új neve:';
+ $lang->delete = 'Mappa neve:';
+ $lang->create = 'Mappa neve:';
+ 
+ $lang->unsub_button = ' Mappa lemondása ';
+ $lang->subscribe_button = ' Mappa jegyzése ';
+ $lang->rename_button = ' Mappa átnevezése ';
+ $lang->delete_button = ' Mappa törlése ';
+ $lang->create_button = ' Mappa létrehozása ';
+ 
+ // must start with at least five (5) hyphens (-)
+ $lang->select_spacer = '------------------------------';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/help.lang imp-2.2.0-pre5/locale/hu/help.lang
*** imp-2.2.0-pre4/locale/hu/help.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/help.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,4 ----
+ <?php
+ 
+ $help_title = 'Horde Súgó';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/horde.lang imp-2.2.0-pre5/locale/hu/horde.lang
*** imp-2.2.0-pre4/locale/hu/horde.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/horde.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,5 ----
+ <?php
+ 
+ $this->imp->selected_messages = 'Választott levél ebbe a mappába:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/ldap.result.lang imp-2.2.0-pre5/locale/hu/ldap.result.lang
*** imp-2.2.0-pre4/locale/hu/ldap.result.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/ldap.result.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,7 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->before_search = 'Ez az ablak fogja tartalmazni az LDAP keresés eredményét mihelyt végzek az LDAP kereséssel.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/ldap.search.lang imp-2.2.0-pre5/locale/hu/ldap.search.lang
*** imp-2.2.0-pre4/locale/hu/ldap.search.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/ldap.search.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,37 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->alert_no_compose = 'Gyözödj meg arról, hogy csak a beszurás funkciót használtad amikor elindítottad a címtárat a szerkesztõ ablakból.';
+ 
+ $lang->no_ldap_server = ' Nincs LDAP server jelezve.';
+ $lang->no_ldap_connection = ' Nem tudok kapcsolatot teremteni az LDAP Server-rel.';
+ $lang->no_ldap_bind = ' Nem tudok összeköttetést teremteni az LDAP server-rel.';
+ 
+ $lang->too_many_results = ' Túl sok eredmény.  Probáld szükíteni a keresési hatáskört.';
+ 
+ $lang->ldap_add = ' Hozzáadás ';
+ $lang->ldap_clear = ' Törlés ';
+ $lang->ldap_insert = ' Beszurás a Kinekhez: ';
+ $lang->ldap_insertcc = ' Beszurás a másolatot kapba: ';
+ $lang->ldap_insertbcc = ' Beszurás a titkos másolatot kapba: ';
+ $lang->ldap_insertaddr = ' Beszurás a címtárba ';
+ 
+ $lang->ldap_no_results = 'Nem találtam alkalmas bejegyzést.';
+ 
+ 
+ $lang->uid = 'UID';
+ $lang->mail = 'E-Mail cím';
+ $lang->sn = 'Surname';
+ $lang->givenname = 'Családi név';
+ $lang->ou = 'Szervezeti egység';
+ $lang->cn = ' Név';
+ $lang->begins = 'kezdõdik';
+ $lang->contains = 'tartalmaz';
+ $lang->ends = 'végzõdik';
+ $lang->is_strict = '';
+ $lang->is = '';
+ $lang->sounds = 'hangzik';
+ 
+ ?>
+ 
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/login.help imp-2.2.0-pre5/locale/hu/login.help
*** imp-2.2.0-pre4/locale/hu/login.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/login.help	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,34 ----
+ <?php
+ /*
+ login.help
+ 
+ This is the help for the login screen.
+ 
+ */
+ $help->add(
+ 	LOGIN_HELP_USERNAME,
+ 	'Felhasználónév',
+ 	'Felhasználónév vagy account név az ami azonosít a levelezõrendszer számára. (pl. laci)'
+ );
+ $help->add(
+ 	LOGIN_HELP_PASSWORD,
+ 	'Jelszó',
+ 	'Jelszó az egy titkos szó, ami védi felhasználónevedet.  Ne mond meg másnak a jelszavadat.  A jelszó nélkül nem tudsz hozzáférni a leveleidhez.'
+ );
+ $help->add(
+ 	LOGIN_HELP_SERVER,
+ 	'Server',
+ 	'Ez egy távoli IMAP server, ami tartalmazza a leveleidet.  A port (ha szükséges) az az internetes port amelyiken az imapd fut. (pl. 143)'
+ );
+ $help->add(
+ 	LOGIN_HELP_FOLDERS,
+ 	'Mappák',
+ 	'"Mappák" az ahol a levelesmappáid vannak a home könyvtáradban.  Ha a levelesmappáid a $HOME/Mail/ könyvtárban vannak, akkor elég annyit beírni, hogy Mail/. (emlékezz arra hogy a unix kis és nagybetûk között külömbséget tesz).'
+ );
+ $help->add(
+         LOGIN_HELP_LANGUAGE,
+         'Nyelv',
+         '"Nyelv" azt az alapértelmezett nyelvet használja a rendszer egész idõ alatt amit kiválasztottál.'
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/login.lang imp-2.2.0-pre5/locale/hu/login.lang
*** imp-2.2.0-pre4/locale/hu/login.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/login.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->welcome_to_imp		= 'Üdvözöllek az IMP -ben';
+ $lang->javascript_needed	= 'IMP használatához JavaScript támogatás szükséges.';
+ $lang->user_name		= 'Felhasználónév';
+ $lang->password			= 'Jelszó';
+ $lang->server			= 'Server';
+ $lang->server_port		= 'Port';
+ $lang->folders			= 'Mappák';
+ $lang->log_in			= 'Belépés';
+ $lang->language                 = 'Nyelv';
+ 
+ $lang->login = '';
+ $lang->timeout = 'Vagy rosszul léptél be vagy a felhasználóneved lejárt.  Probáld újra a belépést.';
+ $lang->logout = 'Kiléptél az IMP -bõl.  Köszönöm, hogy használtad a rendszert.  Ha újra be akarsz lépni használd az alábbi ürlapot.';
+ $lang->nocert = 'Szükséged van egy valós kliens igazolásra, hogy hozzáférj ehhez az oldalhoz.';
+ 
+ $lang->newuser_link = 'Bemutatás új felhasználónak';
+ $lang->alert_user_pass = 'Írd be a felhasználónevedet és a jelszavadat.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/mailbox.lang imp-2.2.0-pre5/locale/hu/mailbox.lang
*** imp-2.2.0-pre4/locale/hu/mailbox.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/mailbox.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,100 ----
+ <?php
+ 
+ class MailboxLocaleLang extends HordeLocaleLang {
+    
+    function MailboxLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function error ($current_mbox, $action) {
+       global $lang;
+       
+       $action_text = $lang->$action;
+       return "Levelesláda: $current_mbox: Hiba: Üzenet $action_text nem sikerült";
+    }
+    
+    function success1 ($current_mbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Üzenet';
+       else $messages = 'Üzenet';
+       
+       $action_text = $lang->$action;
+       return "Levelesláda: $current_mbox: $action_text $num $messages";
+    }
+    
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Üzenet';
+       else $messages = 'Üzenet';
+       
+       $action_text = $lang->$action;
+       return "Levelesláda: $current_mbox: $action_text $num $messages a(z) $targetMbox -ba,be";
+    }
+    
+    function pagenav ($page, $page_count) {
+       global $this_client;
+       if ($this_client == '') { $this_client = new WebClient; }
+ 
+       if ($this_client->lynx) {
+ 	 return "$page oldal a $page_count -ból,bõl";
+       } else {
+ 	 return "<input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> oldal a $page_count -ból,bõl";
+       }
+    }
+    
+    function overview ($begin, $end, $nummsgs) {
+        if ($nummsgs == 0) {
+ 	  return "0 Üzenet";
+        } elseif ($nummsgs == 1) {
+ 	  return "1 Üzenet";
+        } else {
+ 	  return "Üzenetek $begin - $end a $nummsgs -ból,bõl";
+        }
+    }
+    
+ }
+ 
+ 
+ $lang = new MailboxLocaleLang();
+ require('./locale/en/openwin.lang');
+ 
+ $lang->delete_link = 'Törlés';
+ $lang->undelete_link = 'Visszahoz';
+ $lang->move_link = 'Mozgatás';
+ $lang->copy_link = 'Másolás';
+ $lang->selected_mail = 'kijelölt levélre';
+ 
+ $lang->sort_by_label =  'Sorrend:';
+ $lang->date_label = 'Dátum';
+ $lang->from_label = 'Honnan';
+ $lang->subject_label = 'Tárgy';
+ $lang->size_label = 'Méret';
+ $lang->to_label = 'Kinek';
+ 
+ $lang->select_all = 'Összes jelölése';
+ $lang->select_none = 'Jelölések megszüntetése';
+ $lang->empty_trash = 'Kuka ürítése';
+ 
+ $lang->no_subject = '[Nincs tárgy]';
+ $lang->undisclosed_recipients = 'Ismeretlen átvevõ';
+ $lang->mailbox = 'Levelesláda';
+ 
+ $lang->message = 'Üzenet';
+ $lang->messages = 'Üzenetek';
+ 
+ $lang->deletion = 'Törlés';
+ $lang->deleted = 'Törölt';
+ $lang->undeletion = 'Visszahoz';
+ $lang->undeleted = 'Visszahozott';
+ $lang->move = 'Mozgás';
+ $lang->moved = 'Mozgatott';
+ $lang->copy = 'Másolás';
+ $lang->copied = 'Másolt';
+ $lang->expunge = 'Kitöröl';
+ $lang->expunged = 'Kitörölt';
+ 
+ $lang->reverse_sort = 'Sorrend megfordítása (újabb vagy legnagyobbtól a legrégebbig vagy legkisebb).';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/menu.lang imp-2.2.0-pre5/locale/hu/menu.lang
*** imp-2.2.0-pre4/locale/hu/menu.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/menu.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,22 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./locale/en/openwin.lang');
+ 
+ $lang->login_again = 'Lépj be újra';
+ $lang->contacts = 'Címtár';
+ $lang->login = 'Belépés';
+ $lang->check_inbox = 'Bejövõ levelesláda ellenõrzése';
+ $lang->compose = 'Levélírás';
+ $lang->folders = 'Mappák';
+ $lang->manage_files = 'File-ok managelése';
+ $lang->prefs = 'Beállítások';
+ $lang->view_log = 'Log megnézése';
+ $lang->logout = 'Kilépés';
+ $lang->faq = 'FAQ';
+ $lang->ldap_search = 'LDAP keresés';
+ $lang->problem = 'Probléma?';
+ $lang->signup = 'Bejelentkezés';
+ $lang->horde = 'Horde';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/message.lang imp-2.2.0-pre5/locale/hu/message.lang
*** imp-2.2.0-pre4/locale/hu/message.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/message.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,67 ----
+ <?php
+ 
+ class MessageLocaleLang extends HordeLocaleLang {
+    
+    function MessageLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function message_status ($current_mbox, $msg_index, $num) {
+       return "$current_mbox: $msg_index a $num -ból,bõl";
+    }
+    
+    function back_to ($current_mbox) {
+       return "Vissza a(z) $current_mbox -ba,be";
+    }
+ 
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Üzenet';
+       else $messages = 'Üzenet';
+       
+       $action_text = $lang->$action;
+       return "Levelesláda: $current_mbox: $action_text $num $messages a(z) $targetMbox -ba,be";
+    }
+ 
+ }
+ 
+ 
+ $lang = new MessageLocaleLang();
+ $lang->imp->selected_messages = 'Üzenet elhelyezése ide:';
+ require('./locale/en/openwin.lang');
+ 
+ $lang->move_link = 'Mozgatás';
+ $lang->copy_link = 'Másolás';
+ $lang->moved = 'Mozgatott';
+ $lang->copied = 'Másolt';
+ 
+ $lang->attachment = 'Csatolás';
+ $lang->source = '(forrás)';
+ $lang->no_subject = '[Nincs tárgy]';
+ 
+ $lang->date = 'Dátum';
+ $lang->to = 'Kinek';
+ $lang->from = 'Honnan';
+ $lang->cc = 'Másolatot kap';
+ $lang->bcc = 'Titkos másolatot kap';
+ $lang->replyto = 'Válaszás';
+ $lang->subject = 'Tárgy';
+ $lang->parts = 'Részek';
+ 
+ $lang->prev = 'Elözõ';
+ $lang->next = 'Következõ';
+ $lang->delete = 'Törlés';
+ $lang->reply = 'Válaszolás';
+ $lang->replyall = 'Válaszolás az összesre';
+ $lang->forward = 'Továbbítás';
+ $lang->bounce = 'Visszaküldés';
+ $lang->saveas = 'Mentés mint';
+ $lang->compose = 'Üzenet szerkesztése';
+ $lang->add_to_contacts = 'Hozzáadás a kapcsolatokhoz';
+ 
+ $lang->delete_error = '<tr><th colspan=2>Egy hiba történt; az üzeneted nem törlödött.</td></tr>';
+ $lang->copy_error = '<B>A másolás nem sikerült.</B>';
+ $lang->move_error = '<B>A mozgatás nem sikerült.</B>';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/newuser.entro.txt imp-2.2.0-pre5/locale/hu/newuser.entro.txt
*** imp-2.2.0-pre4/locale/hu/newuser.entro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/newuser.entro.txt	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Örömmel tölt el, hogy egy általános ismertetõt adtam, arról hogyan is müködik a web alapú levelezés.  Biztosan kényelmesebb lesz ezzel miután megnézted milyen könnyû és kényelmes levelet olvasni és küldeni és managelni az IMAP account-odat.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/newuser.intro.txt imp-2.2.0-pre5/locale/hu/newuser.intro.txt
*** imp-2.2.0-pre4/locale/hu/newuser.intro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/newuser.intro.txt	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Üdvözöllek az IMAP webMail Programban (IMP)!  Az IMP egyszerû felületén keresztül képes vagy hozzáférni és managelni az IMAP account-odat egy egyszerû web böngészõvel.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/newuser.lang imp-2.2.0-pre5/locale/hu/newuser.lang
*** imp-2.2.0-pre4/locale/hu/newuser.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/newuser.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,13 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->newuser_title = 'IMP Új felhasználó dokumentáció';
+ $lang->intro_title = 'Webmail bemutató';
+ 
+ $lang->header_intro = 'Bemutató';
+ $lang->header_start = 'Kezdjük el';
+ $lang->header_entro = 'Befejezés';
+ $lang->intro_return = 'Visszatérés a bejelentkezõ képernyõhöz';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/newuser.start.txt imp-2.2.0-pre5/locale/hu/newuser.start.txt
*** imp-2.2.0-pre4/locale/hu/newuser.start.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/newuser.start.txt	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,34 ----
+ <b>Belépés</b>
+ <p align="justify">
+ Az egész folyamat a bejelentkezõ képernyõvel kezdõdik.  Mielõtt valamelyik webmail lehetõséget használnál, csatlakoznod kell az IMAP account-oddal a felhasználónév és a jelszó segítségével, amit a rendszergazda adott neked.
+ </p>
+ <p align="justify">
+ Elõször üsd be a felhasználónevedet és a jelszavadat a megfelelõ mezõbe. Ezután válaszd az IMAP levélservert, amelyikhez csatlakozni akarsz.
+ </p>
+ <p align="justify">
+ Miután kitöltötted ezt a három mezõt kattints a belépés gombra.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Bejövõ levesláda</b>
+ <p align="justify">
+ Ez a mappa fog megjelenni miután beléptél. Bejövõ levesláda mutatja a levelek fejlécének tartalmát (üzenet állapota, küldés dátuma, küldõ, tárgy és méret).  Az oszlopoknap van fejlécük. A fejlécre kattintva tudod az adott oszlop szerint beállítani az üzenetek sorrendjét.
+ </p>
+ <p>
+ Az üzenet megtekintéséhez kattints az üzenet tárgyára.  Ekkor megjelenik az üzenetképernyõ.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Az üzenetképernyõ</b>
+ <p align=justify">
+ Az üzenetképernyõ tartalmazza a kiválasztott üzenetet.  Innen tallózni tudsz a csatolt file-ok között, válaszolni az adott levélre, törölni az adott levelet vagy megnézed a következõ levelet.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>A szerkesztõablak</b>
+ <p align="justify">
+ Levelet tudsz küldeni különbözõ helyre.  Választhatsz, hogy új üzenetet készítesz vagy már egy meglévõre válaszolsz. Valahányszor ezt a lehetõséget választod, akkor megnyilik egy szerkesztõablak.
+ </p>
+ <p align="justify">
+ A szerkesztõablak még sok lehetõséget enged meg: az üzenet címzettjének, tárgyának és tartalmának megadását teszi lehetõvé.  Egyszerüen töltsd ki a szükséges mezõket az ablak felsõ részén (csak a Kinek: cím kötelezõ, de a Tágy: nem) és írd be az üzenetedet az alul lévõ nagy mezõbe.  Miután befejezted az üzeneted beírását, választhatod a helyesírásellenõrzést. Miután befejezted az üzeneted szerkesztését kattints a Küldés gombra, hogy elküld az üzenetedet a címzetthez.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/openwin.lang imp-2.2.0-pre5/locale/hu/openwin.lang
*** imp-2.2.0-pre4/locale/hu/openwin.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/openwin.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,17 ----
+ <?php
+ 
+ /* You can customize your window sizes for each language here */
+ 
+ 
+ $lang->contact_ldap_width = '600';
+ $lang->contact_ldap_height = '525';
+ $lang->contact_ldap_noaddy_width = '600';
+ $lang->contact_ldap_noaddy_height = '250';
+ $lang->contact_width = '600';
+ $lang->contact_height = '330';
+ $lang->contact_add_width = '500';
+ $lang->contact_add_height = '200';
+ $lang->compose_height = '650';
+ $lang->compose_width = '630' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/prefs.lang imp-2.2.0-pre5/locale/hu/prefs.lang
*** imp-2.2.0-pre4/locale/hu/prefs.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/prefs.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,20 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->signature_error = '<tr><th>Egy hiba történt; az aláírás nincs frissítve.</th></tr>';
+ $lang->language_error = '<tr><th>Egy hiba történt; a nyelv nincs frissítve.</th></tr>';
+ $lang->from_error = '<tr><th>Egy hiba történt; a Honnan sor nincs frissítve.</th></tr>';
+ $lang->fullname_error = '<tr><th>Egy hiba történt; a teljes név nincs frissítve.</th></tr>';
+ 
+ $lang->save_button = ' Beállítások mentése ';
+ 
+ $lang->edit_from = 'Honnan sor szerkesztése';
+ $lang->edit_fullname = 'Teljes név szerkesztése';
+ $lang->edit_lang = 'Nyelv kiválasztása';
+ $lang->edit_sig = 'Aláírás szerkesztése';
+ 
+ $lang->prefs_title = 'IMP beállítások';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/select.lang imp-2.2.0-pre5/locale/hu/select.lang
*** imp-2.2.0-pre4/locale/hu/select.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/select.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,9 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ 
+ $lang->select_title = 'IMP mappa kiválasztása';
+ $lang->open_folder = 'Nyissa meg ezt a mappát:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/spelling.lang imp-2.2.0-pre5/locale/hu/spelling.lang
*** imp-2.2.0-pre4/locale/hu/spelling.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/spelling.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,10 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->spelling_title = 'Helyesírási javaslatok';
+ $lang->select_lang_for_ispell = 'Nyelv';
+ 
+ $lang->no_errors = 'Nincs helyesírási hiba.';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/hu/status.lang imp-2.2.0-pre5/locale/hu/status.lang
*** imp-2.2.0-pre4/locale/hu/status.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/hu/status.lang	Sun Sep  5 20:35:21 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ class StatusLocaleLang extends HordeLocaleLang {
+    
+    function StatusLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function mailbox_status ($message, $unread, $recent) {
+       return "$message&nbsp;&nbsp;|&nbsp;&nbsp;$unread olvasatlan, $recent újabb";
+    }
+    
+ }
+ 
+ 
+ $lang = new StatusLocaleLang();
+ 
+ 
+ $lang->status_title = 'Státusz sor';
+ $lang->newmail_msg = 'Levelet kaptál!';
+ $lang->login_msg = 'Üdvözöllek az IMP -ben. Lépj be.';
+ $lang->green = 'Minden jól van';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/compose.help imp-2.2.0-pre5/locale/is/compose.help
*** imp-2.2.0-pre4/locale/is/compose.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/compose.help	Wed Sep 15 22:30:16 1999
***************
*** 0 ****
--- 1,43 ----
+ <?php
+ /*
+ compose.help
+ 
+ This is the help for the compose screen.
+ 
+ */
+ $help->add(
+ 	COMPOSE_HELP_FROM,
+ 	'Frá: Svæðið',
+ 	'Tölvupóstfangið sem kemur fram í svæðinu Frá: hjá móttakanda.  Þetta ætti að vera þitt tölvupóstfang.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_TO,
+ 	'Til: Svæðið',
+ 	'Tölvupóstfangið(föngin) sem eiga að fá póstinn.  Hægt er að velja mörg tölvupóstföng. Eintak af póstinum mun verða sent til allra.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_CC,
+ 	'Cc: Svæðið',
+ 	'Þetta svæði tilgreinir hvaða tölvupóstföng umfram þau sem tilgreind eru í Til: svæðinu, eiga að fá póstinn.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_BCC,
+ 	'Bcc: Svæðið',
+ 	'Þetta svæði er samskonar og Cc: svæðið nema hvað móttakendur geta ekki séð hvaða tölvupóstföng eru tilgreind hér.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_SUBJECT,
+ 	'Efni: Svæðið',
+ 	'Þetta svæði tilgreinir efni pósts.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_ATTACH,
+ 	'Viðhengi',
+ 	'Þessi listi sýnir viðhengi þessa pósts. Til þess að bæta viðhengi við þennan póst skaltu velja "Browse:" takkann og síðan "Hengja við".'
+ );
+ $help->add(
+ 	COMPOSE_HELP_OPTIONS,
+ 	'Valmöguleikar',
+ 	'Auka valmöguleikar eru settir fram hér.'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/compose.lang imp-2.2.0-pre5/locale/is/compose.lang
*** imp-2.2.0-pre4/locale/is/compose.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/compose.lang	Wed Sep 15 22:30:16 1999
***************
*** 0 ****
--- 1,79 ----
+ <?php
+ 
+ class ComposeLocaleLang extends HordeLocaleLang {
+    
+    function ComposeLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function forwarded_from ($message_source) {
+       return "----- Áframsend skilaboð frá $message_source -----";
+    }
+    
+ }
+ 
+ 
+ $lang = new ComposeLocaleLang();
+ require('./config/lang.php3');
+ require('./locale/is/openwin.lang');
+ /* plain strings */
+ 
+ $lang->action_send = 'Senda póst';
+ $lang->action_postpone = 'Fresta';
+ $lang->action_reply = 'Svara:';
+ $lang->action_reply_all = 'Svara öllum:';
+ $lang->action_forward = 'Áframsenda:';
+ $lang->action_add_attach = 'Skrifa póst: Viðhengi bætt við...';
+ $lang->action_del_attach = 'Skrifa póst: Viðhengi eytt...';
+ $lang->action_compose = 'Skrifa póst';
+ $lang->action_bounce = 'Boppa skilaboðum';
+ 
+ $lang->quoting_string = 'Tilvitnun';
+ $lang->date_string = 'Dags';
+ $lang->from_string = 'Frá';
+ $lang->reply_to_string = 'Svara til';
+ $lang->subject_string = 'Efni';
+ $lang->to_string = 'Til';
+ $lang->cc_string = 'Cc';
+ $lang->bcc_string= 'Bcc';
+ $lang->attach_string = 'Viðhengi';
+ $lang->attach_string_plural = 'Viðhengi';
+ 
+ $lang->file_name = 'Nafn skrár';
+ $lang->file_size = 'Stærð skrár';
+ $lang->total_size = 'Heildar stærð';
+ $lang->options = 'Valmöguleikar';
+ $lang->sign_message = 'Digitally Sign Message?';
+ 
+ $lang->button_attach = 'Hengja við';
+ $lang->button_cancel = 'Hætta við';
+ $lang->button_delete_attach = 'Eyða viðhengi';
+ $lang->button_spellcheck = 'Athuga stafsetningu';
+ $lang->spell_in=' á';
+ $lang->button_postpone = 'Fresta';
+ $lang->button_send = 'Senda póst';
+ $lang->button_bounce = 'Boppa pósti';
+ 
+ $lang->fwd_string = 'Fwd:';
+ $lang->forward_end_string = 'Áframsent skilaboð endar';
+ 
+ $lang->alert_specify_file = 'Þú verður að velja viðhengi til þess að hengja við.';
+ $lang->alert_select_attach_delete = 'Þú verður að velja viðhengi til að eyða.';
+ $lang->alert_need_text = 'Þú verður að skrifa texta áður en þú getur sent póst.';
+ $lang->alert_no_signing_support = 'Signing is only supported in Netscape v4.03+';
+ 
+ $lang->sig_valid_error = "<h2><font color=red>Signature validation Failed. </font> Message <u>NOT</u> Sent!<h2>";
+ $lang->status_bounce_success = 'Bréfi boppað.';
+ $lang->status_send_success = 'Bréf sent.';
+ $lang->status_send_save_error = 'Bréf sent, VILLA: náði ekki að vista í';
+ $lang->status_error_fequired_field = 'Eitt eða fleiri svæði sem þurfa að vera útfyllt eru tóm.';
+ $lang->status_postpone_error = 'Villa: Frestun mistókst';
+ $lang->status_message_postponed = 'Sendingu frestað';
+ $lang->status_composition = 'Skrifa póst';
+ 
+ $lang->contacts = 'Tengiliðir';
+ 
+ $lang->alert_attach_file = 'Ýttu á \'Hengja við\' til þess að senda þessa skrá sem viðhengi';
+ $lang->alert_need_recipient = 'Þú verður að velja móttakanda.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/contacts.lang imp-2.2.0-pre5/locale/is/contacts.lang
*** imp-2.2.0-pre4/locale/is/contacts.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/contacts.lang	Wed Sep 15 22:30:17 1999
***************
*** 0 ****
--- 1,81 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ /* plain strings */
+ 
+ $lang->error_delete_address = '<tr><th>Villa; tengilið var ekki eytt.</th></tr>';
+ $lang->error_address_chars = '<tr><th>Þú notaðir óleyfilegt tákn í tölvupóstfanginu. Því hefur verið bætt við án táknsins. Þú skalt breyta því ef það er ekki rétt.</th></tr>';
+ $lang->error_nickname_chars = '<tr><th>Þú notaðir óleyfilegt tákn í gælunafni. Því hefur verið bætt við án táknsins. Þú skalt breyta því ef það er ekki rétt.</th></tr>';
+ $lang->error_fullname_chars = '<tr><th>Þú notaðir óleyfilegt tákn í nafni. Því hefur verið bætt við án táknsins. Þú skalt breyta því ef það er ekki rétt.</th></tr>';
+ $lang->error_create_address = '<tr><th>Villa; engu hefur verið bætt við.</th></tr>';
+ $lang->error_update_address = '<tr><th>Villa; engu var breytt.</th></tr>';
+ 
+ $lang->addressbook_title = 'Tengiliðir';
+ $lang->address_string = 'Netfang';
+ $lang->nickname_string = 'Gælunafn';
+ $lang->fullname_string = 'Fullt nafn';
+ $lang->new_address_string = 'Nýtt netfang';
+ $lang->new_nickname_string = 'Nýtt gælunafn';
+ $lang->new_fullname_string = 'Nýtt fullt nafn';
+ $lang->delete_string = 'Eyða';
+ $lang->change_string = 'Breyta þessum tengilið';
+ 
+ $lang->insert_into_to = ' Bæta við í Til: ';
+ $lang->insert_into_cc = ' Bæta við í Cc: ';
+ $lang->insert_into_bcc = ' Bæta við í Bcc: ';
+ $lang->close_window = ' Loka glugga ';
+ $lang->before_search = 'Niðurstöður LDAP leitar munu koma fram hér.';
+ 
+ $lang->action_add_address = 'Bæta tengilið við';
+ $lang->action_update_address = 'Uppfæra tengilið';
+ $lang->action_delete_address = 'Eyða tengilið';
+ $lang->action_insert_address = 'Bæta við í bréf';
+ 
+ $lang->button_add_address = 'Bæta netfangi við';
+ $lang->button_update_address = 'Uppfæra tengilið';
+ $lang->button_delete_address = 'Eyða tengilið';
+ $lang->button_insert_address = 'Setja tengilið inn';
+ 
+ $lang->alert_no_compose = 'Athugaðu að eingöngu er hægt að nota "Bæta við" þegar "Tengiliðir" er valið úr þessum glugga.';
+ 
+ $lang->no_ldap_server = 'Það er enginn LDAP þjónn skilgreindur.';
+ $lang->no_ldap_connection = 'Næ ekki tengingu við LDAP þjóninn.';
+ $lang->no_ldap_bind = 'Get ekki tengst LDAP þjóni.';
+ 
+ $lang->too_many_results = 'Því miður er niðurstaðan of stór, reyndu að þrengja leitarsviðið aðeins.';
+ 
+ $lang->ldap_add = ' Bæta inn ';
+ $lang->ldap_clear = ' Hreinsa ';
+ $lang->ldap_insertaddr = ' Bæta við í Tengiliði ';
+ 
+ $lang->ldap_no_results = 'Ekkert fannst.';
+ 
+ $lang->search = 'Search the ';
+ $lang->directory = 'directory';
+ $lang->where = 'where the';
+ $lang->uid = 'UID';
+ $lang->mail = 'E-Mail Address';
+ $lang->sn = 'Surname';
+ $lang->givenname = 'First Name';
+ $lang->ou = 'Organizational Unit';
+ $lang->cn = 'Name';
+ $lang->begins = 'begins with';
+ $lang->contains = 'contains';
+ $lang->ends = 'ends with';
+ $lang->is_strict = 'is (strict)';
+ $lang->is = 'is';
+ $lang->sounds = 'sounds like';
+ $lang->submit_button = ' Hefja leit ';
+ 
+ $lang->add_contact = ' Bæta tengilið við ';
+ $lang->del_contact = ' Eyða tengilið ';
+ $lang->update_contact = ' Uppfæra tengilið ';
+ $lang->contacts = 'Tengiliðir';
+ $lang->ldapsearch = 'LDAP leit';
+ $lang->ldapresults = 'Niðurstöður LDAP';
+ $lang->select = 'Velja ';
+ $lang->add_to_contacts = 'Bæta við tengiliði';
+ $lang->submit = 'Staðfesta' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/folders.help imp-2.2.0-pre5/locale/is/folders.help
*** imp-2.2.0-pre4/locale/is/folders.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/folders.help	Wed Sep 15 22:30:17 1999
***************
*** 0 ****
--- 1,33 ----
+ <?php
+ /*
+ folders.help
+ 
+ This is the help for the folders screen.
+ 
+ */
+ $help->add(
+ 	FOLDERS_HELP_SUBSCRIBE,
+ 	'Áskrift',
+ 	'Þessi valmöguleiki gefur þér kost á að gerast áskrifandi að IMAP möppu á póstþjón. Þetta er gagnlegt við flokkun pósts eftir innihaldi og geymslu í mismunandi möppum. Til þess að gera þetta getur þú notað tól á póstþjóninum eins og procmail eða maildrop. Vinsamlegast leitaðu frekari upplýsinga um flokkun pósts hjá kerfisstjóranum þínum.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_UNSUBSCRIBE,
+ 	'Taka úr áskrift',
+ 	'Þessi valmöguleiki leyfir þér að taka IMAP möppu úr áskrift á póstþjón.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_CREATE,
+ 	'Búa til',
+ 	'Þessi valmöguleiki leyfir þér að búa til nýja IMAP möppu á póstþjón.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_RENAME,
+ 	'Endurskíra',
+ 	'Þessi valmöguleiki leyfir þér að endurskíra IMAP möppu sem er til fyrir á póstþjón.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_DELETE,
+ 	'Eyða',
+ 	'Þessi valmöguleiki leyfir þér að eyða IMAP möppu sem til er fyrir á póstþjón.'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/folders.lang imp-2.2.0-pre5/locale/is/folders.lang
*** imp-2.2.0-pre4/locale/is/folders.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/folders.lang	Wed Sep 15 22:30:18 1999
***************
*** 0 ****
--- 1,41 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->delete_folder_error = '<b>Villa</b>: möppunni var ekki eytt';
+ $lang->unsub_folder_error = '<b>Villa</b>: ekki var hætt við áskrift';
+ $lang->create_folder_error = '<b>Villa</b>: nýja mappan var ekki búin til';
+ $lang->subscribe_folder_error = '<b>Villa</b>: mappan var ekki sett í áskrift';
+ $lang->rename_folder_error = '<b>Villa</b>: mappan var ekki endurskírð';
+ $lang->none_selected = '<b>Villa</b>: engin mappa var valin';
+ 
+ $lang->folders_title = 'Póstmöppur';
+ $lang->confirm_delete = 'Með því að eyða möppu eyðir þú einnig öllum pósti í möppunni.\nErtu alveg viss um að þetta sé það sem þú vilt?';
+ 
+ $lang->subscribe_label = 'Stýra áskrift á möppum';
+ $lang->rename_label = 'Endurskíra möppu';
+ $lang->delete_label = 'Eyða möppu';
+ $lang->create_label = 'Búa til nýja möppu';
+ $lang->unsub_label = 'Taka möppu úr áskrift';
+ 
+ $lang->available = 'Mögulegar möppur';
+ $lang->selected = 'Valdar möppur:';
+ $lang->add_caption = "Bæta möppu við";
+ $lang->remove_caption = "Eyða möppu";
+ 
+ $lang->unsub = 'Taka úr áskrift';
+ $lang->subscribe = 'Setja í áskrift';
+ $lang->rename = 'Mappa:';
+ $lang->renameTo = 'Nýtt nafn:';
+ $lang->delete = 'Nafn möppu:';
+ $lang->create = 'Nafn möppu:';
+ 
+ $lang->unsub_button = ' Taka úr áskrift ';
+ $lang->subscribe_button = ' Setja í áskrift ';
+ $lang->rename_button = ' Endurskíra ';
+ $lang->delete_button = ' Eyða ';
+ $lang->create_button = ' Búa til ';
+ 
+ // must start with at least five (5) hyphens (-)
+ $lang->select_spacer = '------------------------------';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/help.lang imp-2.2.0-pre5/locale/is/help.lang
*** imp-2.2.0-pre4/locale/is/help.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/help.lang	Wed Sep 15 22:30:18 1999
***************
*** 0 ****
--- 1,4 ----
+ <?php
+ 
+ $help_title = 'Hjálp';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/horde.lang imp-2.2.0-pre5/locale/is/horde.lang
*** imp-2.2.0-pre4/locale/is/horde.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/horde.lang	Wed Sep 15 22:30:19 1999
***************
*** 0 ****
--- 1,5 ----
+ <?php
+ 
+ $this->imp->selected_messages = 'valin skilaboð í:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/ldap.result.lang imp-2.2.0-pre5/locale/is/ldap.result.lang
*** imp-2.2.0-pre4/locale/is/ldap.result.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/ldap.result.lang	Wed Sep 15 22:30:20 1999
***************
*** 0 ****
--- 1,7 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->before_search = 'This window will contain the LDAP search results as soon as you perform an LDAP search.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/ldap.search.lang imp-2.2.0-pre5/locale/is/ldap.search.lang
*** imp-2.2.0-pre4/locale/is/ldap.search.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/ldap.search.lang	Wed Sep 15 22:30:20 1999
***************
*** 0 ****
--- 1,36 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->alert_no_compose = 'Please note that you can only use the "Insert" function when you are in the Compose Window.';
+ 
+ $lang->no_ldap_server = 'There was no LDAP server specified.';
+ $lang->no_ldap_connection = 'Couldn\'t establish connection to LDAP Server.';
+ $lang->no_ldap_bind = 'Couldn\'t bind to LDAP server.';
+ 
+ $lang->too_many_results = 'Sorry, too many results.  Please try to narrow the search scope.';
+ 
+ $lang->ldap_add = ' Add ';
+ $lang->ldap_clear = ' Clear ';
+ $lang->ldap_insert = ' Insert into To: ';
+ $lang->ldap_insertcc = ' Insert into Cc: ';
+ $lang->ldap_insertbcc = ' Insert into Bcc: ';
+ $lang->ldap_insertaddr = ' Insert into Contacts ';
+ 
+ $lang->ldap_no_results = 'No appropriate entries found.';
+ 
+ 
+ $lang->uid = 'UID';
+ $lang->mail = 'E-Mail Address';
+ $lang->sn = 'Surname';
+ $lang->givenname = 'First Name';
+ $lang->ou = 'Organizational Unit';
+ $lang->cn = 'Name';
+ $lang->begins = 'begins with';
+ $lang->contains = 'contains';
+ $lang->ends = 'ends with';
+ $lang->is_strict = 'is (strict)';
+ $lang->is = 'is';
+ $lang->sounds = 'sounds like';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/login.help imp-2.2.0-pre5/locale/is/login.help
*** imp-2.2.0-pre4/locale/is/login.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/login.help	Wed Sep 15 22:30:21 1999
***************
*** 0 ****
--- 1,34 ----
+ <?php
+ /*
+ login.help
+ 
+ This is the help for the login screen.
+ 
+ */
+ $help->add(
+ 	LOGIN_HELP_USERNAME,
+ 	'Notandanafn',
+ 	'Þetta er notandanafnið þitt sem póstþjónninn nota til þess að auðkenna þig.'
+ );
+ $help->add(
+ 	LOGIN_HELP_PASSWORD,
+ 	'Lykilorð',
+ 	'Þetta er leyniorðið þitt sem læsir reikningnum þínum. Þú mátt ekki gefa neinum það upp. Þú getur ekki nálgast póstinn þinn án þess.'
+ );
+ $help->add(
+ 	LOGIN_HELP_SERVER,
+ 	'Þjónn',
+ 	'Þetta er IMAP þjónn sem geymir póstinn þinn. Gátt er sú gátt sem imapd púkinn hlustar á.'
+ );
+ $help->add(
+ 	LOGIN_HELP_FOLDERS,
+ 	'Mappa',
+ 	'"Mappa" er sú mappa þar sem póstmappan er hýst miðað við heimasvæðið þitt. Ef póstmappan þín er í $HOME/Mail, þá þarf einungis að velja Mail/. Mundu að í UNIX skiptir máli hvort þú skrifar stórann eða lítinn staf.'
+ );
+ $help->add(
+         LOGIN_HELP_LANGUAGE,
+         'Tungumál',
+         '"Tungumál" er það tungumál sem þú vilt að sé notað.'
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/login.lang imp-2.2.0-pre5/locale/is/login.lang
*** imp-2.2.0-pre4/locale/is/login.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/login.lang	Wed Sep 15 22:30:21 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->welcome_to_imp		= 'Velkomin(n) í IMP';
+ $lang->javascript_needed	= 'IMP þarf JavaScript til þess að framkvæma ákveðin köll.';
+ $lang->user_name		= 'Notandi';
+ $lang->password			= 'Lykilorð';
+ $lang->server			= 'Þjónn';
+ $lang->server_port		= 'Gátt';
+ $lang->folders			= 'Mappa';
+ $lang->log_in			= 'Innskráning';
+ $lang->language                 = 'Tungumál';
+ 
+ $lang->login = '';
+ $lang->timeout = 'Annað hvort hefur þú slegið vitlaust inn eða skráning er útrunnin. Vinsamlegast reynið að nýju.';
+ $lang->logout = 'Þú ert nú búinn að skrá þig út úr IMP.  Þakka þér fyrir að nota kerfið.  Ef þú vilt skrá þig inn að nýju skaltu nota svæðin hér að neðan.';
+ $lang->nocert = 'Þú þarf gilt notandaleyfi til þess að nota þessa þjónustu.';
+ 
+ $lang->newuser_link = 'Kynning fyrir nýjann notanda';
+ $lang->alert_user_pass = 'Vinsamlegast veljið notandanafn og lykilorð.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/mailbox.lang imp-2.2.0-pre5/locale/is/mailbox.lang
*** imp-2.2.0-pre4/locale/is/mailbox.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/mailbox.lang	Wed Sep 15 22:30:22 1999
***************
*** 0 ****
--- 1,100 ----
+ <?php
+ 
+ class MailboxLocaleLang extends HordeLocaleLang {
+    
+    function MailboxLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function error ($current_mbox, $action) {
+       global $lang;
+       
+       $action_text = $lang->$action;
+       return "Pósthólf: $current_mbox: Villa: $action_text skilaboða mistókst";
+    }
+    
+    function success1 ($current_mbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Skilaboð';
+       else $messages = 'Skilaboð';
+       
+       $action_text = $lang->$action;
+       return "Pósthólf: $current_mbox: $action_text $num $messages";
+    }
+    
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Skilaboð';
+       else $messages = 'Skilaboð';
+       
+       $action_text = $lang->$action;
+       return "Pósthólf: $current_mbox: $action_text $num $messages to $targetMbox";
+    }
+    
+    function pagenav ($page, $page_count) {
+       global $this_client;
+       if ($this_client == '') { $this_client = new WebClient; }
+ 
+       if ($this_client->lynx) {
+ 	 return "Síða $page of $page_count";
+       } else {
+ 	 return "síða <input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> af $page_count";
+       }
+    }
+    
+    function overview ($begin, $end, $nummsgs) {
+        if ($nummsgs == 0) {
+ 	  return "0 Skilaboð";
+        } elseif ($nummsgs == 1) {
+ 	  return "1 Skilaboð";
+        } else {
+ 	  return "$begin - $end af $nummsgs Skilaboðum";
+        }
+    }
+    
+ }
+ 
+ 
+ $lang = new MailboxLocaleLang();
+ require('./locale/is/openwin.lang');
+ 
+ $lang->delete_link = 'Eyða';
+ $lang->undelete_link = 'Endurheimta';
+ $lang->move_link = 'Færa';
+ $lang->copy_link = 'Afrita';
+ $lang->selected_mail = 'valin skilaboð';
+ 
+ $lang->sort_by_label =  'Raða eftir';
+ $lang->date_label = 'Dags';
+ $lang->from_label = 'Frá';
+ $lang->subject_label = 'Efni';
+ $lang->size_label = 'Stærð';
+ $lang->to_label = 'Til';
+ 
+ $lang->select_all = 'Velja öll';
+ $lang->select_none = 'Velja ekkert';
+ $lang->empty_trash = 'Tæma rusl';
+ 
+ $lang->no_subject = '[No subject]';
+ $lang->undisclosed_recipients = 'Undisclosed Recipients';
+ $lang->mailbox = 'Pósthólf';
+ 
+ $lang->message = 'Skilaboð';
+ $lang->messages = 'Skilaboð';
+ 
+ $lang->deletion = 'Eyðing';
+ $lang->deleted = 'Eytt';
+ $lang->undeletion = 'Endurheimtun';
+ $lang->undeleted = 'Endurheimt';
+ $lang->move = 'Færa';
+ $lang->moved = 'Fært';
+ $lang->copy = 'Afrita';
+ $lang->copied = 'Afritað';
+ $lang->expunge = 'Expunge';
+ $lang->expunged = 'Expunged';
+ 
+ $lang->reverse_sort = 'Snúa við röð.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/menu.lang imp-2.2.0-pre5/locale/is/menu.lang
*** imp-2.2.0-pre4/locale/is/menu.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/menu.lang	Wed Sep 15 22:30:23 1999
***************
*** 0 ****
--- 1,22 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./locale/is/openwin.lang');
+ 
+ $lang->login_again = 'Vinsamlegast reynið aftur';
+ $lang->contacts = 'Tengiliðir';
+ $lang->login = 'Innskráning';
+ $lang->check_inbox = 'Athuga innhólf';
+ $lang->compose = 'Skrifa póst';
+ $lang->folders = 'Möppur';
+ $lang->manage_files = 'Halda utan um skrár';
+ $lang->prefs = 'Stillingar';
+ $lang->view_log = 'Skoða færslur';
+ $lang->logout = 'Útskráning';
+ $lang->faq = 'FAQ';
+ $lang->ldap_search = 'LDAP leit';
+ $lang->problem = 'Vandamál?';
+ $lang->signup = 'Skráning';
+ $lang->horde = 'Horde';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/message.lang imp-2.2.0-pre5/locale/is/message.lang
*** imp-2.2.0-pre4/locale/is/message.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/message.lang	Wed Sep 15 22:30:23 1999
***************
*** 0 ****
--- 1,66 ----
+ <?php
+ 
+ class MessageLocaleLang extends HordeLocaleLang {
+    
+    function MessageLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function message_status ($current_mbox, $msg_index, $num) {
+       return "$current_mbox: $msg_index of $num";
+    }
+    
+    function back_to ($current_mbox) {
+       return "Aftur í $current_mbox";
+    }
+ 
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Skilaboð';
+       else $messages = 'Skilaboð';
+       
+       $action_text = $lang->$action;
+       return "Pósthólf: $current_mbox: $action_text $num $messages til $targetMbox";
+    }
+ 
+ }
+ 
+ 
+ $lang = new MessageLocaleLang();
+ $lang->imp->selected_messages = 'þessi skilaboð í:';
+ require('./locale/is/openwin.lang');
+ 
+ $lang->move_link = 'Færa';
+ $lang->copy_link = 'Afrita';
+ $lang->moved = 'Fært';
+ $lang->copied = 'Afritað';
+ 
+ $lang->attachment = 'viðhengi';
+ $lang->source = '(source)';
+ $lang->no_subject = '[No subject]';
+ 
+ $lang->date = 'Dags';
+ $lang->to = 'Til';
+ $lang->from = 'Frá';
+ $lang->cc = 'Cc';
+ $lang->replyto = 'Svara til';
+ $lang->subject = 'Efni';
+ $lang->parts = 'Hlutar';
+ 
+ $lang->prev = 'Fyrra';
+ $lang->next = 'Næsta';
+ $lang->delete = 'Eyða';
+ $lang->reply = 'Svara';
+ $lang->replyall = 'Svara til allra';
+ $lang->forward = 'Áframsenda';
+ $lang->bounce = 'Skoppa';
+ $lang->saveas = 'Vista sem';
+ $lang->compose = 'Semja skilboð';
+ $lang->add_to_contacts = 'Bæta við tengilið';
+ 
+ $lang->delete_error = '<tr><th colspan=2>An error occured; your message has not been deleted.</td></tr>';
+ $lang->copy_error = '<B>Copy Failed.</B>';
+ $lang->move_error = '<B>Move Failed.</B>';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/newuser.entro.txt imp-2.2.0-pre5/locale/is/newuser.entro.txt
*** imp-2.2.0-pre4/locale/is/newuser.entro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/newuser.entro.txt	Wed Sep 15 22:30:24 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Vonandi hefur þú nú fengið almenna yfirsýn yfir það hvernig vefpóstur virkar. Þér mun örugglega líka betur og betur við hann eftir að sjá hversu einfalt og þægilegt er lesa og skrifa póst með honum. Einnig er vefpóstur tilvalinn í að stýra IMAP póstreikningnum þínum.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/newuser.intro.txt imp-2.2.0-pre5/locale/is/newuser.intro.txt
*** imp-2.2.0-pre4/locale/is/newuser.intro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/newuser.intro.txt	Wed Sep 15 22:30:24 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Velkomin(n) í IMP vefpóstforritið! Með IMP hefur þú aðgang og getur stjórnað IMAP póstreikningnum þínum. Þetta getur þú gert í gegnum hið einfalda útlit vefráparans þíns.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/newuser.lang imp-2.2.0-pre5/locale/is/newuser.lang
*** imp-2.2.0-pre4/locale/is/newuser.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/newuser.lang	Wed Sep 15 22:30:25 1999
***************
*** 0 ****
--- 1,13 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->newuser_title = 'IMP hjálp fyrir nýja notendur';
+ $lang->intro_title = 'Kynning á vefpóst';
+ 
+ $lang->header_intro = 'Kynning';
+ $lang->header_start = 'Að koma sér af stað';
+ $lang->header_entro = 'Lokaorð';
+ $lang->intro_return = 'Aftur í innskráningu';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/newuser.start.txt imp-2.2.0-pre5/locale/is/newuser.start.txt
*** imp-2.2.0-pre4/locale/is/newuser.start.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/newuser.start.txt	Wed Sep 15 22:30:26 1999
***************
*** 0 ****
--- 1,36 ----
+ <b>Innskráning</b>
+ <p align="justify">
+ Þú byrjar alltaf á því að skrá þig inn. Áður en þú getur notað vefpóstinn verður þú að tengjast póstþjóni með notandanafni og lykilorði. Þetta er það notandanafn og lykilorð sem þú hefur á póstþjóninum.
+ </p>
+ <p align="justify">
+ Byrjaðu á því að slá inn notandanafn og lykilorð í viðeigandi svæði.
+ <!-- Tekið út
+ You'll then need to select the IMAP mail server to which you'd like to connect.-->
+ </p>
+ <p align="justify">
+ Því næst skaltu velja "Innskráning" hnappin til þess að halda áfram.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Listun innhólfs</b>
+ <p align="justify">
+ Innihald innhólfsins þíns birtist um leið og þú hefur skráð þig inn. Þú sérð lista yfir póst í innhólfinu, þ.e. haus hvers pósts fyrir sig. Í hausnum má finna upplýsingar um stöðu pósts, dagsetningu, sendanda, efni og stærð. Hver þessara dálka hefur haus sem hægt er að raða eftir með því að smella á hausinn.
+ </p>
+ <p>
+ Til þess að skoða innihald ákveðins pósts skaltu smella á efni póstsins. Þá ferðu í aðra mynd.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Póstvalmyndin</b>
+ <p align=justify">
+ Póstvalmyndin sýnir innihald valins pósts. Héðan getur þú skoðað viðhengi póstsins, svarað póstinum, eytt honum eða farið í þann næsta í pósthólfinu.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Skrifa póst</b>
+ <p align="justify">
+ Þú getur sent póst á marga vegu. Þú getur valið um að skrifa nýjann póst eða jafnvel að svara pósti sem þú hefur fengið. Hvora aðferðina sem þú velur ferðu alltaf í "Skrifa póst" valmyndina.
+ </p>
+ <p align="justify">
+ "Skrifa póst" valmyndin leyfir þér meðal annars að setja tölvupóstfang viðtakanda, efni póstsins og innihaldið. Þú fyllir einfaldlega út viðeigandi svæði og skrifar stóra svæðið neðst. Þegar þú hefur skrifað það sem þú ætlar að skrifa ýtir þú á "Senda póst" til þess að senda viðtakanda póstinn.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/openwin.lang imp-2.2.0-pre5/locale/is/openwin.lang
*** imp-2.2.0-pre4/locale/is/openwin.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/openwin.lang	Wed Sep 15 22:30:28 1999
***************
*** 0 ****
--- 1,17 ----
+ <?php
+ 
+ /* You can customize your window sizes for each language here */
+ 
+ 
+ $lang->contact_ldap_width = '600';
+ $lang->contact_ldap_height = '525';
+ $lang->contact_ldap_noaddy_width = '600';
+ $lang->contact_ldap_noaddy_height = '250';
+ $lang->contact_width = '600';
+ $lang->contact_height = '330';
+ $lang->contact_add_width = '500';
+ $lang->contact_add_height = '200';
+ $lang->compose_height = '650';
+ $lang->compose_width = '630' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/prefs.lang imp-2.2.0-pre5/locale/is/prefs.lang
*** imp-2.2.0-pre4/locale/is/prefs.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/prefs.lang	Wed Sep 15 22:30:31 1999
***************
*** 0 ****
--- 1,20 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->signature_error = '<tr><th>Villa; undirskriftin þín var ekki uppfærð.</th></tr>';
+ $lang->language_error = '<tr><th>Villa; tungumál var ekki uppfært.</th></tr>';
+ $lang->from_error = '<tr><th>Villa; Frá svæðið var ekki uppfært.</th></tr>';
+ $lang->fullname_error = '<tr><th>Villa; nafni var ekki breytt.</th></tr>';
+ 
+ $lang->save_button = ' Vista stillingar ';
+ 
+ $lang->edit_from = 'Breyta \'Frá:\' línunni';
+ $lang->edit_fullname = 'Breyta nafni';
+ $lang->edit_lang = 'Velja tungumál';
+ $lang->edit_sig = 'Undirskrift';
+ 
+ $lang->prefs_title = 'IMP stillingar';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/select.lang imp-2.2.0-pre5/locale/is/select.lang
*** imp-2.2.0-pre4/locale/is/select.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/select.lang	Wed Sep 15 22:30:32 1999
***************
*** 0 ****
--- 1,9 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ 
+ $lang->select_title = 'Val á IMP möppu';
+ $lang->open_folder = 'Opna þessa möppu:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/spelling.lang imp-2.2.0-pre5/locale/is/spelling.lang
*** imp-2.2.0-pre4/locale/is/spelling.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/spelling.lang	Wed Sep 15 22:30:33 1999
***************
*** 0 ****
--- 1,10 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->spelling_title = 'Tillögur að breytingum';
+ $lang->select_lang_for_ispell = 'Tungumál';
+ 
+ $lang->no_errors = 'Engar stafsetningavillur.';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/is/status.lang imp-2.2.0-pre5/locale/is/status.lang
*** imp-2.2.0-pre4/locale/is/status.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/is/status.lang	Wed Sep 15 22:30:35 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ class StatusLocaleLang extends HordeLocaleLang {
+    
+    function StatusLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function mailbox_status ($message, $unread, $recent) {
+       return "$message&nbsp;&nbsp;|&nbsp&nbsp;$unread nýtt, $recent nýlegt";
+    }
+    
+ }
+ 
+ 
+ $lang = new StatusLocaleLang();
+ 
+ 
+ $lang->status_title = 'Staða';
+ $lang->newmail_msg = 'Þú átt póst!';
+ $lang->login_msg = 'Velkomin(n) Í IMP. Vinsamlegast skráðu þig inn.';
+ $lang->green = 'Allt er í lagi';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/it/mailbox.lang imp-2.2.0-pre5/locale/it/mailbox.lang
*** imp-2.2.0-pre4/locale/it/mailbox.lang	Thu May 20 00:39:23 1999
--- imp-2.2.0-pre5/locale/it/mailbox.lang	Sat Aug 28 10:28:04 1999
***************
*** 76,79 ****
--- 76,81 ----
  $lang->select_all = '[Seleziona tutto]';
  $lang->select_none = '[Annulla Selezione]';
+ $lang->hide_deleted = '[Nascondi i messaggi cancellati]';
+ $lang->show_deleted = '[Mostra i messaggi cancellati]';
  $lang->empty_trash = '[Elimina i messaggi cancellati]';
  
diff -r -N -C 2 imp-2.2.0-pre4/locale/it/menu.lang imp-2.2.0-pre5/locale/it/menu.lang
*** imp-2.2.0-pre4/locale/it/menu.lang	Tue May 18 20:49:31 1999
--- imp-2.2.0-pre5/locale/it/menu.lang	Sat Aug 28 04:49:46 1999
***************
*** 7,11 ****
  $lang->contacts = 'Rubrica';
  $lang->login = 'Login';
! $lang->check_inbox = 'INBOX';
  $lang->compose = 'Componi';
  $lang->folders = 'Cartelle';
--- 7,11 ----
  $lang->contacts = 'Rubrica';
  $lang->login = 'Login';
! $lang->inbox = 'INBOX';
  $lang->compose = 'Componi';
  $lang->folders = 'Cartelle';
diff -r -N -C 2 imp-2.2.0-pre4/locale/it/message.lang imp-2.2.0-pre5/locale/it/message.lang
*** imp-2.2.0-pre4/locale/it/message.lang	Wed Apr 28 07:41:40 1999
--- imp-2.2.0-pre5/locale/it/message.lang	Sat Aug 28 10:33:03 1999
***************
*** 58,61 ****
--- 58,62 ----
  $lang->bounce = '[Ridirigi]';
  $lang->saveas = '[Salva come]';
+ $lang->resume = '[Resume]';
  $lang->compose = 'Componi Messaggio';
  $lang->add_to_contacts = '[Aggiungi alla Rubrica]';
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/compose.help imp-2.2.0-pre5/locale/no/compose.help
*** imp-2.2.0-pre4/locale/no/compose.help	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/compose.help	Wed Dec 31 19:00:00 1969
***************
*** 1,43 ****
- <?php
- /*
- compose.help
- 
- This is the help for the compose screen.
- 
- */
- $help->add(
- 	COMPOSE_HELP_FROM,
- 	'Fra: feltet',
- 	'Dette angir avsenders adresse, under webmail vil den vise ditt navn og din epostadresse.'
- );
- $help->add(
- 	COMPOSE_HELP_TO,
- 	'Til: feltet',
- 	'Dette er adressene meldingen skal sendes til, oppgis det flere adresser kan de adskilles med komma.'
- );
- $help->add(
- 	COMPOSE_HELP_CC,
- 	'Kopi-til: feltet',
- 	'Best kjent som Cc: (carbon-copy), dette angir også mottagere av meldingen.'
- );
- $help->add(
- 	COMPOSE_HELP_BCC,
- 	'Skjult kopi til: feltet',
- 	'Øvrige mottagere av meldingen vil ikke se at den også er sendt til adressene som oppgis i dette feltet. Flere adresser kan angis kommaseparert.'
- );
- $help->add(
- 	COMPOSE_HELP_SUBJECT,
- 	'Emne: feltet',
- 	'En hentydning til hva meldingen hendler om.'
- );
- $help->add(
- 	COMPOSE_HELP_ATTACH,
- 	'Vedlegg',
- 	'Her kan du velge mellom filene på din egen datamaskin, og vedlegge dem til meldingen som sendes. Bruk "Browse" knappen og etter å ha valgt fil trykkes "Vedlegg".'
- );
- $help->add(
- 	COMPOSE_HELP_OPTIONS,
- 	'Meldingsopsjoner',
- 	'Ytterligere opsjoner er oppgitt her.'
- );
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/compose.lang imp-2.2.0-pre5/locale/no/compose.lang
*** imp-2.2.0-pre4/locale/no/compose.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/compose.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,79 ****
- <?php
- 
- class ComposeLocaleLang extends HordeLocaleLang {
-    
-    function ComposeLocaleLang () {
-       $this->HordeLocaleLang();
-    }
-    
-    function forwarded_from ($message_source) {
-       return "----- Forwarded message from $message_source -----";
-    }
-    
- }
- 
- 
- $lang = new ComposeLocaleLang();
- require('./config/lang.php3');
- require('./locale/en/openwin.lang');
- /* plain strings */
- 
- $lang->action_send = 'Send meldingen';
- $lang->action_postpone = 'Avbryt meldingen';
- $lang->action_reply = 'Svar:';
- $lang->action_reply_all = 'Svar til alle:';
- $lang->action_forward = 'Videresend:';
- $lang->action_add_attach = 'Ny melding: La til et vedlegg...';
- $lang->action_del_attach = 'Ny melding: Fjernet et vedlegg...';
- $lang->action_compose = 'Ny melding';
- $lang->action_bounce = 'Bounce denne melding';
- 
- $lang->quoting_string = '';
- $lang->date_string = 'Dato';
- $lang->from_string = 'Fra';
- $lang->reply_to_string = 'Svar-Til';
- $lang->subject_string = 'Emne';
- $lang->to_string = 'Til';
- $lang->cc_string = 'Kopi til';
- $lang->bcc_string= 'Skjult kopi til';
- $lang->attach_string = 'Vedlegg';
- $lang->attach_string_plural = 'Vedlegg';
- 
- $lang->file_name = 'Filnavn';
- $lang->file_size = 'Filstørrelse';
- $lang->total_size = 'Total størrelse';
- $lang->options = 'Opsjoner';
- $lang->sign_message = 'Digitally Sign Message?';
- 
- $lang->button_attach = 'Vedlegg';
- $lang->button_cancel = 'Avbryt meldingen';
- $lang->button_delete_attach = 'Slett vedleggene';
- $lang->button_spellcheck = 'Spell Check';
- $lang->spell_in=' in';
- $lang->button_postpone = 'Avbryt meldingen';
- $lang->button_send = 'Send meldingen';
- $lang->button_bounce = 'Bounce meldingen';
- 
- $lang->fwd_string = 'Fwd:';
- $lang->forward_end_string = 'End forwarded message';
- 
- $lang->alert_specify_file = 'Du må oppgi hvilken fil som skal vedlegges.';
- $lang->alert_select_attach_delete = 'Du må velge hvilke vedlegg som skal slettes.';
- $lang->alert_need_text = 'Du må ha tekst i meldingsvinduet før du sender meldingen.';
- $lang->alert_no_signing_support = 'Signing is only supported in Netscape v4.03+';
- 
- $lang->sig_valid_error = "<h2><font color=red>Signature validation Failed. </font> Message <u>NOT</u> Sent!<h2>";
- $lang->status_bounce_success = 'Meldingen bounced vellykket.';
- $lang->status_send_success = 'Meldingen ble vellykket sendt.';
- $lang->status_send_save_error = 'Message send successfully, ERROR: not saved to';
- $lang->status_error_fequired_field = 'Ett eller flere påkrevde felt var ikke innfyllt.';
- $lang->status_postpone_error = 'Error: Message Postponement failed';
- $lang->status_message_postponed = 'Meldingen ble avbrutt';
- $lang->status_composition = 'Ny melding';
- 
- $lang->contacts = 'Adressebøker';
- 
- $lang->alert_attach_file = 'Trykk vedleggsknappen for å vedlegge denne filen';
- $lang->alert_need_recipient = 'Du må oppgi en mottager.';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/contacts.lang imp-2.2.0-pre5/locale/no/contacts.lang
*** imp-2.2.0-pre4/locale/no/contacts.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/contacts.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,81 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- 
- /* plain strings */
- 
- $lang->error_delete_address = '<tr><th>Det oppstod en feil; innslaget ble ikke fjernet fra adresseboken.</th></tr>';
- $lang->error_address_chars = '<tr><th>Du brukte et ulovlig tegn i epostadressen. Tegnet ble fjernet, editer innslaget påny om du ønsker å endre det.</th></tr>';
- $lang->error_nickname_chars = '<tr><th>Du brukte et ulovlig tegn i kallenavnet. Tegnet ble fjernet, editer innslaget påny om du ønsker å endre det.</th></tr>';
- $lang->error_fullname_chars = '<tr><th>Du brukte et ulovlig tegn i navnet.  Tegnet ble fjernet, editer innslaget påny om du ønsker å endre det.</th></tr>';
- $lang->error_create_address = '<tr><th>Det oppstod en feil; innslaget ble ikke laget.</th></tr>';
- $lang->error_update_address = '<tr><th>Det oppstod en feil; innslaget ble ikke endret</th></tr>';
- 
- $lang->addressbook_title = 'Adresseboken';
- $lang->address_string = 'Adresse';
- $lang->nickname_string = 'Kallenavn';
- $lang->fullname_string = 'Fullt navn';
- $lang->new_address_string = 'Ny adresse';
- $lang->new_nickname_string = 'Nytt kallenavn';
- $lang->new_fullname_string = 'Nytt navn';
- $lang->delete_string = 'Slett';
- $lang->change_string = 'Endre denne adressen';
- 
- $lang->insert_into_to = ' Overfør til til-feltet: ';
- $lang->insert_into_cc = ' Overfør til kopi-feltet: ';
- $lang->insert_into_bcc = ' Overfør til Bcc: ';
- $lang->close_window = ' Lukk vinduet ';
- $lang->before_search = 'Resultat fra LDAP søket vil bli listet her.';
- 
- $lang->action_add_address = 'Legg til et innslag i adresseboken';
- $lang->action_update_address = 'Oppdater et innslag i adresseboken';
- $lang->action_delete_address = 'Fjern et innslag i adresseboken';
- $lang->action_insert_address = 'Overfør et innslag til vinduet "Ny melding"';
- 
- $lang->button_add_address = 'Legg til denne adressen';
- $lang->button_update_address = 'Oppdater denne adressen';
- $lang->button_delete_address = 'Slett denne adressen';
- $lang->button_insert_address = 'Legg til denne adressen';
- 
- $lang->alert_no_compose = 'Vennlist observer at du bare kan bruke "Legg til" funksjonen om du starter adresseboken fra vinduet "Ny melding".';
- 
- $lang->no_ldap_server = 'Ingen LDAP servere var oppgitt.';
- $lang->no_ldap_connection = 'Fikk ikke kontakt med LDAP server.';
- $lang->no_ldap_bind = 'Kunne ikke binde mot LDAP serveren.';
- 
- $lang->too_many_results = 'Sorry, too many results.  Please try to narrow the search scope.';
- 
- $lang->ldap_add = ' Legg til ';
- $lang->ldap_clear = ' Tøm ';
- $lang->ldap_insertaddr = ' Legg til adresseboken ';
- 
- $lang->ldap_no_results = 'Fant ingenting.';
- 
- $lang->search = 'Søk i';
- $lang->directory = 'kataloogen';
- $lang->where = 'hvor ';
- $lang->uid = 'UID';
- $lang->mail = 'Epostadressen';
- $lang->sn = 'etternavnet';
- $lang->givenname = 'fornavnet';
- $lang->ou = 'organisasjonsenheten';
- $lang->cn = 'navnet';
- $lang->begins = 'begynner med';
- $lang->contains = 'inneholder';
- $lang->ends = 'slutter med';
- $lang->is_strict = 'er (presis)';
- $lang->is = 'er';
- $lang->sounds = 'lyder som';
- $lang->submit_button = ' Start søket ';
- 
- $lang->add_contact = ' Legg til adresseboken ';
- $lang->del_contact = ' Fjern fra adresseboken ';
- $lang->update_contact = ' Oppdater adresseboken ';
- $lang->contacts = 'Adresseboken';
- $lang->ldapsearch = 'LDAP søk';
- $lang->ldapresults = 'LDAP resultat';
- $lang->select = 'Velg ';
- $lang->add_to_contacts = ' Legg til adresseboken ';
- $lang->submit = 'Start' ;
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/folders.help imp-2.2.0-pre5/locale/no/folders.help
*** imp-2.2.0-pre4/locale/no/folders.help	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/folders.help	Wed Dec 31 19:00:00 1969
***************
*** 1,33 ****
- <?php
- /*
- folders.help
- 
- This is the help for the folders screen.
- 
- */
- $help->add(
- 	FOLDERS_HELP_SUBSCRIBE,
- 	'Subscribe',
- 	'This option allows you to "subscribe" to an IMAP folder on the remote mail server.  This is useful for organizating your mail messages by categories and storing the messages in seperate folders.  To do this, you could use a server-side tool such as procmail or maildrop.  For more information on sorting your inbound mail, contact your mail server administrator.'
- );
- $help->add(
- 	FOLDERS_HELP_UNSUBSCRIBE,
- 	'Unsubscribe',
- 	'This option allows you to "unsubscribe" from an IMAP folder on the remote mail server.'
- );
- $help->add(
- 	FOLDERS_HELP_CREATE,
- 	'Create',
- 	'This option allows you to create a new IMAP folder on the remote mail server.'
- );
- $help->add(
- 	FOLDERS_HELP_RENAME,
- 	'Rename',
- 	'This options allows you to rename an existing IMAP folder on the remote mail server.'
- );
- $help->add(
- 	FOLDERS_HELP_DELETE,
- 	'Delete',
- 	'This option allows you to delete an existing IMAP folder on the remote mail server.'
- );
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/folders.lang imp-2.2.0-pre5/locale/no/folders.lang
*** imp-2.2.0-pre4/locale/no/folders.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/folders.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,41 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- 
- $lang->delete_folder_error = '<b>Error</b>: folderen ble ikke slettet';
- $lang->unsub_folder_error = '<b>Error</b>: du fikk ikke fjernet abonnementet på folderen';
- $lang->create_folder_error = '<b>Error</b>: folderen ble ikke opprettet';
- $lang->subscribe_folder_error = '<b>Error</b>: du fikk ikke abonnert på folderen';
- $lang->rename_folder_error = '<b>Error</b>: folderen ble ikke flyttet';
- $lang->none_selected = '<b>Error</b>: ingen foldere var valgt';
- 
- $lang->folders_title = 'Mail foldere';
- $lang->confirm_delete = 'Sletter du en folder vil du også slette alle meldingenei folderen.\nEr du sikker på at du vil gjøre det?';
- 
- $lang->subscribe_label = 'Admiistrert folderabonnement';
- $lang->rename_label = 'Flytt en folder';
- $lang->delete_label = 'Slett en folder';
- $lang->create_label = 'Opprett en ny folder';
- $lang->unsub_label = 'Fjern abonnement på en folder';
- 
- $lang->available = 'Tilgjengelige foldere:';
- $lang->selected = 'Velg foldere:';
- $lang->add_caption = "Legg til en folder";
- $lang->remove_caption = "Fjern en folder";
- 
- $lang->unsub = 'Fjern abonnement';
- $lang->subscribe = 'Abonner';
- $lang->rename = 'Opprinnelig folder:';
- $lang->renameTo = 'Til nytt navn:';
- $lang->delete = 'Foldernavn:';
- $lang->create = 'Foldernavn:';
- 
- $lang->unsub_button = ' Fjern abonnement  på denne folder ';
- $lang->subscribe_button = ' Abonner på denne folder ';
- $lang->rename_button = ' Flytt denne folder ';
- $lang->delete_button = ' Slett denne folder ';
- $lang->create_button = ' Opprett denne folder ';
- 
- // must start with at least five (5) hyphens (-)
- $lang->select_spacer = '------------------------------';
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/help.lang imp-2.2.0-pre5/locale/no/help.lang
*** imp-2.2.0-pre4/locale/no/help.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/help.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,4 ****
- <?php
- 
- $help_title = 'Horde hjelp';
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/horde.lang imp-2.2.0-pre5/locale/no/horde.lang
*** imp-2.2.0-pre4/locale/no/horde.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/horde.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,5 ****
- <?php
- 
- $this->imp->selected_messages = 'Selected mail to:';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/ldap.result.lang imp-2.2.0-pre5/locale/no/ldap.result.lang
*** imp-2.2.0-pre4/locale/no/ldap.result.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/ldap.result.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,7 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- 
- $lang->before_search = 'Dette vinduet vil inneholdet resultatene fra LDAP-søket .';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/ldap.search.lang imp-2.2.0-pre5/locale/no/ldap.search.lang
*** imp-2.2.0-pre4/locale/no/ldap.search.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/ldap.search.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,36 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- 
- $lang->alert_no_compose = 'Vennlist observer at du først kan bruke "Insert" funksjonen når du er i vinduet "Ny melding"';
- 
- $lang->no_ldap_server = 'Ingen LDAP servere var oppgitt.';
- $lang->no_ldap_connection = 'Fikk ikke kontakt med LDAP server.';
- $lang->no_ldap_bind = 'Kunne ikke binde mot LDAP serveren.';
- 
- $lang->too_many_results = 'Beklager - for mange resultat. Prøv å avgrense søket ditt.';
- 
- $lang->ldap_add = ' Legg til ';
- $lang->ldap_clear = ' Nullstill ';
- $lang->ldap_insert = ' Overfør adressen til Til-feltet: ';
- $lang->ldap_insertcc = ' Overfør adressen til Kopi-feltet: ';
- $lang->ldap_insertbcc = ' Overfør til Bcc: ';
- $lang->ldap_insertaddr = ' Overfør til adresseboken ';
- 
- $lang->ldap_no_results = 'Søket fant ingenting som traff.';
- 
- 
- $lang->uid = 'UID';
- $lang->mail = 'Epost adresse';
- $lang->sn = 'Etternavn';
- $lang->givenname = 'Fornavn';
- $lang->ou = 'Organisasjonsenhet';
- $lang->cn = 'Navn';
- $lang->begins = 'begynner med';
- $lang->contains = 'inneholder';
- $lang->ends = 'slutter med';
- $lang->is_strict = 'er (presis)';
- $lang->is = 'er';
- $lang->sounds = 'lyder som';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/login.help imp-2.2.0-pre5/locale/no/login.help
*** imp-2.2.0-pre4/locale/no/login.help	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/login.help	Wed Dec 31 19:00:00 1969
***************
*** 1,34 ****
- <?php
- /*
- login.help
- 
- This is the help for the login screen.
- 
- */
- $help->add(
- 	LOGIN_HELP_USERNAME,
- 	'Username',
- 	'Dette er brukernavnet ditt. Er du ansatt er det gjerne fem bokstaver, som student har du gjerne brukernavn på formen st99999.'
- );
- $help->add(
- 	LOGIN_HELP_PASSWORD,
- 	'Password',
- 	'Det hemmelige passordet ditt beskytter kontoen din og mailene dine fra innsyn av andre. Du må aldri fortelle passordet ditt til noen, passordet ditt må være vanskelig å gjette.'
- );
- $help->add(
- 	LOGIN_HELP_SERVER,
- 	'Server',
- 	'Studenter velger rasmus, odontologer baktus, jurister fryd, samfunnsvitere velger hermes og alle andre velger alf.'
- );
- $help->add(
- 	LOGIN_HELP_FOLDERS,
- 	'Folders',
- 	'Du skal vite hva du gjør om du velger noe annet enn mail/, dette er katalogen på unix-serveren hvor mailfolderne dine lageres. De fleste mailprogrammer som f.eks pine, bruker katalogen mail/.'
- );
- $help->add(
-         LOGIN_HELP_LANGUAGE,
-         'Language',
-         'De fleste tekstene i webmail blir gitt i det språket du velger. Engelsk er et trygt valg - mange vanlige internetbegreper kan synes rare på norsk.'
- );
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/login.lang imp-2.2.0-pre5/locale/no/login.lang
*** imp-2.2.0-pre4/locale/no/login.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/login.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,24 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- require('./config/lang.php3');
- 
- $lang->welcome_to_imp		= 'Velkommen til IMP';
- $lang->javascript_needed	= 'IMP krever JavaScript for å utføre enkelte handlinger.';
- $lang->user_name		= 'Brukernavn';
- $lang->password			= 'Passord';
- $lang->server			= 'Server';
- $lang->server_port		= 'Port';
- $lang->folders			= 'Folder';
- $lang->log_in			= 'logg inn';
- $lang->language                 = 'Språk';
- 
- $lang->login = '';
- $lang->timeout = 'Enten har du oppgitt feil brukernavn/passord eller feil server .  Vær vennlig prøv igjen.';
- $lang->logout = 'Du er nå logget ut av IMP.  Takk for at du brukte systemet.  Om du ønsker å logge inn påny, vær vennlig bruk skjemaet under.';
- $lang->nocert = 'You need a valid client certificate in order to access this site.';
- 
- $lang->newuser_link = 'Introduksjon til nye brukere';
- $lang->alert_user_pass = 'Vennligst oppgi ditt brukernavn og passord.';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/mailbox.lang imp-2.2.0-pre5/locale/no/mailbox.lang
*** imp-2.2.0-pre4/locale/no/mailbox.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/mailbox.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,100 ****
- <?php
- 
- class MailboxLocaleLang extends HordeLocaleLang {
-    
-    function MailboxLocaleLang () {
-       $this->HordeLocaleLang();
-    }
-    
-    function error ($current_mbox, $action) {
-       global $lang;
-       
-       $action_text = $lang->$action;
-       return "Mailbox: $current_mbox: Error: Message $action_text Failed";
-    }
-    
-    function success1 ($current_mbox, $action, $num, $plural = false) {
-       global $lang;
-       
-       if ($plural) $messages = 'Messages';
-       else $messages = 'Message';
-       
-       $action_text = $lang->$action;
-       return "Mailbox: $current_mbox: $action_text $num $messages";
-    }
-    
-    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
-       global $lang;
-       
-       if ($plural) $messages = 'Messages';
-       else $messages = 'Message';
-       
-       $action_text = $lang->$action;
-       return "Mailbox: $current_mbox: $action_text $num $messages to $targetMbox";
-    }
-    
-    function pagenav ($page, $page_count) {
-       global $this_client;
-       if ($this_client == '') { $this_client = new WebClient; }
- 
-       if ($this_client->lynx) {
- 	 return "Page $page of $page_count";
-       } else {
- 	 return "page <input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> of $page_count";
-       }
-    }
-    
-    function overview ($begin, $end, $nummsgs) {
-        if ($nummsgs == 0) {
- 	  return "0 Messages";
-        } elseif ($nummsgs == 1) {
- 	  return "1 Message";
-        } else {
- 	  return "$begin - $end of $nummsgs Messages";
-        }
-    }
-    
- }
- 
- 
- $lang = new MailboxLocaleLang();
- require('./locale/en/openwin.lang');
- 
- $lang->delete_link = 'Slett';
- $lang->undelete_link = 'Gjenopprett';
- $lang->move_link = 'Flytt';
- $lang->copy_link = 'Kopier';
- $lang->selected_mail = 'valgte meldinger';
- 
- $lang->sort_by_label =  'Sorter på';
- $lang->date_label = 'Dato';
- $lang->from_label = 'Fra';
- $lang->subject_label = 'Emne';
- $lang->size_label = 'Størrelse';
- $lang->to_label = 'Til';
- 
- $lang->select_all = 'Velg alle';
- $lang->select_none = 'Velg ingen';
- $lang->empty_trash = 'Tøm søppelkurven';
- 
- $lang->no_subject = '[No subject]';
- $lang->undisclosed_recipients = 'Undisclosed Recipients';
- $lang->mailbox = 'Mailbox';
- 
- $lang->message = 'Melding';
- $lang->messages = 'Meldinger';
- 
- $lang->deletion = 'Sletting';
- $lang->deleted = 'Slettet';
- $lang->undeletion = 'Gjenoppretting';
- $lang->undeleted = 'Uslettede';
- $lang->move = 'Flytt';
- $lang->moved = 'Flyttet';
- $lang->copy = 'Kopier';
- $lang->copied = 'Kopiert';
- $lang->expunge = 'Tøm';
- $lang->expunged = 'Tømt';
- 
- $lang->reverse_sort = 'Motsatt (nyest eller størst til eldst eller minst) sorteringsrekkefølge.';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/menu.lang imp-2.2.0-pre5/locale/no/menu.lang
*** imp-2.2.0-pre4/locale/no/menu.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/menu.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,22 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- require('./locale/en/openwin.lang');
- 
- $lang->login_again = 'Vær vennlig logg inn påny';
- $lang->contacts = 'Adressebøker';
- $lang->login = 'Logg inn';
- $lang->check_inbox = 'Sjekk innboksen';
- $lang->compose = 'Ny melding';
- $lang->folders = 'Foldere';
- $lang->manage_files = 'Manage files';
- $lang->prefs = 'Innstillinger';
- $lang->view_log = 'View log';
- $lang->logout = 'Logg ut';
- $lang->faq = 'FAQ';
- $lang->ldap_search = 'LDAP søk';
- $lang->problem = 'Problem?';
- $lang->signup = 'Signup';
- $lang->horde = 'Horde';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/message.lang imp-2.2.0-pre5/locale/no/message.lang
*** imp-2.2.0-pre4/locale/no/message.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/message.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,67 ****
- <?php
- 
- class MessageLocaleLang extends HordeLocaleLang {
-    
-    function MessageLocaleLang () {
-       $this->HordeLocaleLang();
-    }
-    
-    function message_status ($current_mbox, $msg_index, $num) {
-       return "$current_mbox: $msg_index av $num";
-    }
-    
-    function back_to ($current_mbox) {
-       return "Tilbake til $current_mbox";
-    }
- 
-    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
-       global $lang;
-       
-       if ($plural) $messages = 'Messages';
-       else $messages = 'Message';
-       
-       $action_text = $lang->$action;
-       return "Mailbox: $current_mbox: $action_text $num $messages til $targetMbox";
-    }
- 
- }
- 
- 
- $lang = new MessageLocaleLang();
- $lang->imp->selected_messages = 'denne meldingen til:';
- require('./locale/en/openwin.lang');
- 
- $lang->move_link = 'Flytt';
- $lang->copy_link = 'Kopier';
- $lang->moved = 'Flyttet';
- $lang->copied = 'Kopiert';
- 
- $lang->attachment = 'vedlegg';
- $lang->source = '(rått innhold)';
- $lang->no_subject = '[No subject]';
- 
- $lang->date = 'Dato';
- $lang->to = 'Til';
- $lang->from = 'Fra';
- $lang->cc = 'Kopi til';
- $lang->replyto = 'Svar til';
- $lang->subject = 'Emne';
- $lang->parts = 'Deler';
- 
- $lang->prev = 'Forrige';
- $lang->next = 'Neste';
- $lang->delete = 'Slett';
- $lang->reply = 'Svar';
- $lang->replyall = 'Svar til alle';
- $lang->forward = 'Videresend';
- $lang->bounce = 'Bounce';
- $lang->saveas = 'Lagre som';
- $lang->compose = 'Ny melding';
- $lang->add_to_contacts = 'Legg til adresseboken';
- 
- $lang->delete_error = '<tr><th colspan=2>En feil oppstod; meldingen din har ikke blitt slettet.</td></tr>';
- 
- $lang->copy_error = '<B>Kopieringen mislykkes.</B>';
- $lang->move_error = '<B>Flyttingen mislykkes.</B>';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/newuser.entro.txt imp-2.2.0-pre5/locale/no/newuser.entro.txt
*** imp-2.2.0-pre4/locale/no/newuser.entro.txt	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/newuser.entro.txt	Wed Dec 31 19:00:00 1969
***************
*** 1,3 ****
- <p align="justify">
- This has hopefully given you a general understanding of how to web mail interface works.  You'll surely become comfortable with it after seeing how easy and convenient it is for reading and sending mail, as well as managing your IMAP mail account.
- </p>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/newuser.intro.txt imp-2.2.0-pre5/locale/no/newuser.intro.txt
*** imp-2.2.0-pre4/locale/no/newuser.intro.txt	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/newuser.intro.txt	Wed Dec 31 19:00:00 1969
***************
*** 1,3 ****
- <p align="justify">
- Welcome to the IMAP webMail Program (IMP)!  Through IMP's intuitive interface, you'll be able to access and manage your IMAP mail account using the simplicity of a standard web browser.
- </p>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/newuser.lang imp-2.2.0-pre5/locale/no/newuser.lang
*** imp-2.2.0-pre4/locale/no/newuser.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/newuser.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,13 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- 
- $lang->newuser_title = 'IMP Newuser Documentation';
- $lang->intro_title = 'Webmail Introduction';
- 
- $lang->header_intro = 'Introduction';
- $lang->header_start = 'Getting Started';
- $lang->header_entro = 'Conclusion';
- $lang->intro_return = 'Return to the Login Screen';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/newuser.start.txt imp-2.2.0-pre5/locale/no/newuser.start.txt
*** imp-2.2.0-pre4/locale/no/newuser.start.txt	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/newuser.start.txt	Wed Dec 31 19:00:00 1969
***************
*** 1,34 ****
- <b>Logging In</b>
- <p align="justify">
- All sessions begin at the Login screen.  Before you can use any of the webmail features, you must connect to your IMAP account using the username and password assigned to you by your network administrator.
- </p>
- <p align="justify">
- Begin by entering your user and password in the appropriate fields.  You'll then need to select the IMAP mail server to which you'd like to connect.
- </p>
- <p align="justify">
- Once you've filled in these three fields, click the "Login" button to proceed.
- <hr size="1" width="98%" align="center" noshade>
- </p>
- 
- <b>The Mailbox Listing</b>
- <p align="justify">
- The contents of your Inbox folder will be displayed immediately upon logging in.  The Mailbox Listing shows the contents of each message's header (message status, date sent, sender, subject, and size).  Each column has a heading.  Clicking on the heading will cause the listing to be sorted by that column.
- </p>
- <p>
- To view the contents of a message, click on the message's subject.  You'll be taken to the Message screen.
- <hr size="1" width="98%" align="center" noshade>
- </p>
- 
- <b>The Message Screen</b>
- <p align=justify">
- The Message Screen display the contents of the selected message.  From here, you can browse message attachments, reply to the current message, delete the current message, or advance to the next message in your current mailbox.
- <hr size="1" width="98%" align="center" noshade>
- </p>
- 
- <b>The Compose Window</b>
- <p align="justify">
- You can send mail in a variety ways.  You might choose to compose a new message or perhaps to reply to an existing message.  Whichever method you choose, however, will open the standard Compose Window.
- </p>
- <p align="justify">
- The Compose Window allows you to set, among other things, the message recipient's address (who you're sending mail to), the message subject, and the message contents.  Simply fill out the appropriate fields at the top of the window (only the To: address is required, but the Subject: is suggested) and type your message in the large lower field.  Once you've completed entering your message, you may choose to Spell Check your message text.  Once you're done composing your new message, click the "Send" button to send the message to the recipient.
- </p>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/openwin.lang imp-2.2.0-pre5/locale/no/openwin.lang
*** imp-2.2.0-pre4/locale/no/openwin.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/openwin.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,17 ****
- <?php
- 
- /* You can customize your window sizes for each language here */
- 
- 
- $lang->contact_ldap_width = '600';
- $lang->contact_ldap_height = '525';
- $lang->contact_ldap_noaddy_width = '600';
- $lang->contact_ldap_noaddy_height = '250';
- $lang->contact_width = '600';
- $lang->contact_height = '330';
- $lang->contact_add_width = '500';
- $lang->contact_add_height = '200';
- $lang->compose_height = '650';
- $lang->compose_width = '800' ;  /* UIB */
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/prefs.lang imp-2.2.0-pre5/locale/no/prefs.lang
*** imp-2.2.0-pre4/locale/no/prefs.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/prefs.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,20 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- require('./config/lang.php3');
- 
- $lang->signature_error = '<tr><th>En feil oppstod ; signaturen ble ikke oppdatert.</th></tr>';
- $lang->language_error = '<tr><th>En feil oppstod ; valg av språk ble ikke oppdatert.</th></tr>';
- $lang->from_error = '<tr><th>En feil oppstod ; your From was not updated.</th></tr>';
- $lang->fullname_error = '<tr><th>En feil oppstod ; Navnet ditt ble ikke oppdatert.</th></tr>';
- 
- $lang->save_button = ' Lagre innstillingene ';
- 
- $lang->edit_from = 'Edit your From: line';
- $lang->edit_fullname = 'Endre ditt fulle navn';
- $lang->edit_lang = 'Velg foretrukket språk';
- $lang->edit_sig = 'Editer signaturen din';
- 
- $lang->prefs_title = 'IMP innstillinger';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/select.lang imp-2.2.0-pre5/locale/no/select.lang
*** imp-2.2.0-pre4/locale/no/select.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/select.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,8 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- 
- $lang->select_title = 'IMP Folder Administrasjon';
- $lang->open_folder = 'Åpne denne folderen:';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/spelling.lang imp-2.2.0-pre5/locale/no/spelling.lang
*** imp-2.2.0-pre4/locale/no/spelling.lang	Tue Jul  6 03:51:01 1999
--- imp-2.2.0-pre5/locale/no/spelling.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,10 ****
- <?php
- 
- $lang = new HordeLocaleLang();
- require('./config/lang.php3');
- 
- $lang->spelling_title = 'Message Spelling Suggestions';
- $lang->select_lang_for_ispell = 'Language';
- 
- $lang->no_errors = 'No Spelling Errors.';
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no/status.lang imp-2.2.0-pre5/locale/no/status.lang
*** imp-2.2.0-pre4/locale/no/status.lang	Tue Jul 20 06:48:30 1999
--- imp-2.2.0-pre5/locale/no/status.lang	Wed Dec 31 19:00:00 1969
***************
*** 1,24 ****
- <?php
- 
- class StatusLocaleLang extends HordeLocaleLang {
-    
-    function StatusLocaleLang () {
-       $this->HordeLocaleLang();
-    }
-    
-    function mailbox_status ($message, $unread, $recent) {
-       return "$message&nbsp;&nbsp;|&nbsp;&nbsp;$unread new, $recent recent";
-    }
-    
- }
- 
- 
- $lang = new StatusLocaleLang();
- 
- 
- $lang->status_title = 'Status ';
- $lang->newmail_msg = 'Du har fått ny mail!';
- $lang->login_msg = 'Velkommen til IMP. Vær vennlig logg inn.';
- $lang->green = 'Livet er lykkelig';
- 
- ?>
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/compose.help imp-2.2.0-pre5/locale/no-bok/compose.help
*** imp-2.2.0-pre4/locale/no-bok/compose.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/compose.help	Wed Sep 15 21:46:06 1999
***************
*** 0 ****
--- 1,46 ----
+ <?php
+ /*
+ compose.help
+ 
+ This is the help for the compose screen.
+ 
+ */
+ $help->add(
+ 	COMPOSE_HELP_FROM,
+ 	'Fra: feltet',
+ 	'I dette feltet står avsenderadressen din.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_TO,
+ 	'Til: feltet',
+ 	'Dette er adressen til mottaker. Om man skal sende til flere adressater, kan man skille mellom de med komma.'
+ 
+ );
+ $help->add(
+ 	COMPOSE_HELP_CC,
+ 	'Kopi til: feltet',
+ 	'Best kjent som Cc: (carbon-copy), blå-kopi. Adresse som mottar en kopi av e-posten.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_BCC,
+ 	'Skjult kopi til: feltet',
+ 	'Mottakere som mottar en kopi av e-posten, men som ikke er oppført som mottaker i e-posten.'
+ 
+ );
+ $help->add(
+ 	COMPOSE_HELP_SUBJECT,
+ 	'Emne: feltet',
+ 	'Hvilket emne e-posten handler om.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_ATTACH,
+ 	'Vedlegg',
+ 	'Her kan man legge ved filer til meldingen. Man legger til filer fra lokal datamaskin ved å trykke "Browse" og deretter "Vedlegg"'
+ 
+ );
+ $help->add(
+ 	COMPOSE_HELP_OPTIONS,
+ 	'Meldingsopsjoner',
+ 	'Ytterligere opsjoner blir spesifisert her.'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/compose.lang imp-2.2.0-pre5/locale/no-bok/compose.lang
*** imp-2.2.0-pre4/locale/no-bok/compose.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/compose.lang	Wed Sep 15 21:46:07 1999
***************
*** 0 ****
--- 1,79 ----
+ <?php
+ 
+ class ComposeLocaleLang extends HordeLocaleLang {
+    
+    function ComposeLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function forwarded_from ($message_source) {
+       return "----- Forwarded message from $message_source -----";
+    }
+    
+ }
+ 
+ 
+ $lang = new ComposeLocaleLang();
+ require('./config/lang.php3');
+ require('./locale/en/openwin.lang');
+ /* plain strings */
+ 
+ $lang->action_send = 'Send meldingen';
+ $lang->action_postpone = 'Avbryt meldingen';
+ $lang->action_reply = 'Svar:';
+ $lang->action_reply_all = 'Svar til alle:';
+ $lang->action_forward = 'Videresend:';
+ $lang->action_add_attach = 'Ny melding: Legg til et vedlegg...';
+ $lang->action_del_attach = 'Ny melding: Fjern et vedlegg...';
+ $lang->action_compose = 'Ny melding';
+ $lang->action_bounce = 'Send denne meldingen videre uendret';
+ 
+ $lang->quoting_string = '';
+ $lang->date_string = 'Dato';
+ $lang->from_string = 'Fra';
+ $lang->reply_to_string = 'Svar-Til';
+ $lang->subject_string = 'Emne';
+ $lang->to_string = 'Til';
+ $lang->cc_string = 'Kopi til';
+ $lang->bcc_string= 'Skjult kopi til';
+ $lang->attach_string = 'Vedlegg';
+ $lang->attach_string_plural = 'Vedlegg';
+ 
+ $lang->file_name = 'Filnavn';
+ $lang->file_size = 'Filstørrelse';
+ $lang->total_size = 'Total størrelse';
+ $lang->options = 'Opsjoner';
+ $lang->sign_message = 'Legg til digital signatur?';
+ 
+ $lang->button_attach = 'Vedlegg';
+ $lang->button_cancel = 'Avbryt meldingen';
+ $lang->button_delete_attach = 'Slett vedleggene';
+ $lang->button_spellcheck = 'Stavekontroll';
+ $lang->spell_in=' på';
+ $lang->button_postpone = 'Avbryt meldingen';
+ $lang->button_send = 'Send meldingen';
+ $lang->button_bounce = 'Bounce meldingen';
+ 
+ $lang->fwd_string = 'Fwd:';
+ $lang->forward_end_string = 'End forwarded message';
+ 
+ $lang->alert_specify_file = 'Du må oppgi hvilken fil som skal legges ved..';
+ $lang->alert_select_attach_delete = 'Du må velge hvilket vedlegg som skal slettes.';
+ $lang->alert_need_text = 'Du må ha tekst i meldingsvinduet før du sender meldingen.';
+ $lang->alert_no_signing_support = 'Signering er bare støttet av Netscape v4.03+';
+ 
+ $lang->sig_valid_error = "<h2><font color=red>Signaturen ikke godkjent. </font> Meldingen ble <u>IKKE</u> sendt!<h2>";
+ $lang->status_bounce_success = 'Meldingen videresendt uendret.';
+ $lang->status_send_success = 'Meldingen sendt.';
+ $lang->status_send_save_error = 'Meldingen sendt, FEIL: ikke lagret i ';
+ $lang->status_error_fequired_field = 'Ett eller flere nødvendige felt ikke fylt ut.';
+ $lang->status_postpone_error = 'Feil: Message Postponement failed';
+ $lang->status_message_postponed = 'Meldingen ble avbrutt';
+ $lang->status_composition = 'Ny melding';
+ 
+ $lang->contacts = 'Adressebok';
+ 
+ $lang->alert_attach_file = 'Trykk vedleggsknappen for å legge ved denne filen';
+ $lang->alert_need_recipient = 'Du må oppgi en mottaker.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/contacts.lang imp-2.2.0-pre5/locale/no-bok/contacts.lang
*** imp-2.2.0-pre4/locale/no-bok/contacts.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/contacts.lang	Wed Sep 15 21:46:08 1999
***************
*** 0 ****
--- 1,81 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ /* plain strings */
+ 
+ $lang->error_delete_address = '<tr><th>Det oppstod en feil; oppføringen ble ikke fjernet fra adresseboka.</th></tr>';
+ $lang->error_address_chars = '<tr><th>Et ulovlig tegn ble oppdaget i e-post-adressen. Tegnet ble fjernet. Rediger oppføringen på ny dersom du ønsker å endre det.</th></tr>';
+ $lang->error_nickname_chars = '<tr><th>Du brukte et ulovlig tegn i kallenavnet. Tegnet ble fjernet. Rediger oppføringen på ny dersom du ønsker å endre det.</th></tr>';
+ $lang->error_fullname_chars = '<tr><th>Du brukte et ulovlig tegn i navnet. Tegnet ble fjernet. Rediger navnet på nytt dersom du vil endre det.</th></tr>';
+ $lang->error_create_address = '<tr><th>Det oppstod en feil, oppføringen ble ikke lagret.</th></tr>';
+ $lang->error_update_address = '<tr><th>Det oppstod en feil; innslaget ble ikke endret.</th></tr>';
+ 
+ $lang->addressbook_title = 'Adressebok';
+ $lang->address_string = 'Adresse';
+ $lang->nickname_string = 'Kallenavn';
+ $lang->fullname_string = 'Fullt navn';
+ $lang->new_address_string = 'Ny adresse';
+ $lang->new_nickname_string = 'Nytt kallenavn';
+ $lang->new_fullname_string = 'Nytt navn';
+ $lang->delete_string = 'Slett';
+ $lang->change_string = 'Endre denne adressen';
+ 
+ $lang->insert_into_to = ' Overfør til til-feltet: ';
+ $lang->insert_into_cc = ' Overfør til kopi-feltet: ';
+ $lang->insert_into_bcc = ' Overfør til Bcc: ';
+ $lang->close_window = ' Lukk vinduet ';
+ $lang->before_search = 'Resultat fra LDAP-søket blir skrevet ut her.';
+ 
+ $lang->action_add_address = 'Legg til et innslag i adresseboka';
+ $lang->action_update_address = 'Oppdater et innslag i adresseboka';
+ $lang->action_delete_address = 'Fjern en oppføring i adresseboka';
+ $lang->action_insert_address = 'Overfør en adresse til vinduet "Ny melding"';
+ 
+ $lang->button_add_address = 'Legg til denne adressen';
+ $lang->button_update_address = 'Oppdater denne adressen';
+ $lang->button_delete_address = 'Slett denne adressen';
+ $lang->button_insert_address = 'Legg til denne adressen';
+ 
+ $lang->alert_no_compose = 'Vennligst legg merke til at du bare kan bruke "Overfør"-funksjonen om du starter adresseboka fra vinduet "Ny melding".';
+ 
+ $lang->no_ldap_server = 'Ingen LDAP-tjenere ble oppgitt.';
+ $lang->no_ldap_connection = 'Fikk ikke kontakt med LDAP-tjeneren.';
+ $lang->no_ldap_bind = 'Kunne ikke koble til LDAP-tjeneren.';
+ 
+ $lang->too_many_results = 'Beklager, for mange svar på søket ditt. Vennliggst prøv å snevre inn søkekriteriene dine.';
+ 
+ $lang->ldap_add = ' Legg til ';
+ $lang->ldap_clear = ' Tøm ';
+ $lang->ldap_insertaddr = ' Legg til adresseboka ';
+ 
+ $lang->ldap_no_results = 'Fant ingenting.';
+ 
+ $lang->search = 'Søk i';
+ $lang->directory = 'katalogen';
+ $lang->where = 'hvor ';
+ $lang->uid = 'UID';
+ $lang->mail = 'E-postadresse';
+ $lang->sn = 'etternavnet';
+ $lang->givenname = 'fornavnet';
+ $lang->ou = 'organiseringen';
+ $lang->cn = 'navnet';
+ $lang->begins = 'begynner med';
+ $lang->contains = 'inneholder';
+ $lang->ends = 'slutter med';
+ $lang->is_strict = 'er (eksakt)';
+ $lang->is = 'er';
+ $lang->sounds = 'høres ut som';
+ $lang->submit_button = ' Start søket ';
+ 
+ $lang->add_contact = ' Legg til adresseboka ';
+ $lang->del_contact = ' Fjern fra adresseboka ';
+ $lang->update_contact = ' Oppdater adresseboka ';
+ $lang->contacts = 'Adressebok';
+ $lang->ldapsearch = 'LDAP søk';
+ $lang->ldapresults = 'LDAP resultat';
+ $lang->select = 'Velg ';
+ $lang->add_to_contacts = ' Legg til adresseboka ';
+ $lang->submit = 'Start' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/folders.help imp-2.2.0-pre5/locale/no-bok/folders.help
*** imp-2.2.0-pre4/locale/no-bok/folders.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/folders.help	Wed Sep 15 21:46:08 1999
***************
*** 0 ****
--- 1,38 ----
+ <?php
+ /*
+ folders.help
+ 
+ This is the help for the folders screen.
+ 
+ */
+ $help->add(
+ 	FOLDERS_HELP_SUBSCRIBE,
+ 	'Abonner',
+ 	'Dette valget gjør at du kan "abonnere" på en IMAP-mappe på e-post tjeneren. Dette er nyttig for å sortere e-posten i forskjellige kategorier.'
+ 
+ );
+ $help->add(
+ 	FOLDERS_HELP_UNSUBSCRIBE,
+ 	'Oppsigelse',
+ 	'Dette valget gjør det mulig å "si opp" abonnementet ditt på en IMAP-mappe på e-post tjeneren.'
+ 
+ );
+ $help->add(
+ 	FOLDERS_HELP_CREATE,
+ 	'Opprett',
+ 	'Med dette valget kan du opprette en ny IMAP-mappe på e-post tjeneren.'
+ 
+ );
+ $help->add(
+ 	FOLDERS_HELP_RENAME,
+ 	'Omdøp',
+ 	'Med dette valget kan du gi nytt navn til en allerene eksisterande mappe på e-post tjeneren.'
+ 
+ );
+ $help->add(
+ 	FOLDERS_HELP_DELETE,
+ 	'Slett',
+ 	'Med dette valget kan du slette en allerene eksisterande mappe på e-post tjeneren.'
+ 
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/folders.lang imp-2.2.0-pre5/locale/no-bok/folders.lang
*** imp-2.2.0-pre4/locale/no-bok/folders.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/folders.lang	Wed Sep 15 21:46:09 1999
***************
*** 0 ****
--- 1,41 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->delete_folder_error = '<b>Feil</b>: mappen ble ikke slettet';
+ $lang->unsub_folder_error = '<b>Feil</b>: du fikk ikke fjernet abonnementet på mappen';
+ $lang->create_folder_error = '<b>Feil</b>: mappen ble ikke opprettet';
+ $lang->subscribe_folder_error = '<b>Feil</b>: du fikk ikke abonnert på mappen.';
+ $lang->rename_folder_error = '<b>Feil</b>: mappen ble ikke flyttet';
+ $lang->none_selected = '<b>Feil</b>: ingen mapper var valgt';
+ 
+ $lang->folders_title = 'Post mapper';
+ $lang->confirm_delete = 'Dersom du sletter en mappe, vil du også slette alle meldinger i mappen. \nEr du sikker på at du vil gjøre dette?';
+ 
+ $lang->subscribe_label = 'Administrere mappe-abonnement';
+ $lang->rename_label = 'Flytt en mappe';
+ $lang->delete_label = 'Slett en mappe';
+ $lang->create_label = 'Opprett en ny mappe';
+ $lang->unsub_label = 'Fjern abonnement på en mappe';
+ 
+ $lang->available = 'Tilgjengelige mapper:';
+ $lang->selected = 'Velg mapper:';
+ $lang->add_caption = "Legg til en mappe";
+ $lang->remove_caption = "Fjern en mappe";
+ 
+ $lang->unsub = 'Fjern abonnement';
+ $lang->subscribe = 'Abonner';
+ $lang->rename = 'Opprinnelig mappe:';
+ $lang->renameTo = 'Til nytt navn:';
+ $lang->delete = 'Mappenavn:';
+ $lang->create = 'Mappenavn:';
+ 
+ $lang->unsub_button = ' Fjern abonnement  på denne mappen ';
+ $lang->subscribe_button = ' Abonner på denne mappen ';
+ $lang->rename_button = ' Flytt denne mappen ';
+ $lang->delete_button = ' Slett denne mappen ';
+ $lang->create_button = ' Opprett denne mappen ';
+ 
+ // must start with at least five (5) hyphens (-)
+ $lang->select_spacer = '------------------------------';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/help.lang imp-2.2.0-pre5/locale/no-bok/help.lang
*** imp-2.2.0-pre4/locale/no-bok/help.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/help.lang	Wed Sep 15 21:46:09 1999
***************
*** 0 ****
--- 1,4 ----
+ <?php
+ 
+ $help_title = 'Horde hjelp';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/horde.lang imp-2.2.0-pre5/locale/no-bok/horde.lang
*** imp-2.2.0-pre4/locale/no-bok/horde.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/horde.lang	Wed Sep 15 21:46:10 1999
***************
*** 0 ****
--- 1,5 ----
+ <?php
+ 
+ $this->imp->selected_messages = 'Valgt e-post til:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/ldap.result.lang imp-2.2.0-pre5/locale/no-bok/ldap.result.lang
*** imp-2.2.0-pre4/locale/no-bok/ldap.result.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/ldap.result.lang	Wed Sep 15 21:46:10 1999
***************
*** 0 ****
--- 1,7 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->before_search = 'Dette vinduet vil inneholde resultatene fra LDAP-søket.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/ldap.search.lang imp-2.2.0-pre5/locale/no-bok/ldap.search.lang
*** imp-2.2.0-pre4/locale/no-bok/ldap.search.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/ldap.search.lang	Wed Sep 15 21:46:10 1999
***************
*** 0 ****
--- 1,36 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->alert_no_compose = 'Du kan bare nytte "Set inn"-funksjonen når du er i vinduet "Ny melding"';
+ 
+ $lang->no_ldap_server = 'Ingen LDAP-tjener er spesifisert.';
+ $lang->no_ldap_connection = 'Fikk ikke kontakt med LDAP-tjeneren.';
+ $lang->no_ldap_bind = 'Kunne ikke koble til LDAP-tjeneren.';
+ 
+ $lang->too_many_results = 'Beklager - for mange resultat. Prøv å korte inn søket ditt.';
+ 
+ $lang->ldap_add = ' Legg til ';
+ $lang->ldap_clear = ' Nullstill ';
+ $lang->ldap_insert = ' Overfør adressen til Til-feltet: ';
+ $lang->ldap_insertcc = ' Overfør adressen til Kopi-feltet: ';
+ $lang->ldap_insertbcc = ' Overfør til Bcc: ';
+ $lang->ldap_insertaddr = ' Overfør til adresseboka ';
+ 
+ $lang->ldap_no_results = 'Søket fant ingenting som som stemte med søkekriteriene.';
+ 
+ 
+ $lang->uid = 'UID';
+ $lang->mail = 'E-post-adresse';
+ $lang->sn = 'Etternavn';
+ $lang->givenname = 'Fornavn';
+ $lang->ou = 'Organisering';
+ $lang->cn = 'Navn';
+ $lang->begins = 'begynner med';
+ $lang->contains = 'inneholder';
+ $lang->ends = 'slutter med';
+ $lang->is_strict = 'er (eksakt)';
+ $lang->is = 'er';
+ $lang->sounds = 'høres ut som';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/login.help imp-2.2.0-pre5/locale/no-bok/login.help
*** imp-2.2.0-pre4/locale/no-bok/login.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/login.help	Wed Sep 15 21:46:11 1999
***************
*** 0 ****
--- 1,39 ----
+ <?php
+ /*
+ login.help
+ 
+ This is the help for the login screen.
+ 
+ */
+ $help->add(
+ 	LOGIN_HELP_USERNAME,
+ 	'Brukernavn',
+ 	'Dette er brukernavnet ditt. Det identifiserer deg unikt på denne e-post tjeneren. Et brukernavn er gjerne på 3 til 8 tegn.'
+ 
+ );
+ $help->add(
+ 	LOGIN_HELP_PASSWORD,
+ 	'Passord',
+ 	'Passordet ditt er "nøkkelen" for å låse seg inn på ditt e-post-område. Et passord skal være vanskelig for andre å gjette eller få tak i på andre måter.'
+ 
+ );
+ $help->add(
+ 	LOGIN_HELP_SERVER,
+ 	'Tjener',
+ 	'Dette vel hvilken tjener e-posten din ligger på. Dersom du ikke vet hva du skal velge her, ta kontakt med systemadminstratoren din. Et tjenernavn er på formen tjener.domene.land'
+ 	
+ );
+ $help->add(
+ 	LOGIN_HELP_FOLDERS,
+ 	'Mapper',
+ 	'Dette forteller under hvilken mappe e-posten blir lagret på e-post tjeneren. Ofte er dette "mail/" eller "Mail/", alt ettersom hvilket system som er brukt. Husk at det i dette tilfellet er forskjell på store og små bokstaver.'
+ );
+ 
+ $help->add(
+         LOGIN_HELP_LANGUAGE,
+         'Språk',
+ 	'Du kan velge språk på brukergrensesnittet i e-post leseren. Dersom et uttrykk virker merkelig på norsk, prøv å skifte språk til engelsk.'
+ 
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/login.lang imp-2.2.0-pre5/locale/no-bok/login.lang
*** imp-2.2.0-pre4/locale/no-bok/login.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/login.lang	Wed Sep 15 21:46:11 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->welcome_to_imp		= 'Velkommen til IMP';
+ $lang->javascript_needed	= 'IMP krever JavaScript for at enkelte kommandoer skal fungere.';
+ $lang->user_name		= 'Brukernavn';
+ $lang->password			= 'Passord';
+ $lang->server			= 'Tjener';
+ $lang->server_port		= 'Port';
+ $lang->folders			= 'Mappe';
+ $lang->log_in			= 'Logg inn';
+ $lang->language                 = 'Språk';
+ 
+ $lang->login = '';
+ $lang->timeout = 'Du har enten oppgitt feil brukernavn/passord eller feil tjener. Vær vennlig prøv igjen.';
+ $lang->logout = 'Du er nå logget ut av IMP. Takk for at du brukte systemet. Om du ønsker å logge inn på nytt, kan du bruke skjemaet under.';
+ $lang->nocert = 'Du trenger et gyldig klient-sertifikat for å få tilgang.';
+ 
+ $lang->newuser_link = 'Introduksjon til nye brukere';
+ $lang->alert_user_pass = 'Vær vennlig oppgi brukernavnet og passordet ditt.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/mailbox.lang imp-2.2.0-pre5/locale/no-bok/mailbox.lang
*** imp-2.2.0-pre4/locale/no-bok/mailbox.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/mailbox.lang	Wed Sep 15 21:46:11 1999
***************
*** 0 ****
--- 1,100 ----
+ <?php
+ 
+ class MailboxLocaleLang extends HordeLocaleLang {
+    
+    function MailboxLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function error ($current_mbox, $action) {
+       global $lang;
+       
+       $action_text = $lang->$action;
+       return "Postkasse: $current_mbox: Feil: Melding $action_text gikk ikke";
+    }
+    
+    function success1 ($current_mbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Meldinger';
+       else $messages = 'Melding';
+       
+       $action_text = $lang->$action;
+       return "Postkasse: $current_mbox: $action_text $num $messages";
+    }
+    
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Meldinger';
+       else $messages = 'Melding';
+       
+       $action_text = $lang->$action;
+       return "Postkasse: $current_mbox: $action_text $num $messages til $targetMbox";
+    }
+    
+    function pagenav ($page, $page_count) {
+       global $this_client;
+       if ($this_client == '') { $this_client = new WebClient; }
+ 
+       if ($this_client->lynx) {
+ 	 return "Side $page av $page_count";
+       } else {
+ 	 return "side <input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> av $page_count";
+       }
+    }
+    
+    function overview ($begin, $end, $nummsgs) {
+        if ($nummsgs == 0) {
+ 	  return "0 Meldinger";
+        } elseif ($nummsgs == 1) {
+ 	  return "1 Melding";
+        } else {
+ 	  return "$begin - $end av $nummsgs Meldinger";
+        }
+    }
+    
+ }
+ 
+ 
+ $lang = new MailboxLocaleLang();
+ require('./locale/en/openwin.lang');
+ 
+ $lang->delete_link = 'Slett';
+ $lang->undelete_link = 'Gjenopprett';
+ $lang->move_link = 'Flytt';
+ $lang->copy_link = 'Kopier';
+ $lang->selected_mail = 'valgte meldinger';
+ 
+ $lang->sort_by_label =  'Sorter på';
+ $lang->date_label = 'Dato';
+ $lang->from_label = 'Fra';
+ $lang->subject_label = 'Emne';
+ $lang->size_label = 'Størrelse';
+ $lang->to_label = 'Til';
+ 
+ $lang->select_all = 'Velg alle';
+ $lang->select_none = 'Velg ingen';
+ $lang->empty_trash = 'Tøm søppelkurven';
+ 
+ $lang->no_subject = '[Ikke emne]';
+ $lang->undisclosed_recipients = 'Mottaker(e) blir ikke vist';
+ $lang->mailbox = 'Postboks';
+ 
+ $lang->message = 'Melding';
+ $lang->messages = 'Meldinger';
+ 
+ $lang->deletion = 'Sletting';
+ $lang->deleted = 'Slettet';
+ $lang->undeletion = 'Gjenoppretting';
+ $lang->undeleted = 'Gjenopprettet';
+ $lang->move = 'Flytt';
+ $lang->moved = 'Flyttet';
+ $lang->copy = 'Kopier';
+ $lang->copied = 'Kopiert';
+ $lang->expunge = 'Tøm';
+ $lang->expunged = 'Tømt';
+ 
+ $lang->reverse_sort = 'Motsatt (nyest eller størst til eldst eller minst) sorteringsrekkefølge.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/menu.lang imp-2.2.0-pre5/locale/no-bok/menu.lang
*** imp-2.2.0-pre4/locale/no-bok/menu.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/menu.lang	Wed Sep 15 21:46:12 1999
***************
*** 0 ****
--- 1,22 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./locale/en/openwin.lang');
+ 
+ $lang->login_again = 'Vennligst logg inn på ny';
+ $lang->contacts = 'Adressebok';
+ $lang->login = 'Logg inn';
+ $lang->check_inbox = 'Sjekk innboksen';
+ $lang->compose = 'Ny melding';
+ $lang->folders = 'Mapper';
+ $lang->manage_files = 'Administrer filer';
+ $lang->prefs = 'Innstillinger';
+ $lang->view_log = 'Les logg';
+ $lang->logout = 'Logg ut';
+ $lang->faq = 'OSS (FAQ)';
+ $lang->ldap_search = 'LDAP-søk';
+ $lang->problem = 'Problem?';
+ $lang->signup = 'Signup';
+ $lang->horde = 'Horde';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/message.lang imp-2.2.0-pre5/locale/no-bok/message.lang
*** imp-2.2.0-pre4/locale/no-bok/message.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/message.lang	Wed Sep 15 21:46:12 1999
***************
*** 0 ****
--- 1,67 ----
+ <?php
+ 
+ class MessageLocaleLang extends HordeLocaleLang {
+    
+    function MessageLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function message_status ($current_mbox, $msg_index, $num) {
+       return "$current_mbox: $msg_index av $num";
+    }
+    
+    function back_to ($current_mbox) {
+       return "Tilbake til $current_mbox";
+    }
+ 
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Meldinger';
+       else $messages = 'Melding';
+       
+       $action_text = $lang->$action;
+       return "Postboks: $current_mbox: $action_text $num $messages til $targetMbox";
+    }
+ 
+ }
+ 
+ 
+ $lang = new MessageLocaleLang();
+ $lang->imp->selected_messages = 'denne meldingen til:';
+ require('./locale/en/openwin.lang');
+ 
+ $lang->move_link = 'Flytt';
+ $lang->copy_link = 'Kopier';
+ $lang->moved = 'Flyttet';
+ $lang->copied = 'Kopiert';
+ 
+ $lang->attachment = 'vedlegg';
+ $lang->source = '(kilde)';
+ $lang->no_subject = '[ikke emne]';
+ 
+ $lang->date = 'Dato';
+ $lang->to = 'Til';
+ $lang->from = 'Fra';
+ $lang->cc = 'Kopi til';
+ $lang->replyto = 'Svar til';
+ $lang->subject = 'Emne';
+ $lang->parts = 'Deler';
+ 
+ $lang->prev = 'Forrige';
+ $lang->next = 'Neste';
+ $lang->delete = 'Slett';
+ $lang->reply = 'Svar';
+ $lang->replyall = 'Svar til alle';
+ $lang->forward = 'Videresend';
+ $lang->bounce = 'Bounce';
+ $lang->saveas = 'Lagre som';
+ $lang->compose = 'Ny melding';
+ $lang->add_to_contacts = 'Legg til adresseboken';
+ 
+ $lang->delete_error = '<tr><th colspan=2>En feil oppstod; meldingen ble ikke slettet.</td></tr>';
+ 
+ $lang->copy_error = '<B>Kopieringen mislykket.</B>';
+ $lang->move_error = '<B>Flyttingen mislykket.</B>';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/newuser.entro.txt imp-2.2.0-pre5/locale/no-bok/newuser.entro.txt
*** imp-2.2.0-pre4/locale/no-bok/newuser.entro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/newuser.entro.txt	Wed Sep 15 21:46:13 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Vi går ut ifra at denne innføringen har gitt deg en generell forståelse for hvordan e-post leseren fungerer. Du vil helt sikkert føle deg litt mere komfortabel med den etter å ha sendt og mottatt e-post, og har sett hvor enkelt det er å holde orden på mappene på e-post tjeneren.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/newuser.intro.txt imp-2.2.0-pre5/locale/no-bok/newuser.intro.txt
*** imp-2.2.0-pre4/locale/no-bok/newuser.intro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/newuser.intro.txt	Wed Sep 15 21:46:13 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Velkommen til det web-baserte e-post programmet IMP! Ved å benytte IMP sitt intuitive og enkle brukergrensesnitt vil du kunne lese e-posten din og organisere mapper og adressebøker fra en helt vanlig nettleser.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/newuser.lang imp-2.2.0-pre5/locale/no-bok/newuser.lang
*** imp-2.2.0-pre4/locale/no-bok/newuser.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/newuser.lang	Wed Sep 15 21:46:13 1999
***************
*** 0 ****
--- 1,13 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->newuser_title = 'IMP-dokumentasjon for nye brukere';
+ $lang->intro_title = 'Introduksjon til Webmail';
+ 
+ $lang->header_intro = 'Introduksjon';
+ $lang->header_start = 'Kom i gang';
+ $lang->header_entro = 'Konklusjon';
+ $lang->intro_return = 'Gå tilbake til innloggings-bildet';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/newuser.start.txt imp-2.2.0-pre5/locale/no-bok/newuser.start.txt
*** imp-2.2.0-pre4/locale/no-bok/newuser.start.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/newuser.start.txt	Wed Sep 15 21:46:14 1999
***************
*** 0 ****
--- 1,42 ----
+ <b>Logge inn</b>
+ <p align="justify">
+ Hver gang du skal bruke IMP, må du først logge deg inn. For å logge inn må man ha et brukernavn og passord. Dette skal du ha fått tildelt av systemadministrator.
+ 
+ </p>
+ <p align="justify">
+ Tast inn brukernavn og passord i feltene på forsiden. Deretter må du velge hvilken mail-tjener du skal koble deg til.
+ 
+ </p>
+ <p align="justify">
+ Etter at du har fylt inn disse feltene trykker du på "Logg inn" -knappen for å fortsette.
+ 
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Innboks</b>
+ <p align="justify">
+ Innholdet i innboksen din vil bli vist rett etter at du har logget deg inn. Listen viser et utdrag av innholdet i "headeren" på hver melding (status, dato sendt, avsender, emne og størrelse). Hver kolonne har en overskrift. Ved å trykke på overskriften vil listen bli sortert etter denne kolonnen.
+ 
+ </p>
+ <p>
+ For å se innholdet i en melding, klikk på emnet til meldingen. Du vil deretter komme til meldingsskjermen.
+ 
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Meldingsvising</b>
+ <p align=justify">
+ Meldingsskjermen viser innholdet i en valgt melding. Her kan du undersøke vedlegg, svare på meldingen, slette meldingen eller gå videre til neste melding i innboksen eller mappen.
+ 
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Redigeringsvinduet</b>
+ <p align="justify">
+ Du kan sende e-post på flere forskjellige måter. Du kan forfatte en ny melding eller kanskje svare på en eksisterende melding. Uavhengig av hvilken måte du velger, vil du komme til det samme redigeringsvinduet.
+ 
+ </p>
+ <p align="justify">
+ Redigeringsvinduet gjør at du kan sette, blant annet, mottakaren på meldingen, emnet på meldingen, og innholdet i meldingen. Bare Til: er påkrevd, men Emne: er sterkt anbefalt å fylle ut. Meldingsteksten fyller du ut i det store tekstfeltet nede i vinduet. Etter at du er ferdig å skrive en e-post, kan du sende den ved å velge "send meldingen", eventuelt etter å ha kjørt stavekontroll på den.
+ 
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/openwin.lang imp-2.2.0-pre5/locale/no-bok/openwin.lang
*** imp-2.2.0-pre4/locale/no-bok/openwin.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/openwin.lang	Wed Sep 15 21:46:14 1999
***************
*** 0 ****
--- 1,17 ----
+ <?php
+ 
+ /* You can customize your window sizes for each language here */
+ 
+ 
+ $lang->contact_ldap_width = '600';
+ $lang->contact_ldap_height = '525';
+ $lang->contact_ldap_noaddy_width = '600';
+ $lang->contact_ldap_noaddy_height = '250';
+ $lang->contact_width = '600';
+ $lang->contact_height = '330';
+ $lang->contact_add_width = '500';
+ $lang->contact_add_height = '200';
+ $lang->compose_height = '650';
+ $lang->compose_width = '800' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/prefs.lang imp-2.2.0-pre5/locale/no-bok/prefs.lang
*** imp-2.2.0-pre4/locale/no-bok/prefs.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/prefs.lang	Wed Sep 15 21:46:14 1999
***************
*** 0 ****
--- 1,20 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->signature_error = '<tr><th>Det oppstod en feil: signaturen ble ikke oppdatert.</th></tr>';
+ $lang->language_error = '<tr><th>Det oppstod en feil: valg av språk ble ikke oppdatert.</th></tr>';
+ $lang->from_error = '<tr><th>Det oppstod en feil: avsender-feltet ble ikke oppdatert.</th></tr>';
+ $lang->fullname_error = '<tr><th>Det oppstod en feil: navnet ditt ble ikke oppdatert.</th></tr>';
+ 
+ $lang->save_button = ' Lagre innstillingene ';
+ 
+ $lang->edit_from = 'Rediger avsender-adressen din';
+ $lang->edit_fullname = 'Endre det fulle navnet ditt';
+ $lang->edit_lang = 'Velg språk';
+ $lang->edit_sig = 'Rediger signaturen din';
+ 
+ $lang->prefs_title = 'IMP-innstillinger';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/select.lang imp-2.2.0-pre5/locale/no-bok/select.lang
*** imp-2.2.0-pre4/locale/no-bok/select.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/select.lang	Wed Sep 15 21:46:15 1999
***************
*** 0 ****
--- 1,8 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->select_title = 'IMP Mappe Administrasjon';
+ $lang->open_folder = 'Åpne denne mappen:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/spelling.lang imp-2.2.0-pre5/locale/no-bok/spelling.lang
*** imp-2.2.0-pre4/locale/no-bok/spelling.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/spelling.lang	Wed Sep 15 21:46:15 1999
***************
*** 0 ****
--- 1,10 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->spelling_title = 'Forslag til stavekontroll';
+ $lang->select_lang_for_ispell = 'Språk';
+ 
+ $lang->no_errors = 'Fant ingen feil.';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-bok/status.lang imp-2.2.0-pre5/locale/no-bok/status.lang
*** imp-2.2.0-pre4/locale/no-bok/status.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/no-bok/status.lang	Wed Sep 15 21:46:15 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ class StatusLocaleLang extends HordeLocaleLang {
+    
+    function StatusLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function mailbox_status ($message, $unread, $recent) {
+       return "$message&nbsp;&nbsp;|&nbsp&nbsp;$unread ulest, $recent nye";
+    }
+    
+ }
+ 
+ 
+ $lang = new StatusLocaleLang();
+ 
+ 
+ $lang->status_title = 'Status ';
+ $lang->newmail_msg = 'Du har fått ny e-post!';
+ $lang->login_msg = 'Velkomen til IMP. Vennligst logg inn.';
+ $lang->green = 'Alt OK';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-nyn/compose.lang imp-2.2.0-pre5/locale/no-nyn/compose.lang
*** imp-2.2.0-pre4/locale/no-nyn/compose.lang	Tue Aug 17 19:09:48 1999
--- imp-2.2.0-pre5/locale/no-nyn/compose.lang	Sun Sep  5 20:24:02 1999
***************
*** 71,74 ****
--- 71,75 ----
  $lang->status_message_postponed = 'Meldinga vart avbroten';
  $lang->status_composition = 'Ny melding';
+ $lang->status_cancel = 'Meldingsredigering avbroten';
  
  $lang->contacts = 'Adressebøker';
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-nyn/folders.lang imp-2.2.0-pre5/locale/no-nyn/folders.lang
*** imp-2.2.0-pre4/locale/no-nyn/folders.lang	Tue Aug 17 19:09:48 1999
--- imp-2.2.0-pre5/locale/no-nyn/folders.lang	Sun Sep  5 20:24:02 1999
***************
*** 18,24 ****
  $lang->create_label = 'Opprett ei ny mappe';
  $lang->unsub_label = 'Fjern abonnement på ei mappe';
  
  $lang->available = 'Tilgjengelege mapper:';
! $lang->selected = 'Vell mapper:';
  $lang->add_caption = "Legg til ei mappe";
  $lang->remove_caption = "Fjern ei mappe";
--- 18,26 ----
  $lang->create_label = 'Opprett ei ny mappe';
  $lang->unsub_label = 'Fjern abonnement på ei mappe';
+ $lang->select_all = 'Velg alle';
+ $lang->select_none = 'Velg ingen';
  
  $lang->available = 'Tilgjengelege mapper:';
! $lang->selected = 'Velg mapper:';
  $lang->add_caption = "Legg til ei mappe";
  $lang->remove_caption = "Fjern ei mappe";
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-nyn/mailbox.lang imp-2.2.0-pre5/locale/no-nyn/mailbox.lang
*** imp-2.2.0-pre4/locale/no-nyn/mailbox.lang	Tue Aug 17 19:09:49 1999
--- imp-2.2.0-pre5/locale/no-nyn/mailbox.lang	Sun Sep  5 20:24:02 1999
***************
*** 76,84 ****
  $lang->select_all = 'Velg alle';
  $lang->select_none = 'Velg ingen';
  $lang->empty_trash = 'Tøm søppelkorga';
  
  $lang->no_subject = '[Ikkje emne]';
  $lang->undisclosed_recipients = 'Mottakar(ar) blir ikkje vist';
! $lang->mailbox = 'Mailbox';
  
  $lang->message = 'Melding';
--- 76,86 ----
  $lang->select_all = 'Velg alle';
  $lang->select_none = 'Velg ingen';
+ $lang->hide_deleted = 'Skjul sletta';
+ $lang->show_deleted = 'Vis sletta';
  $lang->empty_trash = 'Tøm søppelkorga';
  
  $lang->no_subject = '[Ikkje emne]';
  $lang->undisclosed_recipients = 'Mottakar(ar) blir ikkje vist';
! $lang->mailbox = 'postkasse';
  
  $lang->message = 'Melding';
***************
*** 95,100 ****
--- 97,107 ----
  $lang->expunge = 'Tøm';
  $lang->expunged = 'Tømt';
+ $lang->hiding_deleted = 'Skjuler sletta meldingar';
+ $lang->showing_deleted = 'Viser sletta meldingar';
+ $lang->deleted_summary = 'sletta meldingar blir ikkje vist i utlisting';
+ $lang->empty_mailbox = 'Det er ingen meldingar i denne postkassa';
  
  $lang->reverse_sort = 'Motsett (nyast eller størst til eldst eller minst) sorteringsrekkefølge.';
  
+ $lang->refresh = 'Frisk opp att postkassa'
  ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-nyn/menu.lang imp-2.2.0-pre5/locale/no-nyn/menu.lang
*** imp-2.2.0-pre4/locale/no-nyn/menu.lang	Tue Aug 17 19:09:49 1999
--- imp-2.2.0-pre5/locale/no-nyn/menu.lang	Sun Sep  5 20:24:02 1999
***************
*** 7,10 ****
--- 7,11 ----
  $lang->contacts = 'Adressebøker';
  $lang->login = 'Logg inn';
+ $lang->inbox = 'INNBOKS';
  $lang->check_inbox = 'Sjekk innboksen';
  $lang->compose = 'Ny melding';
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-nyn/message.lang imp-2.2.0-pre5/locale/no-nyn/message.lang
*** imp-2.2.0-pre4/locale/no-nyn/message.lang	Tue Aug 17 19:09:49 1999
--- imp-2.2.0-pre5/locale/no-nyn/message.lang	Sun Sep  5 20:24:02 1999
***************
*** 57,60 ****
--- 57,61 ----
  $lang->bounce = 'Bounce';
  $lang->saveas = 'Lagre som';
+ $lang->resume = 'Ta opp att';
  $lang->compose = 'Ny melding';
  $lang->add_to_contacts = 'Legg til adresseboka';
diff -r -N -C 2 imp-2.2.0-pre4/locale/no-nyn/prefs.lang imp-2.2.0-pre5/locale/no-nyn/prefs.lang
*** imp-2.2.0-pre4/locale/no-nyn/prefs.lang	Tue Aug 17 19:09:50 1999
--- imp-2.2.0-pre5/locale/no-nyn/prefs.lang	Sun Sep  5 20:24:02 1999
***************
*** 4,18 ****
  require('./config/lang.php3');
  
! $lang->signature_error = '<tr><th>Det oppstod en feil: signaturen vart ikkje oppdatert.</th></tr>';
! $lang->language_error = '<tr><th>Det oppstod en feil: val av språk vart ikkje oppdatert.</th></tr>';
! $lang->from_error = '<tr><th>Det oppstod en feil: avsendar-feltet vart ikkje oppdatert.</th></tr>';
! $lang->fullname_error = '<tr><th>Det oppstod en feil: namnet ditt vart ikkje oppdatert.</th></tr>';
  
  $lang->save_button = ' Lagre innstillingane ';
  
  $lang->edit_from = 'Rediger avsendar-adressa di';
  $lang->edit_fullname = 'Endre det fulle namnet ditt';
! $lang->edit_lang = 'Vel språk';
  $lang->edit_sig = 'Rediger signaturen din';
  
  $lang->prefs_title = 'IMP-innstillingar';
--- 4,20 ----
  require('./config/lang.php3');
  
! $lang->signature_error = '<tr><th>Det oppstod ein feil: signaturen vart ikkje oppdatert.</th></tr>';
! $lang->language_error = '<tr><th>Det oppstod ein feil: val av språk vart ikkje oppdatert.</th></tr>';
! $lang->from_error = '<tr><th>Det oppstod ein feil: avsendar-feltet vart ikkje oppdatert.</th></tr>';
! $lang->fullname_error = '<tr><th>Det oppstod ein feil: namnet ditt vart ikkje oppdatert.</th></tr>';
  
  $lang->save_button = ' Lagre innstillingane ';
+ $lang->updated = 'Innstillingar vart oppdatert.';
  
  $lang->edit_from = 'Rediger avsendar-adressa di';
  $lang->edit_fullname = 'Endre det fulle namnet ditt';
! $lang->edit_lang = 'Velg språk';
  $lang->edit_sig = 'Rediger signaturen din';
+ $lang->sig_dashes = 'Set inn to strekar og eit tomt teikn (\'-- \')';
  
  $lang->prefs_title = 'IMP-innstillingar';
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/compose.help imp-2.2.0-pre5/locale/pl/compose.help
*** imp-2.2.0-pre4/locale/pl/compose.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/compose.help	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,43 ----
+ <?php
+ /*
+ compose.help
+ 
+ This is the help for the compose screen.
+ 
+ */
+ $help->add(
+ 	COMPOSE_HELP_FROM,
+ 	'Pole Od:',
+ 	'Adres, który zostanie przedstawiony adresatowi listu. Powinien to byæ Twój adres emailowy.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_TO,
+ 	'Pole Do:',
+ 	'Adres odbiorcy listu. Mo¿esz wpisaæ tu naraz kilka adresów, wówczas list zostanie dostarczony pod ka¿dy z nich.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_CC,
+ 	'Pole Cc:',
+ 	'Pole "carbon-copy" wskazuje na adres osoby, której przesy³asz kopiê listu "do wiadomo¶ci". '
+ );
+ $help->add(
+ 	COMPOSE_HELP_BCC,
+ 	'Pole Bcc:',
+ 	'Pole "blind carbon-copy" jest podobne do pola CC: za wyj±tkiem faktu, ¿e adresat listu nie zostanie poinformowany o tym, ¿e kopia listu posz³a "do wiadomo¶ci" kogo¶ innego. Jest to przydatne np. podczas donoszenia szefowi o niesubordynacji kolegi ;-)'
+ );
+ $help->add(
+ 	COMPOSE_HELP_SUBJECT,
+ 	'Pole Temat:',
+ 	'Wpisz tu krótk± informacjê o li¶cie.'
+ );
+ $help->add(
+ 	COMPOSE_HELP_ATTACH,
+ 	'Za³±czniki',
+ 	'Pokazane s± tutaj za³±czniki zawarte w li¶cie. Aby dodaæ nowy za³±cznik, wybierz plik u¿ywaj±c przycisku "Przeszukuj", a potem kliknij myszk± w "Za³±cz".'
+ );
+ $help->add(
+ 	COMPOSE_HELP_OPTIONS,
+ 	'Inne opcje listu',
+ 	'S± tu pokazane inne mo¿liwo¶ci komponowania listu.'
+ );
+ ?
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/compose.lang imp-2.2.0-pre5/locale/pl/compose.lang
*** imp-2.2.0-pre4/locale/pl/compose.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/compose.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,79 ----
+ <?php
+ 
+ class ComposeLocaleLang extends HordeLocaleLang {
+    
+    function ComposeLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function forwarded_from ($message_source) {
+       return "----- Forwarded message from $message_source -----";
+    }
+    
+ }
+ 
+ 
+ $lang = new ComposeLocaleLang();
+ require('./config/lang.php3');
+ require('./locale/en/openwin.lang');
+ /* plain strings */
+ 
+ $lang->action_send = 'Wy¶lij list';
+ $lang->action_postpone = 'Zachowaj w postaci tekstowej';
+ $lang->action_reply = 'Odpowiedz:';
+ $lang->action_reply_all = 'Odpowiedz wszystkim:';
+ $lang->action_forward = 'Podaj dalej:';
+ $lang->action_add_attach = 'Komponowanie: dodano za³±cznik...';
+ $lang->action_del_attach = 'Komponowanie: skasowano za³±cznik...';
+ $lang->action_compose = 'Nowy list';
+ $lang->action_bounce = 'Podaj dalej ten list';
+ 
+ $lang->quoting_string = 'Za³±czanie';
+ $lang->date_string = 'Data';
+ $lang->from_string = 'Od';
+ $lang->reply_to_string = 'Odpowiedz-do';
+ $lang->subject_string = 'Temat';
+ $lang->to_string = 'Do';
+ $lang->cc_string = 'Cc';
+ $lang->bcc_string= 'Bcc';
+ $lang->attach_string = 'Za³±cznik';
+ $lang->attach_string_plural = 'Za³±czniki';
+ 
+ $lang->file_name = 'Nazwa pliki';
+ $lang->file_size = 'Rozmiar pliku';
+ $lang->total_size = 'Rozmiar ca³kowity';
+ $lang->options = 'Opcje';
+ $lang->sign_message = 'Czy podpisaæ cyfrowo list?';
+ 
+ $lang->button_attach = 'Za³±cz';
+ $lang->button_cancel = 'Zrezygnuj z wys³ania listu';
+ $lang->button_delete_attach = 'Slasuj za³±czniki';
+ $lang->button_spellcheck = 'SprawdŒ pisowniê';
+ $lang->spell_in=' w';
+ $lang->button_postpone = 'Zachowaj list do póŒniejszego wys³ania';
+ $lang->button_send = 'Wy¶lij list';
+ $lang->button_bounce = 'Podaj dalej';
+ 
+ $lang->fwd_string = 'Pdd:';
+ $lang->forward_end_string = 'Koniec przesy³anego dalej listu';
+ 
+ $lang->alert_specify_file = 'Musisz wybraæ plik do za³±czenia.';
+ $lang->alert_select_attach_delete = 'Musisz wybraæ za³±cznik/ki do skasowania.';
+ $lang->alert_need_text = 'Aby wys³aæ list, musisz w nim cokolwiek napisaæ.';
+ $lang->alert_no_signing_support = 'Podpisywanie jest mo¿liwe jedynie w Netscape v4.03+';
+ 
+ $lang->sig_valid_error = "<h2><font color=red>Sygnatura nie mog³a zostaæ sprawdzona. </font> List <u>NIE</u> zosta³ wys³any!<h2>";
+ $lang->status_bounce_success = 'List zosta³ podany dalej.';
+ $lang->status_send_success = 'List zosta³ wys³any pomy¶lnie.';
+ $lang->status_send_save_error = 'List zosta³ wys³any, ALE nie zosta³ zapisany do ';
+ $lang->status_error_fequired_field = 'Jedno lub wiêcej niezbêdnych pól pozosta³o niewype³nionych.';
+ $lang->status_postpone_error = 'B³±d: zachowanie listu do póŒniejszej wysy³ki nie powiod³o siê';
+ $lang->status_message_postponed = 'List zosta³ zachowany do póŒniejszego wys³ania';
+ $lang->status_composition = 'Pisanie listu';
+ 
+ $lang->contacts = 'Ksi±¿ka adresowa';
+ 
+ $lang->alert_attach_file = 'Przyci¶nij ZA£¡CZ aby wskazaæ ten plik jako za³±cznik';
+ $lang->alert_need_recipient = 'Musisz wskazaæ odbiorcê listu.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/contacts.help imp-2.2.0-pre5/locale/pl/contacts.help
*** imp-2.2.0-pre4/locale/pl/contacts.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/contacts.help	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,19 ----
+ <?php
+ /*
+ contacts.help
+ 
+ This is the help for the contacts screen.
+ 
+ */
+ $help->add(
+ 	CONTACTS_HELP_SEARCH,
+ 	'Przeszukiwanie serwera LDAP',
+ 	'Serwer LDAP zawiera listê u¿ytkowników. Mo¿esz go przeszukiwaæ, pos³uguj±c siê dowolnym parametrem - po prostu go wpisz, a potem naci¶nij przycisk "Rozpocznij poszukiwania.'
+ );
+ $help->add(
+ 	CONTACTS_HELP_RESULTS,
+ 	'Efekty przeszukiwania serwera LDAP',
+ 	'W tym miejscu pokazane s± efekty poszukiwañ. Wybierz z listy adresata.'
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/contacts.lang imp-2.2.0-pre5/locale/pl/contacts.lang
*** imp-2.2.0-pre4/locale/pl/contacts.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/contacts.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,82 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ /* plain strings */
+ 
+ $lang->error_delete_address = '<tr><th>B³±d; pozycja nie zosta³a skasowana z ksi±¿ki adresowej.</th></tr>';
+ $lang->error_address_chars = '<tr><th>U¿y³e¶ niew³a¶ciwego znaka w adresie pocztowym. Adres zosta³ wpisany bez tego znaka; zredaguj ponownie pozycjê, je¶li adres jest nieprawid³owy.</th></tr>';
+ $lang->error_nickname_chars = '<tr><th>U¿y³e¶ niew³a¶ciwego znaka w ksywce. Ksywka zosta³a wpisany bez tego znaka; zredaguj ponownie pozycjê, je¶li ksywka jest nieprawid³owa.</th></tr>';
+ $lang->error_fullname_chars = '<tr><th>U¿y³e¶ niew³a¶ciwego znaka wpisuj±c pe³ne imiê i nazwisko. Pole zosta³o wpisane bez tego znaka; zredaguj ponownie pozycjê, je¶li wydaje ci siê nieprawid³owa.</th></tr>';
+ $lang->error_create_address = '<tr><th>B³±d. Pozycja nie zosta³a wproadzona do ksi±¿ki adresowej.</th></tr>';
+ $lang->error_update_address = '<tr><th>B³±d. Pozycja nie zosta³a zmieniona.</th></tr>';
+ 
+ $lang->addressbook_title = 'Ksi±¿ka adresowa';
+ $lang->address_string = 'Adres';
+ $lang->nickname_string = 'Ksywka';
+ $lang->fullname_string = 'Imiê i nazwisko';
+ $lang->new_address_string = 'Nowy adres';
+ $lang->new_nickname_string = 'Nowa ksywka';
+ $lang->new_fullname_string = 'Nowe imiê i nazwisko';
+ $lang->delete_string = 'Kasuj';
+ $lang->change_string = 'Zmieñ ten wpis';
+ 
+ $lang->insert_into_to = ' WprowadΠdo Do: ';
+ $lang->insert_into_cc = ' WprowadΠdo Cc: ';
+ $lang->insert_into_bcc = ' WprowadΠdo Bcc: ';
+ $lang->close_window = ' Zamknij okno ';
+ $lang->before_search = 'Oto wyniki przeszukiwania bazy LDAP.';
+ 
+ $lang->action_add_address = 'WprowadŒ now± pozycjê do ksi±¿ki adresowej';
+ $lang->action_update_address = 'Zmieñ pozycjê w ksi±¿ce adresowej';
+ $lang->action_delete_address = 'Skasuj pozycjê w ksi±¿ce adresowej';
+ $lang->action_insert_address = 'WprowadŒ ten adres do pisanego w³a¶nie listu';
+ 
+ $lang->button_add_address = 'Dodaj ten adres';
+ $lang->button_update_address = 'Zmieñ tê pozycjê';
+ $lang->button_delete_address = 'Skasuj tê pozycjê';
+ $lang->button_insert_address = 'WprowadŒ tê pozycjê';
+ 
+ $lang->alert_no_compose = 'Zauwa¿, ze ta opcja jest dostêpna jedynie z pozycji komponowania listu...';
+ 
+ $lang->no_ldap_server = 'Serwer LDAP nie zosta³ okre¶lony.';
+ $lang->no_ldap_connection = 'Nie mogê siê po³±czyæ z serwerem LDAP.';
+ $lang->no_ldap_bind = 'Nie mogê siê po³±czyæ z serwerem LDAP.';
+ 
+ $lang->too_many_results = 'Przykro mi, zbyt wiele rezulatatów, spróbuj zawêziæ efekt poszukiwañ.';
+ 
+ $lang->ldap_add = ' Dodaj ';
+ $lang->ldap_clear = ' Kasuj ';
+ $lang->ldap_insertaddr = ' WprowadŒ do ksi±¿ki adresowej ';
+ 
+ $lang->ldap_no_results = 'Nie znaleziono odpowiadaj±cych pytaniu pozycji.';
+ 
+ $lang->search = 'Przeszukuj';
+ $lang->directory = 'Katalog';
+ $lang->where = 'gdzie';
+ $lang->uid = 'UID';
+ $lang->mail = 'Adres E-Mail';
+ $lang->sn = 'Nazwisko';
+ $lang->givenname = 'Imiê';
+ $lang->ou = 'Dzia³';
+ $lang->cn = 'Identyfikator';
+ $lang->begins = 'rozpoczyna siê';
+ $lang->contains = 'zawiera';
+ $lang->ends = 'koñczy siê';
+ $lang->is_strict = 'jest (dok³adnie)';
+ $lang->is = 'jest';
+ $lang->sounds = 'brzmi jak';
+ $lang->submit_button = ' Rozpocznij poszukiwania ';
+ $lang->mailalternateaddress = 'zapasowy adres pocztowy';
+ 
+ $lang->add_contact = ' Dodaj pozycjê ';
+ $lang->del_contact = ' Kasuj pozycjê ';
+ $lang->update_contact = ' Zmieñ pozycjê ';
+ $lang->contacts = 'Ksi±¿ka adresowa';
+ $lang->ldapsearch = 'Przeszukiwanie bazy LDAP';
+ $lang->ldapresults = 'Wyniki przeszukiwania bazy LDAP';
+ $lang->select = 'Wybierz ';
+ $lang->add_to_contacts = 'Dodaj do ksi±¿ki adresowej';
+ $lang->submit = 'WprowadŒ' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/folders.help imp-2.2.0-pre5/locale/pl/folders.help
*** imp-2.2.0-pre4/locale/pl/folders.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/folders.help	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,33 ----
+ <?php
+ /*
+ folders.help
+ 
+ This is the help for the folders screen.
+ 
+ */
+ $help->add(
+ 	FOLDERS_HELP_SUBSCRIBE,
+ 	'Subskrybcja',
+ 	'Sybskrybcja pozwala na wskazanie u¿ywanych folderów na serwerze. Jest to przydatne do rozdzielania poczty na kategorie. Aby to robiæ automatycznie, musisz pos³u¿yæ siê programem na swoim koncie unixowym, np. procmailem. Aby dowiedzieæ siê na ten temat wiêcej, skontaktuj siê ze swym administratorem.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_UNSUBSCRIBE,
+ 	'Odsubskrybuj',
+ 	'Nieniejsza opcja pozwala na rezygnacjê ze wskazania okre¶lonego foldera na serwerze poczty.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_CREATE,
+ 	'Utwórz',
+ 	'Mo¿esz tutaj utworzyæ nowy folder na serwerze.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_RENAME,
+ 	'Zmieñ nazwê',
+ 	'Zmiana nazwy istniej±cego foldera na serwerze.'
+ );
+ $help->add(
+ 	FOLDERS_HELP_DELETE,
+ 	'Kasuj',
+ 	'Kasowanie okre¶lonego foldera z serwera.'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/folders.lang imp-2.2.0-pre5/locale/pl/folders.lang
*** imp-2.2.0-pre4/locale/pl/folders.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/folders.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,41 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->delete_folder_error = '<b>B³±d</b>: folder nie zosta³ skasowany';
+ $lang->unsub_folder_error = '<b>B³±d</b>: folder nie zosta³ odsubskrybowany';
+ $lang->create_folder_error = '<b>B³±d</b>: folder nie zosta³ usuniêty';
+ $lang->subscribe_folder_error = '<b>B³±d</b>: folder nie zosta³ zasubskrybowany';
+ $lang->rename_folder_error = '<b>B³±d</b>: nazwa foldera nie zosta³a zmieniona';
+ $lang->none_selected = '<b>B³±d</b>: nie zosta³ okre¶lony folder';
+ 
+ $lang->folders_title = 'Foldery pocztowe';
+ $lang->confirm_delete = 'Usuniêcie foldera spowoduje skasowanie wszystkich zawartych w nim listów.\nCzy jeste¶ pewien ¿e tego w³a¶nie chcesz?';
+ 
+ $lang->subscribe_label = 'Zmieñ subskrybcjê folderów';
+ $lang->rename_label = 'Zmieñ nazwê foldera';
+ $lang->delete_label = 'Usuñ folder';
+ $lang->create_label = 'Utwórz nowy folder';
+ $lang->unsub_label = 'Odsybskrybuj folder';
+ 
+ $lang->available = 'Dostêpne foldery:';
+ $lang->selected = 'Zaznaczone foldery:';
+ $lang->add_caption = "Dodaj folder";
+ $lang->remove_caption = "Usuñ folder";
+ 
+ $lang->unsub = 'Odsubskrybuj';
+ $lang->subscribe = 'Zasubskrybuj';
+ $lang->rename = 'Pierwotny folder:';
+ $lang->renameTo = 'Nazwa docelowa:';
+ $lang->delete = 'Nazwa foldera:';
+ $lang->create = 'Nazwa foldera:';
+ 
+ $lang->unsub_button = ' Odsubskrybuj ten folder ';
+ $lang->subscribe_button = ' Zasubskrybuj folder ';
+ $lang->rename_button = ' Zmieñ nazwê tego foldera ';
+ $lang->delete_button = ' Usuñ ten folder ';
+ $lang->create_button = ' Utwórz ten folder ';
+ 
+ // must start with at least five (5) hyphens (-)
+ $lang->select_spacer = '------------------------------';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/help.lang imp-2.2.0-pre5/locale/pl/help.lang
*** imp-2.2.0-pre4/locale/pl/help.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/help.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,4 ----
+ <?php
+ 
+ $help_title = 'Pomoc dla Horde';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/horde.lang imp-2.2.0-pre5/locale/pl/horde.lang
*** imp-2.2.0-pre4/locale/pl/horde.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/horde.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,6 ----
+ <?php
+ 
+ $this->imp->selected_messages = 'Zaznaczon± pocztê do:';
+ $this->imp->download = 'Pobierz z serwera';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/ldap.result.lang imp-2.2.0-pre5/locale/pl/ldap.result.lang
*** imp-2.2.0-pre4/locale/pl/ldap.result.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/ldap.result.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,7 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->before_search = 'Nieniejsze okno zawiera rezultaty przeszukiwania serwera LDAP.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/ldap.search.lang imp-2.2.0-pre5/locale/pl/ldap.search.lang
*** imp-2.2.0-pre4/locale/pl/ldap.search.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/ldap.search.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,36 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->alert_no_compose = 'Zauwa¿, ¿e funkcja "WprowadŒ" jest dostêpna jedynie z poziomu komponowania listu...';
+ 
+ $lang->no_ldap_server = 'Serwer LDAP nie zosta³ okre¶lony.';
+ $lang->no_ldap_connection = 'Nie mogê pod³±czyæ siê do serwera LDAP.';
+ $lang->no_ldap_bind = 'Nie mogê pod³±czyæ siê do serwera LDAP.';
+ 
+ $lang->too_many_results = 'Zbyt wiele rezulatatów. Spróbuj zawêziæ efekty poszukiwañ.';
+ 
+ $lang->ldap_add = ' Dodaj ';
+ $lang->ldap_clear = ' Kasuj ';
+ $lang->ldap_insert = ' Wstaw do Do: ';
+ $lang->ldap_insertcc = ' Wstaw do CC: ';
+ $lang->ldap_insertbcc = ' Wstaw do Bcc: ';
+ $lang->ldap_insertaddr = ' WprowadŒ do ksi±¿ki adresowej ';
+ 
+ $lang->ldap_no_results = 'Nie znaleziono odpowiadaj±cych pozycji.';
+ 
+ 
+ $lang->uid = 'UID';
+ $lang->mail = 'Adres emailowy';
+ $lang->sn = 'Nazwisko';
+ $lang->givenname = 'Imiê';
+ $lang->ou = 'Dzia³ organizacyjny';
+ $lang->cn = 'Nazwisko';
+ $lang->begins = 'rozpoczynja±ce siê';
+ $lang->contains = 'zawieraj±ce';
+ $lang->ends = 'koñcz±ce siê';
+ $lang->is_strict = 'jest dok³adnie';
+ $lang->is = 'jest';
+ $lang->sounds = 'brzmi±ce jak';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/login.help imp-2.2.0-pre5/locale/pl/login.help
*** imp-2.2.0-pre4/locale/pl/login.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/login.help	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,34 ----
+ <?php
+ /*
+ login.help
+ 
+ This is the help for the login screen.
+ 
+ */
+ $help->add(
+ 	LOGIN_HELP_USERNAME,
+ 	'Identyfikator',
+ 	'Identyfikator, jakim pos³ugujesz siê w sieci lokalnej, pierwsza czê¶æ twojego adresu pocztowego, znajduj±ca siê przed znakiem "\@", np: "serek".'.
+ );
+ $help->add(
+ 	LOGIN_HELP_PASSWORD,
+ 	'Has³o',
+ 	'Has³o jest znane tylko tobie i zabezpiecza tw± skrzynkê pocztow± przed osobami niepowo³anymi. Dlatego nie zdradzaj go innym. Bez has³a nie dostaniesz siê do swej skrzynki.'
+ );
+ $help->add(
+ 	LOGIN_HELP_SERVER,
+ 	'Serwer',
+ 	'Serwer, na którym znajduje siê twoja skrzynka pocztowa. jest to zwykle ta czê¶æ Twojego adresu pocztowego, jaka znajduje siê po znaku "\@".'
+ );
+ $help->add(
+ 	LOGIN_HELP_FOLDERS,
+ 	'Foldery',
+ 	'"Foldery" wskazuj± na katalog, w którym znajduje siê na serwerze Twoja poczta, licz±c od katalogu domowego. I je¶li na przyk³ad poczta jest w $HOME/mail - powieniene¶ wpisaæ tutaj mail/. Pamiêtaj, ¿e system rozró¿nia ma³e i wielkie litery.'
+ );
+ $help->add(
+         LOGIN_HELP_LANGUAGE,
+         'Jêzyk',
+         'Wybranie "jêzyka" powoduje jego u¿ycie w programie.'
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/login.lang imp-2.2.0-pre5/locale/pl/login.lang
*** imp-2.2.0-pre4/locale/pl/login.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/login.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->welcome_to_imp		= 'IMP wita';
+ $lang->javascript_needed	= 'IMP wymaga dzia³aj±cego JavaScript.';
+ $lang->user_name		= 'Identyfikator';
+ $lang->password			= 'Has³o';
+ $lang->server			= 'Serwer';
+ $lang->server_port		= 'Port';
+ $lang->folders			= 'Foldery';
+ $lang->log_in			= 'Zaloguj siê';
+ $lang->language                 = 'Jêzyk';
+ 
+ $lang->login = '';
+ $lang->timeout = 'Albo Œle siê zalogowa³e¶, albo twoje has³o wygas³o. Spróbuj ponownie.';
+ $lang->logout = 'Wylogowa³e¶ siê z IMPa.  Dziêkujê za u¿ytkowanie systemu. Je¶li chcesz zalogowaæ siê ponownie, wype³nij poni¿szy formularz.';
+ $lang->nocert = 'Potrzebujesz wa¿nego certyfikatu, aby dostaæ siê do naszych stron.';
+ 
+ $lang->newuser_link = 'Wprowadzenie dla nowego u¿ytkownika';
+ $lang->alert_user_pass = 'WprowadŒ swój identyfikator i has³o.';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/mailbox.lang imp-2.2.0-pre5/locale/pl/mailbox.lang
*** imp-2.2.0-pre4/locale/pl/mailbox.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/mailbox.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,106 ----
+ <?php
+ 
+ class MailboxLocaleLang extends HordeLocaleLang {
+    
+    function MailboxLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function error ($current_mbox, $action) {
+       global $lang;
+       
+       $action_text = $lang->$action;
+       return "Folder: $current_mbox: B³±d: Wiadomo¶æ $action_text b³êdna";
+    }
+    
+    function success1 ($current_mbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Wiadomo¶ci';
+       else $messages = 'Wiadomo¶æ';
+       
+       $action_text = $lang->$action;
+       return "Folder: $current_mbox: $action_text $num $messages";
+    }
+    
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Wiadomo¶ci';
+       else $messages = 'Wiadomo¶æ';
+       
+       $action_text = $lang->$action;
+       return "Folder: $current_mbox: $action_text $num $messages na $targetMbox";
+    }
+    
+    function pagenav ($page, $page_count) {
+       global $this_client;
+       if ($this_client == '') { $this_client = new WebClient; }
+ 
+       if ($this_client->lynx) {
+ 	 return "Stona $page z $page_count";
+       } else {
+ 	 return "<input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> of $page_count";
+       }
+    }
+    
+    function overview ($begin, $end, $nummsgs) {
+        if ($nummsgs == 0) {
+ 	  return "Brak wiadomo¶ci";
+        } elseif ($nummsgs == 1) {
+ 	  return "1 wiadomo¶æ";
+        } else {
+ 	  return "$begin - $end of $nummsgs Messages";
+        }
+    }
+    
+ }
+ 
+ 
+ $lang = new MailboxLocaleLang();
+ require './locale/en/openwin.lang';
+ 
+ $lang->delete_link = 'Skasuj';
+ $lang->undelete_link = 'Odtwórz';
+ $lang->move_link = 'Przesuñ';
+ $lang->copy_link = 'Kopiuj';
+ $lang->selected_mail = 'zaznaczona poczta';
+ 
+ $lang->sort_by_label =  'Sortuj wed³ug';
+ $lang->date_label = 'Data';
+ $lang->from_label = 'Od';
+ $lang->subject_label = 'Temat';
+ $lang->size_label = 'Rozmiar';
+ $lang->to_label = 'Do';
+ 
+ $lang->select_all = 'Zaznacz wszystko';
+ $lang->select_none = 'Nic nie zaznaczaj';
+ $lang->hide_deleted = 'Ukryj skasowane';
+ $lang->show_deleted = 'Poka¿ skasowane';
+ $lang->empty_trash = 'Wyczy¶æ skasowane';
+ 
+ $lang->no_subject = '[Bez tematu]';
+ $lang->undisclosed_recipients = 'Nie ujawnieni adresaci';
+ $lang->mailbox = 'Folder';
+ 
+ $lang->message = 'List';
+ $lang->messages = 'Listy';
+ 
+ $lang->deletion = 'Kasowanie';
+ $lang->deleted = 'Skasowane';
+ $lang->undeletion = 'Odtwarzanie';
+ $lang->undeleted = 'Odtworzone';
+ $lang->move = 'Przesuñ';
+ $lang->moved = 'Przesuniête';
+ $lang->copy = 'Kopiuj';
+ $lang->copied = 'Skopiowane';
+ $lang->expunge = 'Wyczyszczenie skasowanych listów ze skrzynki';
+ $lang->expunged = 'Skasowane listy s± wyczyszczone ze skrzynki';
+ $lang->hiding_deleted = 'Ukrywanie skasowanych listów';
+ $lang->showing_deleted = 'Pokazywanie skasowanych listów';
+ $lang->deleted_summary = 'Skasowane listy zosta³y ukryte.';
+ 
+ $lang->reverse_sort = 'Sortowanie odwrotne - od najnowszych do najstarszych lub najmniejszych.';
+ 
+ $lang->refresh = 'Od¶wie¿ skrzynkê pocztow±';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/menu.lang imp-2.2.0-pre5/locale/pl/menu.lang
*** imp-2.2.0-pre4/locale/pl/menu.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/menu.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,22 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./locale/en/openwin.lang');
+ 
+ $lang->login_again = 'Zaloguj siê ponownie';
+ $lang->contacts = 'Ksi±¿ka adresowa';
+ $lang->login = 'Identyfikator';
+ $lang->check_inbox = 'SprawdŒ pocztê';
+ $lang->compose = 'Nowy list';
+ $lang->folders = 'Foldery';
+ $lang->manage_files = 'Zarz±dzaj plikami';
+ $lang->prefs = 'Preferencje';
+ $lang->view_log = 'Obejrzyj log';
+ $lang->logout = 'Wyloguj siê';
+ $lang->faq = 'FAQ';
+ $lang->ldap_search = 'Przeszukiwanie bazy LDAP';
+ $lang->problem = 'Masz problemy?';
+ $lang->signup = 'Zg³oszenie do systemu';
+ $lang->horde = 'Horde';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/message.lang imp-2.2.0-pre5/locale/pl/message.lang
*** imp-2.2.0-pre4/locale/pl/message.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/message.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,68 ----
+ <?php
+ 
+ class MessageLocaleLang extends HordeLocaleLang {
+    
+    function MessageLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function message_status ($current_mbox, $msg_index, $num) {
+       return "$current_mbox: $msg_index z $num";
+    }
+    
+    function back_to ($current_mbox) {
+       return "Powróæ do $current_mbox";
+    }
+ 
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = 'Wiadomo¶ci';
+       else $messages = 'Wiadomo¶æ';
+       
+       $action_text = $lang->$action;
+       return "Folder: $current_mbox: $action_text $num $messages do $targetMbox";
+    }
+ 
+ }
+ 
+ 
+ $lang = new MessageLocaleLang();
+ $lang->imp->selected_messages = 'tê wiadomo¶æ do:';
+ require './locale/en/openwin.lang';
+ 
+ $lang->move_link = 'Przesuñ';
+ $lang->copy_link = 'Kopiuj';
+ $lang->moved = 'Przesuniête';
+ $lang->copied = 'Skopiowane';
+ 
+ $lang->attachment = 'za³±cznik';
+ $lang->source = '¬ród³a wiadomo¶ci';
+ $lang->no_subject = '[Bez tematu]';
+ 
+ $lang->date = 'Data';
+ $lang->to = 'Do';
+ $lang->from = 'Od';
+ $lang->cc = 'Cc';
+ $lang->replyto = 'Odpowiedz-do';
+ $lang->subject = 'Temat';
+ $lang->parts = 'Czê¶ci';
+ 
+ $lang->prev = 'Poprzedni';
+ $lang->next = 'Nastêpny';
+ $lang->delete = 'Skasuj';
+ $lang->reply = 'Odpowiedz';
+ $lang->replyall = 'Odpowiedz wszystkim';
+ $lang->forward = 'Przeka¿ dalej opatruj±c komentarzem';
+ $lang->bounce = 'Podaj dalej';
+ $lang->saveas = 'Zapisz jako';
+ $lang->resume = 'Powtórz';
+ $lang->compose = 'Nowy list';
+ $lang->add_to_contacts = 'Dodaj do ksi±¿ki adresowej';
+ 
+ $lang->delete_error = '<tr><th colspan=2>B³±d; wiadomo¶æ nie zosta³a skasowana z serwera.</td></tr>';
+ 
+ $lang->copy_error = '<B>B³±d przy kopiowaniu.</B>';
+ $lang->move_error = '<B>B³±d przy przesuwaniu.</B>';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/newuser.entro.txt imp-2.2.0-pre5/locale/pl/newuser.entro.txt
*** imp-2.2.0-pre4/locale/pl/newuser.entro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/newuser.entro.txt	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,3 ----
+ <p align="justify">
+ Instrukcje, jakich udzieli³em, zapewne pozwol± zrozumieæ Ci istotê programu.
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/newuser.intro.txt imp-2.2.0-pre5/locale/pl/newuser.intro.txt
*** imp-2.2.0-pre4/locale/pl/newuser.intro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/newuser.intro.txt	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,4 ----
+ <p align="justify">
+ Witaj w programie IMP. Dziêki niemu bêdziesz móg³/a
+ u¿ywaæ poczty elektronicznej pos³uguj±c siê zwyk³± przegl±dark± internetow±."
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/newuser.lang imp-2.2.0-pre5/locale/pl/newuser.lang
*** imp-2.2.0-pre4/locale/pl/newuser.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/newuser.lang	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,13 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->newuser_title = 'Podrêczniki IMPa dla nowych u¿ytkowników';
+ $lang->intro_title = 'Wstêp do czytania poczty przez WWW';
+ 
+ $lang->header_intro = 'Wstêp';
+ $lang->header_start = 'Rozpoczynamy';
+ $lang->header_entro = 'Podsumowanie';
+ $lang->intro_return = 'Powrót do strony logowania';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/newuser.start.txt imp-2.2.0-pre5/locale/pl/newuser.start.txt
*** imp-2.2.0-pre4/locale/pl/newuser.start.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/newuser.start.txt	Sat Aug 28 10:52:43 1999
***************
*** 0 ****
--- 1,49 ----
+ <b>Logowanie</b>
+ <p align="justify">
+ Wszystkie sesje rozpoczynaj± siê ekranem logowania. Zanim bêdziesz mog³ zrobiæ
+ cokolwiek z poczt±, musisz poprawnie zalogowaæ siê do serwera.
+ </p>
+ <p align="justify">
+ Rozpocznij wprowadzaj±c swój identyfikator i has³o do w³a¶ciwych pól. Potem
+ bêdziesz móg³ wskazaæ serwer, z którego chcesz skorzystaæ."
+ </p>
+ <p align="justify">
+ Je¶li ju¿ wype³ni³e¶ te trzy rubryki, kliknij w przycisk "Zaloguj siê".
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Przegl±danie skrzynki</b>
+ <p align="justify">
+ Tu¿ po poprawnym zalogowaniu zostaje wy¶wietlona zawarto¶æ twej skrzynki
+ poczty przychodz±cej. Przegl±daj±c tê zawarto¶æ zobaczysz nastêpuj±ce
+ informacje o ka¿dym li¶cie: status listu, data wys³ania, nadawca, temat,
+ rozmiar. Ka¿da kolumna ma swój nag³owek, klikaj±c w niego powodujesz
+ posortowanie wszystkich listów wed³ug tego w³a¶nie parametru.
+ </p>
+ <p>
+ Aby zobaczyæ zawarto¶æ listu, wska¿ myszk± jego temat. Przeniesiesz siê
+ wówczas do ekranu wiadomo¶ci.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Przegl±danie listu</b>
+ <p align=justify">
+ Przegl±danie listu pokazuje jego tre¶æ. Mo¿esz równie¿ przegl±daæ za³±czniki,
+ odpowiedzieæ na list nadawcy, skasowaæ go, lub przej¶æ do nastêpnego w
+ kolejno¶ci listu.
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>Ekran komponowania listu</b>
+ <p align="justify">
+ Listy mo¿esz wysy³aæ na kilka ró¿nych sposobów. Mo¿esz np. 
+ rozpocz±æ pisanie nowego listu,
+ albo odpowiedzieæ autorowi listu otrzymanego. Którejkolwiek metody nie
+ u¿yjesz, zostanie otwarty ekran komponowania listu.
+ </p>
+ <p align="justify">
+ Ekran komponowania listu pozwala m.in. na wprowadzenie odbiorcy listu, tematu,
+ oraz samego listu. Niêzbêdnymi polami s± adresat oraz tre¶æ, chocia¿ wpisanie
+ tematu równie¿ jest zalecane. Je¶li ju¿ ukoñczy³e¶ komponowanie listu, mo¿esz
+ sprawdziæ jego pisowniê. Aby wys³aæ list, kliknij myszk± w "Wy¶lij".
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/openwin.lang imp-2.2.0-pre5/locale/pl/openwin.lang
*** imp-2.2.0-pre4/locale/pl/openwin.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/openwin.lang	Sat Aug 28 10:52:44 1999
***************
*** 0 ****
--- 1,17 ----
+ <?php
+ 
+ /* You can customize your window sizes for each language here */
+ 
+ 
+ $lang->contact_ldap_width = '600';
+ $lang->contact_ldap_height = '525';
+ $lang->contact_ldap_noaddy_width = '600';
+ $lang->contact_ldap_noaddy_height = '250';
+ $lang->contact_width = '600';
+ $lang->contact_height = '330';
+ $lang->contact_add_width = '500';
+ $lang->contact_add_height = '200';
+ $lang->compose_height = '650';
+ $lang->compose_width = '630' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/prefs.lang imp-2.2.0-pre5/locale/pl/prefs.lang
*** imp-2.2.0-pre4/locale/pl/prefs.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/prefs.lang	Sat Aug 28 10:52:44 1999
***************
*** 0 ****
--- 1,22 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->signature_error = '<tr><th>B³±d; twoja sygnaturka nie zosta³a wprowadzona do systemu.</th></tr>';
+ $lang->language_error = '<tr><th>B³±d; twój jêzyk nie zosta³ wprowadzony do systemu.</th></tr>';
+ $lang->from_error = '<tr><th>B³±d; Twoje pole "Od" nie zosta³o wprowadzone do systemu.</th></tr>';
+ $lang->fullname_error = '<tr><th>B³±d; Twoje pe³ne imiê i nazwisko nie zosta³o wprowadzone do systemu.</th></tr>';
+ 
+ $lang->save_button = ' Zapisz preferencje ';
+ $lang->updated = 'Preferencje zosta³y wprowadzone do systemu.';
+ 
+ $lang->edit_from = 'Zmieñ swoje pole "Od"';
+ $lang->edit_fullname = 'Zmieñ swoje imiê i nazwisko';
+ $lang->edit_lang = 'Wybierz preferowany jêzyk';
+ $lang->edit_sig = 'Zmieñ swoj± sygnaturkê';
+ $lang->sig_dashes = 'Zakoñcz sygnaturkê dwoma my¶lnikami (\'-- \')';
+ 
+ $lang->prefs_title = 'Preferencje IMPa';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/select.lang imp-2.2.0-pre5/locale/pl/select.lang
*** imp-2.2.0-pre4/locale/pl/select.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/select.lang	Sat Aug 28 10:52:44 1999
***************
*** 0 ****
--- 1,9 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ 
+ $lang->select_title = 'Wybierz folder IMPa';
+ $lang->open_folder = 'Otwórz ten folder:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/spelling.lang imp-2.2.0-pre5/locale/pl/spelling.lang
*** imp-2.2.0-pre4/locale/pl/spelling.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/spelling.lang	Sat Aug 28 10:52:44 1999
***************
*** 0 ****
--- 1,10 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->spelling_title = 'Sugestie systemu sprawdzania pisowni';
+ $lang->select_lang_for_ispell = 'Jêzyk';
+ 
+ $lang->no_errors = 'Nie stwierdzi³em ¿adnych b³êdów pisowni.';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/pl/status.lang imp-2.2.0-pre5/locale/pl/status.lang
*** imp-2.2.0-pre4/locale/pl/status.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/pl/status.lang	Sat Aug 28 10:52:44 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ class StatusLocaleLang extends HordeLocaleLang {
+    
+    function StatusLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function mailbox_status ($message, $unread, $recent) {
+       return "$message&nbsp;&nbsp;|&nbsp;&nbsp;$unread nowych, $recent ostatnich";
+    }
+    
+ }
+ 
+ 
+ $lang = new StatusLocaleLang();
+ 
+ 
+ $lang->status_title = 'Linia statusu';
+ $lang->newmail_msg = 'Masz pocztê!';
+ $lang->login_msg = 'Witamy w IMPie. Proszê siê zalogowaæ.';
+ $lang->green = 'Wszystko jest OK';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/compose.help imp-2.2.0-pre5/locale/zh-tw/compose.help
*** imp-2.2.0-pre4/locale/zh-tw/compose.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/compose.help	Sat Oct  2 23:31:42 1999
***************
*** 0 ****
--- 1,43 ----
+ <?php
+ /*
+ compose.help
+ 
+ This is the help for the compose screen.
+ 
+ */
+ $help->add(
+ 	COMPOSE_HELP_FROM,
+ 	'"±H«H€H"ÄæŠì',
+ 	'Š¬«H€H·|Šb«H¥óùتº±H«H€H(From ÄæŠì)¬Ýšìªº±H«H€H¡C³oÀ³žÓ¬O§Aªº Email Šì§}'
+ );
+ $help->add(
+ 	COMPOSE_HELP_TO,
+ 	'Š¬«H€HÄæŠì',
+ 	'³o«Ê«HªºŠ¬«H€Hªº Email Šì§}¡C§A¥i¥H¿é€JŠh­Ó email¡A¥H³rž¹¹j¶}¡CšC­Ó€H³£·|Š¬šì§Aªº«H'
+ );
+ $help->add(
+ 	COMPOSE_HELP_CC,
+ 	'Cc: ÄæŠì',
+ 	'°£€FŠb "Š¬«H€H" ÄæŠìùتº€H¥H¥~¡A§AÁÙ·Q­n°ešìªº email Šì§}¡C'
+ );
+ $help->add(
+ 	COMPOSE_HELP_BCC,
+ 	'Bcc: Field',
+ 	'Šb Cc: ÄæŠìùتºŠ¬«H€H¡A³£¥i¥HŠbŠ¬šìªº«H¥óùجݚ짹Ÿãªº Cc: ŠW³æ¡AŠý¬OŠpªG¥Î Bcc: ªºžÜ¡AŠ¬«H€HŽN¬Ý€£šì³o¥÷ŠW³æ€F¡C'
+ );
+ $help->add(
+ 	COMPOSE_HELP_SUBJECT,
+ 	'ŒÐÃDÄæŠì',
+ 	'«H¥óªºŒÐÃD'
+ );
+ $help->add(
+ 	COMPOSE_HELP_ATTACH,
+ 	'ªþ¥ó',
+ 	'³o¬O¥ÎšÓŠC¥X¥Ø«e«H¥óùØ©Òªþªºªþ¥ó¡A€S¥s§šÀÉ¡C­nªþ€Wªþ¥óÀɮסAœÐ¥ý¿ïŸÜ­nªþ¥óªºÀɮ׊A«ö"§šÀÉ"«ö¶s'
+ );
+ $help->add(
+ 	COMPOSE_HELP_OPTIONS,
+ 	'«H¥ó¿ï¶µ',
+ 	'ŠC¥X¥išÏ¥ÎªºÃB¥~ªº«H¥ó¿ï¶µ'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/compose.lang imp-2.2.0-pre5/locale/zh-tw/compose.lang
*** imp-2.2.0-pre4/locale/zh-tw/compose.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/compose.lang	Sat Oct  2 23:31:43 1999
***************
*** 0 ****
--- 1,81 ----
+ <?php
+ 
+ class ComposeLocaleLang extends HordeLocaleLang {
+   
+   function ComposeLocaleLang () {
+     $this->HordeLocaleLang();
+   }
+   
+   function forwarded_from ($message_source) {
+     return "----- Forwarded message from $message_source -----";
+   }
+   
+ }
+ 
+ 
+ $lang = new ComposeLocaleLang();
+ require './config/lang.php3';
+ require './locale/zh-tw/openwin.lang';
+ 
+ /* plain strings */
+ $lang->action_send = '°e¥X';
+ $lang->action_postpone = 'ŒÈœw±H«H';
+ $lang->action_reply = 'Š^«H:';
+ $lang->action_reply_all = 'Š^«Hµ¹©ÒŠ³€H:';
+ $lang->action_forward = 'Âà±H:';
+ $lang->action_add_attach = 'œsŒg·s«H: €w¥[€J·sªþ¥ó...';
+ $lang->action_del_attach = 'œsŒg·s«H: €w§R°£ªþ¥ó...';
+ $lang->action_compose = 'œsŒg·s«H¥ó';
+ $lang->action_bounce = '°h«H';
+ 
+ $lang->quoting_string = '€Þš¥';
+ $lang->date_string = '€éŽÁ';
+ $lang->from_string = '±H«H€H';
+ $lang->reply_to_string = 'Š^«HŠa§}';
+ $lang->subject_string = 'ŒÐÃD';
+ $lang->to_string = 'Š¬«H€H';
+ $lang->cc_string = 'Cc';
+ $lang->bcc_string= 'Bcc';
+ $lang->attach_string = 'ªþ¥ó';
+ $lang->attach_string_plural = 'ªþ¥ó';
+ 
+ $lang->file_name = 'ÀÉŠW';
+ $lang->file_size = '€j€p';
+ $lang->total_size = '¥þ³¡€j€p';
+ $lang->options = '¿ï¶µ';
+ $lang->sign_message = '¬°§Aªº«H¥ó§@¹q€lñŠW¶Ü?';
+ 
+ $lang->button_attach = '§šÀÉ';
+ $lang->button_cancel = 'šú®ø·s«H¥ó';
+ $lang->button_delete_attach = '§R°£ªþ¥ó';
+ $lang->button_spellcheck = '«÷ŠrÀˬd';
+ $lang->spell_in=' šÏ¥Î';
+ $lang->button_postpone = 'ŒÈœw±H«H';
+ $lang->button_send = '°e¥X«H¥ó';
+ $lang->button_bounce = '°h«H';
+ 
+ $lang->fwd_string = 'Fwd:';
+ $lang->forward_end_string = '-- Âà±H«H¥óµ²§À --';
+ 
+ $lang->alert_specify_file = '§A¥²»Ý­n­n«ü©w­n¥[€Jªþ¥óªºÀɮ׊W';
+ $lang->alert_select_attach_delete = '§A¥²»Ý­n¥ý¿ïŸÜ­n§R°£ªºªþ¥ó¡C';
+ $lang->alert_need_text = '§A¥²»Ý­nŠb·s«HùØ¿é€J€åŠr€~¯à±H«H¡C';
+ $lang->alert_no_signing_support = '¹q€lñŠW¥uŠb Netscape 4.03 ª©¥H€W€~€äŽ©';
+ 
+ $lang->sig_valid_error = "<h2><font color=red>ñŠWœT»{¥¢±Ñ¡A</font> «H¥ó <u>šÃ¥Œ</u> °e¥X!<h2>";
+ $lang->status_bounce_success = '€wŠš¥\ªº°h«H¡C';
+ $lang->status_send_success = '«H¥ó€wŠš¥\ªº³Q°e¥X€F¡C';
+ $lang->status_send_save_error = '«H¥ó€wŠš¥\³Q°e¥X¡AŠý¬OšÃ¥ŒŠsÀÉ¡C';
+ $lang->status_error_fequired_field = '§AšSŠ³¶ñŒg€@šÇ¥²­nªºÄæŠì¡C';
+ $lang->status_postpone_error = '¿ù»~¡AŒÈœw«H¥ó¥¢±Ñ¡C';
+ $lang->status_message_postponed = '«H¥ó€w³QŒÈœw';
+ $lang->status_composition = 'œsŒg«H¥ó€€';
+ $lang->status_cancel = 'šú®øœsŒg·s«H¥ó';
+ 
+ $lang->contacts = 'Šn€ÍŠW³æ';
+ 
+ $lang->alert_attach_file = 'œÐ«ö§šÀÉ«ö¶sšÓªþ€W³o­Óªþ¥ó¡C';
+ $lang->alert_need_recipient = '§A¥²»Ý¿é€JŠ¬«H€HªºŠa§}¡C';
+ 
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/contacts.help imp-2.2.0-pre5/locale/zh-tw/contacts.help
*** imp-2.2.0-pre4/locale/zh-tw/contacts.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/contacts.help	Sat Oct  2 23:31:43 1999
***************
*** 0 ****
--- 1,19 ----
+ <?php
+ /*
+ contacts.help
+ 
+ This is the help for the contacts screen.
+ 
+ */
+ $help->add(
+ 	CONTACTS_HELP_SEARCH,
+ 	'LDAP ·jŽM',
+ 	'LDAP ¥Ø¿ý¬OšÏ¥ÎªÌ±bž¹¡BŠWŠr¡B©M¹q€l¶l¥óŠì§}ªº¯Á€Þ¡C§A¥i¥H§Q¥ÎŠWŠr©Î¬O¹q€l¶l¥óŠì§}šÓ¶iŠæ·jŽM¡C¥u­n§âÃöÁäŠr¶ñ€JšÃ¥B«ö€U "¶}©l·jŽM" ŽNŠn€F¡C'
+ );
+ $help->add(
+ 	CONTACTS_HELP_RESULTS,
+ 	'LDAP ·jŽMµ²ªG',
+ 	'³o­Ó³¡¥÷ŠC¥X LDAP ·jŽMªºµ²ªG¡C¥u­nŠb²M³æùØ¿ïŸÜ¬Y€@­Ó€HŽN¥i¥H§â¥Lªº¹q€l¶l¥óŠì§}©ñšì¥[€J²M³æùØ¡C§A¥i¥H§â¥[€J²M³æùتº€º®e¥[šì«H¥óùتºŠUÄæŠì¡A¥u­n«ö€U€èªº«ö¶sŽNŠn€F¡C'
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/contacts.lang imp-2.2.0-pre5/locale/zh-tw/contacts.lang
*** imp-2.2.0-pre4/locale/zh-tw/contacts.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/contacts.lang	Sat Oct  2 23:31:43 1999
***************
*** 0 ****
--- 1,85 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ /* plain strings */
+ 
+ $lang->all_fields = 'œÐ¶ñº¡Šn€ÍŠW³æùØ©ÒŠ³ªºÄæŠì';
+ 
+ $lang->error_delete_address = '<tr><th>¿ù»~µo¥Í; ³o­Ó¶µ¥ØšÃ¥Œ±qŠn€ÍŠW³æùاR°£¡C</th></tr>';
+ $lang->error_address_chars = '<tr><th>§AŠb emailŠì§}ùؚϥ΀F«DªkªºŠr€ž¡AšÃ€w±q email Šì§}ùاR¥h¡CŠpªG§A·Q­n§ó§ïªºžÜœÐœs¿è email Šì§}¡C</tr></th>';
+ $lang->error_nickname_chars = '<tr><th>§AŠbŒÊºÙÄæŠìùؚϥ΀F«DªkªºŠr€ž¡AšÃ€w±qŒÊºÙÄæŠìùاR¥h¡CŠpªG§A·Q­n§ó§ïªºžÜœÐœs¿èŒÊºÙÄæŠì¡C</tr></th>';
+ $lang->error_fullname_chars = '<tr><th>§AŠb¥þŠWÄæŠìùؚϥ΀F«DªkªºŠr€ž¡AšÃ€w±q¥þŠWÄæŠìùاR¥h¡CŠpªG§A·Q­n§ó§ïªºžÜœÐœs¿è¥þŠWÄæŠì¡C</tr></th>';
+ $lang->error_create_address = '<tr><th>µo¥Í¿ù»~; ³o­Ó¶µ¥ØšÃ¥Œ³Q«Ø¥ß¡C</th></tr>';
+ $lang->error_update_address = '<tr><th>µo¥Í¿ù»~; ³o­Ó¶µ¥ØšÃ¥Œ³Q§ó§ï¡C</th></tr>';
+ 
+ $lang->addressbook_title = 'Šn€ÍŠW³æ';
+ $lang->address_string = 'EmailŠa§}';
+ $lang->nickname_string = 'ŒÊºÙ';
+ $lang->fullname_string = '¥þŠW';
+ $lang->new_address_string = '·sŠì§}';
+ $lang->new_nickname_string = '·sŒÊºÙ';
+ $lang->new_fullname_string = '·s¥þŠW';
+ $lang->delete_string = '§R°£';
+ $lang->change_string = '§ó§ï³o­ÓŠn€Ížê®Æ';
+ 
+ $lang->insert_into_to = ' ©ñšìŠ¬«H€HÄæŠì ';
+ $lang->insert_into_cc = ' ©ñšì Cc: ';
+ $lang->insert_into_bcc = ' ©ñšì Bcc: ';
+ $lang->close_window = ' Ãö³¬µøµ¡ ';
+ $lang->before_search = 'LDAP ·jŽMµ²ªG·|Šb³oùØŠC¥XšÓ¡C';
+ 
+ $lang->action_add_address = '¥[€@­Ó¶µ¥Øšì§AªºŠn€ÍŠW³æùØ';
+ $lang->action_update_address = '§ó·sŠn€ÍŠW³æùتº€@­Ó¶µ¥Ø';
+ $lang->action_delete_address = '±qŠn€ÍŠW³æùاR°£€@­Ó¶µ¥Ø';
+ $lang->action_insert_address = '§âÄæŠìŽ¡€JœsŒg·s«Hµøµ¡€º';
+ 
+ $lang->button_add_address = '¥[€JŠ¹Šì§}';
+ $lang->button_update_address = '§ó·sŠn€Í';
+ $lang->button_delete_address = '§R°£Šn€Í';
+ $lang->button_insert_address = 'ŒW¥[Šn€Í';
+ 
+ $lang->alert_no_compose = '¥uŠ³±qœsŒg·s«Hªºµøµ¡ùتº¶}±ÒªºŠn€ÍŠW³æ€~¯à°õŠæ "©ñšì" Ãþªº¥\¯à¡C';
+ 
+ $lang->no_ldap_server = '§AšSŠ³«ü©w LDAP ŠøªAŸ¹';
+ $lang->no_ldap_connection = 'µLªk»P«ü©wªº LDAP ŠøªAŸ¹«Ø¥ß³sœu¡C';
+ $lang->no_ldap_bind = 'µLªkÃŽ¿£€W LDAP ŠøªAŸ¹¡C';
+ 
+ $lang->too_many_results = '©êºp¡A·jŽMµ²ªG€ÓŠh€F¡AœÐžÕµÛÁY€p·jŽMœd³ò¡C';
+ 
+ $lang->ldap_add = ' ¥[€J ';
+ $lang->ldap_clear = ' ²M°£ ';
+ $lang->ldap_insertaddr = ' ¥[€JŠn€ÍŠW³æ ';
+ 
+ $lang->ldap_no_results = 'šSŠ³§äšìŸAŠXªº¶µ¥Ø';
+ 
+ $lang->search = '·jŽM';
+ $lang->directory = '¥Ø¿ý';
+ $lang->where = 'ªº';
+ $lang->uid = 'UID';
+ $lang->mail = 'E-Mail Šì§}';
+ $lang->sn = '©m';
+ $lang->givenname = 'ŠW';
+ $lang->ou = '³æŠì';
+ $lang->cn = '°êŠW';
+ $lang->begins = '¶}©l©ó';
+ $lang->contains = '§tŠ³';
+ $lang->ends = 'µ²§ô©ó';
+ $lang->is_strict = '¬O (ÄY®æªº»¡)';
+ $lang->is = '¬O';
+ $lang->sounds = 'Å¥°_šÓ¹³';
+ $lang->submit_button = ' ¶}©l·jŽM ';
+ 
+ $lang->mailalternateaddress = 'mailalternateaddress';
+ 
+ $lang->add_contact = ' ¥[€JŠn€ÍŠW³æ ';
+ $lang->del_contact = ' §R°£Šn€ÍŠW³æ ';
+ $lang->update_contact = ' §ó·sŠn€ÍŠW³æ ';
+ $lang->contacts = 'Šn€ÍŠW³æ';
+ $lang->ldapsearch = 'LDAP ·jŽM';
+ $lang->ldapresults = 'LDAP ·jŽMµ²ªG';
+ $lang->select = '¿ïŸÜ ';
+ $lang->add_to_contacts = '¥[€JŠn€ÍŠW³æ';
+ $lang->submit = '°e¥X' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/folders.help imp-2.2.0-pre5/locale/zh-tw/folders.help
*** imp-2.2.0-pre4/locale/zh-tw/folders.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/folders.help	Sat Oct  2 23:31:44 1999
***************
*** 0 ****
--- 1,36 ----
+ <?php
+ /*
+ folders.help
+ 
+ This is the help for the folders screen.
+ 
+ */
+ $help->add(
+ 	FOLDERS_HELP_SUBSCRIBE,
+ 	'­qŸ\',
+ 	'³o­Ó¿ï¶µÅý§A¥i¥H­qŸ\»·ºÝ¥DŸ÷€Wªº IMAP žê®Æ§š¡C¥i¥H¥ÎšÓ§â§Aªº«H¥óšÌºØÃþ
+ 	Šw±Æ©ñžm¡CŠý¬O­nÅý«H¥óŠÛ°ÊšÌºØÃþ©Î¬YºØ¯S©Ê©ñšì­Ó§O«HœcùØ¡A§A»Ý­nšÏ¥ÎŠø
+ 	ªAŸ¹€Wªº€ušã³nÅé¹³¬O procmail ©Î¬O maildrop¡CÃö©ó³o€è­±ªºžê°T¡AœÐÁpµž§A
+ 	ªºŠøªAŸ¹À\²z­û¡C'
+ );
+ $help->add(
+ 	FOLDERS_HELP_UNSUBSCRIBE,
+ 	'šú®ø­qŸ\',
+ 	'³o­Ó¿ï¶µÅý§Ašú®ø­qŸ\ŠøªAŸ¹€W­±ªº«Hœc¡C'
+ );
+ $help->add(
+ 	FOLDERS_HELP_CREATE,
+ 	'«Ø¥ß',
+ 	'³o­Ó¿ï¶µÅý§AŠb»·ºÝªºŠøªAŸ¹€W­±«Ø¥ß€@­Ó·sªº«Hœc¡C'
+ );
+ $help->add(
+ 	FOLDERS_HELP_RENAME,
+ 	'­«·s©RŠW',
+ 	'³o­Ó¿ï¶µÅý§A§â«Hœc­«·s©RŠW¡C'
+ );
+ $help->add(
+ 	FOLDERS_HELP_DELETE,
+ 	'§R°£',
+ 	'³o­Ó¿ï¶µÅý§A§R°£«Hœc¡C'
+ );
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/folders.lang imp-2.2.0-pre5/locale/zh-tw/folders.lang
*** imp-2.2.0-pre4/locale/zh-tw/folders.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/folders.lang	Sat Oct  2 23:31:44 1999
***************
*** 0 ****
--- 1,41 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->delete_folder_error = '<b>¿ù»~</b>: µLªk§R°£«Hœc';
+ $lang->unsub_folder_error = '<b>¿ù»~</b>: µLªkšú®ø­qŸ\«Hœc';
+ $lang->create_folder_error = '<b>¿ù»~</b>: µLªk«Ø¥ß·s«Hœc';
+ $lang->subscribe_folder_error = '<b>¿ù»~</b>: µLªk­qŸ\«Hœc';
+ $lang->rename_folder_error = '<b>¿ù»~</b>: µLªk§ó§ï«HœcŠW';
+ $lang->none_selected = '<b>¿ù»~</b>: §AšÃšSŠ³¿ïŸÜ«Hœc';
+ 
+ $lang->folders_title = '«Hœc';
+ $lang->confirm_delete = '§R°£«Hœc€]·|§â«HœcùØ©ÒŠ³ªº«H¥ó€@šÖ§R°£¡A§AœT©w§A·Q­n³o»ò°µ?';
+ 
+ $lang->subscribe_label = 'ºÞ²z«Hœc';
+ $lang->rename_label = '<font color=black>¬°«Hœc§óŠW</font>';
+ $lang->delete_label = '<font color=black>§R°£«Hœc</font>';
+ $lang->create_label = '<font color=black>«Ø¥ß·s«Hœc</font>';
+ $lang->unsub_label = '<font color=black>šú®ø­qŸ\«Hœc</font>';
+ 
+ $lang->available = '©ÒŠ³ªº«Hœc:';
+ $lang->selected = '¿ïŸÜªº«Hœc:';
+ $lang->add_caption = "ŒW¥[«Hœc";
+ $lang->remove_caption = "§R°£«Hœc";
+ 
+ $lang->unsub = ' šú®ø­qŸ\ ';
+ $lang->subscribe = ' ­qŸ\ ';
+ $lang->rename = '«Hœc­ìŠW:';
+ $lang->renameTo = '§óŠW¬°:';
+ $lang->delete = '«Hœc:';
+ $lang->create = '«Hœc:';
+ 
+ $lang->unsub_button = ' šú®ø­qŸ\«Hœc ';
+ $lang->subscribe_button = ' ­qŸ\«Hœc ';
+ $lang->rename_button = ' ¬°«Hœc§óŠW ';
+ $lang->delete_button = ' §R°£³o­Ó«Hœc ';
+ $lang->create_button = ' ³y·sªº«Hœc ';
+ 
+ // must start with at least five (5) hyphens (-)
+ $lang->select_spacer = '------------------------------';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/help.lang imp-2.2.0-pre5/locale/zh-tw/help.lang
*** imp-2.2.0-pre4/locale/zh-tw/help.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/help.lang	Sat Oct  2 23:31:44 1999
***************
*** 0 ****
--- 1,4 ----
+ <?php
+ 
+ $help_title = 'šD§Uµøµ¡';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/horde.lang imp-2.2.0-pre5/locale/zh-tw/horde.lang
*** imp-2.2.0-pre4/locale/zh-tw/horde.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/horde.lang	Sat Oct  2 23:31:45 1999
***************
*** 0 ****
--- 1,6 ----
+ <?php
+ 
+ $this->imp->selected_messages = '¿ïŸÜªº«H¥óšì:';
+ $this->imp->download = '€Užü';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/ldap.result.lang imp-2.2.0-pre5/locale/zh-tw/ldap.result.lang
*** imp-2.2.0-pre4/locale/zh-tw/ldap.result.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/ldap.result.lang	Sat Oct  2 23:31:45 1999
***************
*** 0 ****
--- 1,7 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->before_search = 'LDAP ªº·jŽMµ²ªG·|¥X²{Šb³o­Óµøµ¡€º¡C';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/ldap.search.lang imp-2.2.0-pre5/locale/zh-tw/ldap.search.lang
*** imp-2.2.0-pre4/locale/zh-tw/ldap.search.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/ldap.search.lang	Sat Oct  2 23:31:45 1999
***************
*** 0 ****
--- 1,36 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->alert_no_compose = '¥uŠ³±qœsŒg·s«Hªºµøµ¡ùتº¶}±ÒªºŠn€ÍŠW³æ€~¯à°õŠæ "©ñšì" Ãþªº¥\¯à¡C';
+ 
+ $lang->no_ldap_server = '§AšSŠ³«ü©w LDAP ŠøªAŸ¹';
+ $lang->no_ldap_connection = 'µLªk»P«ü©wªº LDAP ŠøªAŸ¹«Ø¥ß³sœu¡C';
+ $lang->no_ldap_bind = 'µLªkÃŽ¿£€W LDAP ŠøªAŸ¹¡C';
+ 
+ $lang->too_many_results = '©êºp¡A·jŽMµ²ªG€ÓŠh€F¡AœÐžÕµÛÁY€p·jŽMœd³ò¡C';
+ 
+ $lang->ldap_add = ' ¥[€J ';
+ $lang->ldap_clear = '²M°£';
+ $lang->ldap_insert = '  ';
+ $lang->ldap_insertcc = ' ©ñšì Cc: ';
+ $lang->ldap_insertbcc = ' ©ñšì Bcc: ';
+ $lang->ldap_insertaddr = ' ¥[€JŠn€ÍŠW³æ  ';
+ 
+ $lang->ldap_no_results = 'šSŠ³§äšìŸAŠXªº¶µ¥Ø';
+ 
+ 
+ $lang->uid = 'UID';
+ $lang->mail = 'E-mail Šì§}';
+ $lang->sn = '©m';
+ $lang->givenname = 'ŠW';
+ $lang->ou = '³æŠì';
+ $lang->cn = '°êŠW';
+ $lang->begins = '¶}©l©ó';
+ $lang->contains = '§tŠ³';
+ $lang->ends = 'µ²§ô©ó';
+ $lang->is_strict = '¬O (ÄY®æªº»¡)';
+ $lang->is = '¬O;
+ $lang->sounds = 'Å¥°_šÓ¹³';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/login.help imp-2.2.0-pre5/locale/zh-tw/login.help
*** imp-2.2.0-pre4/locale/zh-tw/login.help	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/login.help	Sat Oct  2 23:31:46 1999
***************
*** 0 ****
--- 1,34 ----
+ <?php
+ /*
+ login.help
+ 
+ This is the help for the login screen.
+ 
+ */
+ $help->add(
+ 	LOGIN_HELP_USERNAME,
+ 	'±bž¹',
+ 	'³o¬O§AŠb¶l¥óŠøªAŸ¹€WªºšÏ¥Î±bž¹¡C'
+ );
+ $help->add(
+ 	LOGIN_HELP_PASSWORD,
+ 	'±KœX',
+ 	'³o¬O¥ÎšÓ«OÅ@§Aªº±bž¹ªº±K»y¡C€p€ß€£­nÅý§O€HªŸ¹D§Aªº±KœX¡CšSŠ³³o­Ó±KœXªºžÜ§AŽNµLªkŠsšú§Aªº¶l¥óšt²Î¡C'
+ );
+ $help->add(
+ 	LOGIN_HELP_SERVER,
+ 	'ŠøªAŸ¹',
+ 	'³o¬OŠsŠ³§Aªº¹q€l¶l¥óªºŠøªAŸ¹¡C³q°T°ð¬OŠøªAŸ¹Ž£šÑªA°Èªº Internet port ¡C(šÒŠp: 143)'
+ );
+ $help->add(
+ 	LOGIN_HELP_FOLDERS,
+ 	'¶l¥ó§š',
+ 	'"¶l¥ó§š" ¬O¬Û¹ï©ó§Aªº®a¥Ø¿ý€U¡AŠs©ñ¶l¥óªº¥Ø¿ýŠWºÙ¡CŠpªG§Aªº¶l¥ó©ñŠb $HOME/Mail/ €U­±; šº»ò§A¥u»Ý­n¿é€J Mail/¡C(œÐ€p€ß¡AUnix št²Î€j€pŒgŠ³€À)'
+ );
+ $help->add(
+         LOGIN_HELP_LANGUAGE,
+         '¿ïŸÜ»yš¥',
+         '§A¥i¥H¿ïŸÜŠbšÏ¥Î IMP ®É·Q­nšÏ¥Îªº»yš¥Àô¹Ò¡C'
+ );
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/login.lang imp-2.2.0-pre5/locale/zh-tw/login.lang
*** imp-2.2.0-pre4/locale/zh-tw/login.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/login.lang	Sat Oct  2 23:31:46 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->welcome_to_imp		= 'ÅwªïšÏ¥Î IMP';
+ $lang->javascript_needed	= 'IMP ¶l¥óšt²Î»Ý­n JavaScript €~¯àšÏ¥Î¬YšÇ¥\¯à¡C';
+ $lang->user_name		= '±bž¹';
+ $lang->password			= '±KœX';
+ $lang->server			= '¥DŸ÷';
+ $lang->server_port		= '³q°T°ð';
+ $lang->folders			= '«Hœc';
+ $lang->log_in			= 'µn€J';
+ $lang->language         = '»yš¥';
+ 
+ $lang->login = '';
+ $lang->timeout = '§Aªºµn€J¿ù»~©Î¬O€wžg¶W¹L®É¶¡¡AœÐ­«·sµn€J¡C';
+ $lang->logout = '§A€wžgµn¥X IMP ¶l¥óšt²Î¡AÁÂÁ§AªºšÏ¥Î¡C';
+ $lang->nocert = '§A»Ý­nŠ³®Äªº«È€áºÝ»{ÃÒ€~¯àŠsšú³o­Ó¯ž¥x';
+ 
+ $lang->newuser_link = '·sšÏ¥ÎªÌ²€¶';
+ $lang->alert_user_pass = 'œÐ¿é€J§Aªº±bž¹©M±KœX';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/mailbox.lang imp-2.2.0-pre5/locale/zh-tw/mailbox.lang
*** imp-2.2.0-pre4/locale/zh-tw/mailbox.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/mailbox.lang	Sat Oct  2 23:31:46 1999
***************
*** 0 ****
--- 1,107 ----
+ <?php
+ 
+ if ($language == 'zh-tw') {
+   class MailboxLocaleLang extends HordeLocaleLang {
+     
+     function MailboxLocaleLang () {
+       $this->HordeLocaleLang();
+     }
+     
+     function error ($current_mbox, $action) {
+       global $lang;
+       
+       $action_text = $lang->$action;
+       return "«Hœc: $current_mbox: µo¥Í¿ù»~: «H¥ó $action_text ¥¢±Ñ";
+     }
+     
+     function success1 ($current_mbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = '«Ê«H';
+       else $messages = '«Ê«H';
+       
+       $action_text = $lang->$action;
+       return "«Hœc $current_mbox: $action_text $num $messages";
+     }
+     
+     function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = '«Ê«H';
+       else $messages = '«Ê«H';
+       
+       $action_text = $lang->$action;
+       return "«Hœc: $current_mbox: $action_text $num $messages šì $targetMbox";
+     }
+     
+     function pagenav ($page, $page_count) {
+       global $this_client;
+       if ($this_client == '') { $this_client = new WebClient; }
+       
+       if ($this_client->lynx) {
+ 	return "²Ä $page €§ $page_count ­¶";
+       } else {
+ 	return "²Ä <input type=\"text\" name=\"page\" value=\"$page\" size=\"2\"> ­¶¡AŠ@ $page_count ­¶";
+       }
+     }
+     
+     function overview ($begin, $end, $nummsgs) {
+       if ($nummsgs == 0) {
+ 	return "šSŠ³«H";
+       } else if ($nummsgs == 1) {
+ 	return "€@«Ê«H";
+       } else {
+ 	return "²Ä $begin - $end «Ê«H¡AŠ@ $nummsgs «Ê«H";
+       }
+     }
+   }
+ }
+ 
+ $lang = new MailboxLocaleLang();
+ require './locale/zh-tw/openwin.lang';
+ 
+ $lang->delete_link = '§R°£';
+ $lang->undelete_link = 'Š^Ž_';
+ $lang->move_link = '·h²Ÿ';
+ $lang->copy_link = '«þš©';
+ $lang->selected_mail = '¿ïŸÜ«H¥ó';
+ 
+ $lang->sort_by_label =  '±Æ§Ç¥H';
+ $lang->date_label = '€éŽÁ';
+ $lang->from_label = '±H«H€H';
+ $lang->subject_label = 'ŒÐÃD';
+ $lang->size_label = '<pre>€j€p</pre>';
+ $lang->to_label = 'Š¬«H€H';
+ 
+ $lang->select_all = '¥þ¿ï';
+ $lang->select_none = 'šú®ø¿ïŸÜ';
+ $lang->hide_deleted = 'ÁôÂÿïŸÜªº«H¥ó';
+ $lang->show_deleted = 'Åã¥Ü¿ïŸÜªº«H¥ó';
+ $lang->empty_trash = '²MªÅ©U§£±í';
+ 
+ $lang->no_subject = '[šSŠ³ŒÐÃD]';
+ $lang->undisclosed_recipients = 'Š¬«HŠa§}€w³QÁôÂÃ';
+ $lang->mailbox = '«Hœc';
+ 
+ $lang->message = '«H¥ó';
+ $lang->messages = '«H¥ó';
+ 
+ $lang->deletion = '§R°£';
+ $lang->deleted = '€w§R°£';
+ $lang->undeletion = 'Š^Ž_';
+ $lang->undeleted = '€wŽ_';
+ $lang->move = '·h²Ÿ';
+ $lang->moved = '€w·h²Ÿ';
+ $lang->copy = '«þš©';
+ $lang->copied = '€w«þš©';
+ $lang->expunge = '²M°£';
+ $lang->expunged = '€w²M°£';
+ $lang->hiding_deleted = 'ÁôÂÿïŸÜªº«H¥ó';
+ $lang->showing_deleted = 'Åã¥Ü¿ïŸÜªº«H¥ó';
+ $lang->deleted_summary = '«Ê§R°£ªº«H¥ó€w±qŠCªí€€ÁôÂð_šÓ';
+ $lang->empty_mailbox = '³o­Ó«HœcùØšSŠ³«H¥ó';
+ 
+ $lang->reverse_sort = '€ÏŠV±Æ§Ç(±q³Ì·s©Î³Ì€jŽ«Šš³Ì©γ̀pªº¶¶§Ç)';
+ 
+ $lang->refresh = '­«·sŸã²z«Hœc';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/menu.lang imp-2.2.0-pre5/locale/zh-tw/menu.lang
*** imp-2.2.0-pre4/locale/zh-tw/menu.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/menu.lang	Sat Oct  2 23:31:47 1999
***************
*** 0 ****
--- 1,23 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require './locale/zh-tw/openwin.lang';
+ 
+ $lang->login_again = 'œÐ­«·sµn€J';
+ $lang->contacts = 'Šn€ÍŠW³æ';
+ $lang->login = 'µn€J';
+ $lang->inbox = '«Hœc';
+ $lang->compose = 'œsŒg·s«H';
+ $lang->folders = 'ºÞ²z«Hœc';
+ $lang->manage_files = 'ºÞ²zÀÉ®×';
+ $lang->prefs = '°ŸŠn³]©w';
+ $lang->change_password = '§ïÅܱKœX';
+ $lang->view_log = 'Æ[¬Ý°O¿ýÀÉ';
+ $lang->logout = 'µn¥X';
+ $lang->faq = 'FAQ';
+ $lang->ldap_search = 'LDAP ·jŽM';
+ $lang->problem = 'Š³°ÝÃD?';
+ $lang->signup = 'Signup';
+ $lang->horde = 'Horde';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/message.lang imp-2.2.0-pre5/locale/zh-tw/message.lang
*** imp-2.2.0-pre4/locale/zh-tw/message.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/message.lang	Sat Oct  2 23:31:47 1999
***************
*** 0 ****
--- 1,65 ----
+ <?php
+ 
+ class MessageLocaleLang extends HordeLocaleLang {
+    
+    function MessageLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function message_status ($current_mbox, $msg_index, $num) {
+       return "$current_mbox: $msg_index €§ $num «Ê";
+    }
+    
+    function back_to ($current_mbox) {
+       return "Š^šì $current_mbox";
+    }
+ 
+    function success2 ($current_mbox, $targetMbox, $action, $num, $plural = false) {
+       global $lang;
+       
+       if ($plural) $messages = '«Ê«H';
+       else $messages = '«Ê«H';
+       
+       $action_text = $lang->$action;
+       return "«Hœc: $current_mbox: $action_text $num $messages šì $targetMbox";
+    }
+ 
+ }
+ 
+ 
+ $lang = new MessageLocaleLang();
+ $lang->imp->selected_messages = '³o«Ê«Hšì:';
+ require './locale/zh-tw/openwin.lang';
+ 
+ $lang->move_link = '·h²Ÿ';
+ $lang->copy_link = '«þš©';
+ $lang->moved = '€w·h²Ÿ';
+ $lang->copied = '€w«þš©';
+ 
+ $lang->attachment = 'ªþ¥ó';
+ $lang->source = '(­ì©l€º®e)';
+ $lang->no_subject = '[šSŠ³ŒÐÃD]';
+ 
+ $lang->date = '€éŽÁ';
+ $lang->to = 'Š¬«H€H';
+ $lang->from = '±H«H€H';
+ $lang->cc = 'Cc';
+ $lang->replyto = 'Š^«HŠa§}';
+ $lang->subject = 'ŒÐÃD';
+ $lang->parts = 'ªþ¥ó';
+ 
+ $lang->prev = '«e€@«Ê';
+ $lang->next = '€U€@«Ê';
+ $lang->delete = '§R°£';
+ $lang->reply = 'Š^«H';
+ $lang->replyall = 'Š^«Hµ¹©ÒŠ³€H';
+ $lang->forward = 'Âà±H';
+ $lang->bounce = '°h«H';
+ $lang->saveas = 'ŠsÀÉ';
+ $lang->compose = 'œsŒg·s«H¥ó';
+ $lang->add_to_contacts = '¥[€JŠn€Í';
+ 
+ $lang->delete_error = '<tr><th colspan=2>µo¥Í¿ù»~¡A§Aªº«H¥óšÃšSŠ³³Q§R°£¡C</td></tr>';
+ $lang->copy_error = '<B>«þš©¥¢±Ñ</B>';
+ $lang->move_error = '<B>·h²Ÿ¥¢±Ñ</B>';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/newuser.entro.txt imp-2.2.0-pre5/locale/zh-tw/newuser.entro.txt
*** imp-2.2.0-pre4/locale/zh-tw/newuser.entro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/newuser.entro.txt	Sat Oct  2 23:31:47 1999
***************
*** 0 ****
--- 1,4 ----
+ <p align="justify">
+ §Æ±æ¥H€Wªº€¶²Ð¥i¥HÅý§A¹ï³o­Ó webmailªº€¶­±Š³©Ò€FžÑ¡C·í§A€£¶È¥i¥H«Ü®e©öªºŸ\Ū©M
+ Œ¶Œg«H¥óŠÓ¥BÁÙ¥i¥HºÞ²z§Aªº IMAP ±bž¹€§«á¡A§A€@©w·|ı±o§ó»ŽÃPŽr§Öªº¡C
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/newuser.intro.txt imp-2.2.0-pre5/locale/zh-tw/newuser.intro.txt
*** imp-2.2.0-pre4/locale/zh-tw/newuser.intro.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/newuser.intro.txt	Sat Oct  2 23:31:48 1999
***************
*** 0 ****
--- 1,5 ----
+ <p align="justify">
+ ÅwªïšÏ¥Î IMAP webMail Program(ÁYŒg¬° IMP)¹q€l¶l¥óšt²Î!
+ ³z¹L IMPªœÄ±©ÊªºšÏ¥Î€¶­±¡A
+ §A¥i¥H§Q¥Î€@¯ëªºÂsÄýŸ¹¥\¯àšÓŠsšúšÃºÞ²z§Aªº¹q€l¶l¥ó±bž¹¡C
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/newuser.lang imp-2.2.0-pre5/locale/zh-tw/newuser.lang
*** imp-2.2.0-pre4/locale/zh-tw/newuser.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/newuser.lang	Sat Oct  2 23:31:48 1999
***************
*** 0 ****
--- 1,13 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ $lang->newuser_title = 'IMP ¶l¥óšt²ÎšÏ¥Î²€¶';
+ $lang->intro_title = 'Webmail €¶²Ð';
+ 
+ $lang->header_intro = '²€¶';
+ $lang->header_start = '±qÀY¶}©l';
+ $lang->header_entro = 'µ²»y';
+ $lang->intro_return = 'Š^šìµn€Jµe­±';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/newuser.start.txt imp-2.2.0-pre5/locale/zh-tw/newuser.start.txt
*** imp-2.2.0-pre4/locale/zh-tw/newuser.start.txt	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/newuser.start.txt	Sat Oct  2 23:31:48 1999
***************
*** 0 ****
--- 1,42 ----
+ <b>µn€J</b>
+ <p align="justify">
+ ©ÒŠ³ªºšÏ¥Î¹Lµ{³£¥Ñµn€J¶}©l¡CŠb§AšÏ¥Î¥ôŠó¥\¯à€§«e¡A§A³£€@©w­nšÏ¥ÎºôžôºÞ²zªÌ
+ °tµoµ¹§Aªº±bž¹©M±KœXšÓµn€J§Aªº IMAP ŠøªA¥DŸ÷¡C
+ </p>
+ <p align="justify">
+ €@¶}©l¡A§A¥ý§â±bž¹©M±KœX¿é€JšìŸA·íªºÄæŠìùØ¡CµM«áŠA¿ïŸÜ§A·Q­n³sµ²ªº¶l¥óŠøªAŸ¹¡C
+ </p>
+ <p align="justify">
+ Šb§A¿é€J€F³oŽX­ÓÄæŠì€§«á¡AœÐ«ö "µn€J" «ö¶s¶iŠæµn€J¡C
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>«H¥óŠCªí</b>
+ <p align="justify">
+ §Aªº«HœcùØ­±ªº«H¥óŠbµn€J€§«áŽN·|ŠC¥XšÓ¡C³o­ÓŠCªí®i¥Ü€FšC€@«Ê«Hªº«HÀY(
+ «H¥óª¬ºA¡B±H«H€éŽÁ¡B±H«H€H¡BŒÐÃD¡B©M®e¶q€j€p)¡CšC€@­ÓÄæŠìªº¶}ÀY³£Š³€@­ÓŒÐÀY¡A
+ ŠbŒÐÀY€W­±«ö€@€U¡A§Aªº«H¥óŽN·|šÌšº­ÓŒÐÀYªº©Êœè­«·s±ÆŠC¡C
+ </p>
+ <p>
+ ­n¬Ý«H¥óªº€º®eªºžÜ¡A¥u­nŠb«H¥óªºŒÐÃD€W­±«ö€@€U¡AŽN·|±a¥X«H¥óªº€º®e¡C
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>«H¥ó€º®e</b>
+ <p align=justify">
+ ³oùØ®i¥Ü€F§A©Ò¿ïŸÜ«H¥óªº€º®e¡CŠb³o­Óµe­±ùاA¥i¥HÂsÄýªþ¥óªº€º®e¡BŠ^«H¡B§R°£«H¥ó¡B
+ ©Î¬O¬Ý«Hœcùتº€U€@«Ê«H¡C
+ <hr size="1" width="98%" align="center" noshade>
+ </p>
+ 
+ <b>œsŒg·s«Hªºµøµ¡</b>
+ <p align="justify">
+ §A·|Šb€£ŠPªº±¡ªp€U­±œsŒg·s«H¡C§A€]³\¿ïŸÜ€F¿ï³æùتºœsŒg·s«H¡A©Î¬O¿ïŸÜ€FŠ^ÂЬY€H
+ ªº«H¥ó¡C€£ºÞ¬Ošº€@ºØ±¡ªp¡A§A³£·|¬Ýšì³o­Óµøµ¡¡C
+ </p>
+ <p align="justify">
+ œsŒg·s«Hªºµøµ¡¥i¥HÅý§A³]©wŠ¬«H€HªºŠa§}¡B«H¥óªºŒÐÃD¡B©M«H¥óªº€º®e¡C§A¥u­n¶ñŠnŸA
+ ·íªºÄæŠì(šä¹ê¥uŠ³Š¬«H€H€@Äæ¬O¥²»Ý¶ñŒgªº¡AŠý¬O«Øij§A€]¶ñŒgŒÐÃDÄæ)µM«á§â§Aªº«H¥ó
+ €º®e¶ñŒgšì€U€è³Ì€jªºšº­ÓÄæŠìùØŽN¥i¥H€F¡C§AŒg§¹«H¥ó¥H«á¡A¥i¥H¹ï«H¥ó€º®e§@«÷ŠrÀË
+ ¬d¡C·í§A§@Šn€F€§«á¡A«ö "°e¥X«H¥ó" «ö¶s§â§Aªº«H¥ó°ešìŠ¬«H€HšºùØ¡C
+ </p>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/openwin.lang imp-2.2.0-pre5/locale/zh-tw/openwin.lang
*** imp-2.2.0-pre4/locale/zh-tw/openwin.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/openwin.lang	Sat Oct  2 23:31:49 1999
***************
*** 0 ****
--- 1,17 ----
+ <?php
+ 
+ /* You can customize your window sizes for each language here */
+ 
+ 
+ $lang->contact_ldap_width = '600';
+ $lang->contact_ldap_height = '525';
+ $lang->contact_ldap_noaddy_width = '600';
+ $lang->contact_ldap_noaddy_height = '250';
+ $lang->contact_width = '600';
+ $lang->contact_height = '330';
+ $lang->contact_add_width = '500';
+ $lang->contact_add_height = '200';
+ $lang->compose_height = '650';
+ $lang->compose_width = '630' ;
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/passwd.lang imp-2.2.0-pre5/locale/zh-tw/passwd.lang
*** imp-2.2.0-pre4/locale/zh-tw/passwd.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/passwd.lang	Sat Oct  2 23:31:49 1999
***************
*** 0 ****
--- 1,23 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->changing_passwd		= 'Åܧó¹q€l¶l¥ó±KœX';
+ $lang->user_name			= '±bž¹';
+ $lang->old_password			= '±KœX';
+ $lang->new_password			= '·s±KœX';
+ $lang->retype				= 'œT»{·s±KœX';
+ $lang->change_passwd		= '§ó§ï±KœX';
+ 
+ $lang->error[ 'error' ]		= '¿ù»~';
+ $lang->error[ 'errormsg' ]	= 'Šb³B²z§Aªº­nšD®Éµo¥Í€F¥H€U¿ù»~:';
+ $lang->error[ 'nopermission' ] = '€£€¹³\Åܧó±KœX';
+ $lang->error[ 'setting' ] 	= 'ŠøªAŸ¹ªºŠì§}©M port ž¹œX³]©w¿ù»~';
+ $lang->error[ 'username' ]	= '¿ù»~ªº±bž¹ŠW¡A¥²»Ý­nžò²{Šbµn€Jªº±bž¹¬ÛŠP¡C';
+ $lang->error[ 'old_pass' ]	= 'ªº±KœX¿é€J¿ù»~';
+ $lang->error[ 'new_pass_ne' ] = 'œT»{ªº·s±KœXšâªÌ€£²ÅŠX';
+ $lang->error[ 'short_pass' ] = '·s±KœX€Óµu';
+ $lang->errot[ 'no_connect' ]	= 'µLªk³sµ²šì±KœXŠøªAŸ¹';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/prefs.lang imp-2.2.0-pre5/locale/zh-tw/prefs.lang
*** imp-2.2.0-pre4/locale/zh-tw/prefs.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/prefs.lang	Sat Oct  2 23:31:49 1999
***************
*** 0 ****
--- 1,22 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->signature_error ='<tr><th>Š³¿ù»~µo¥Í¡A§AªºÃ±ŠWÀɚ匳Q§ó·s¡C</th></tr>';
+ $lang->language_error ='<tr><th>Š³¿ù»~µo¥Í¡A§Aªº¹w³]»yš¥Àô¹ÒšÃ¥Œ³Q§ó·s¡C</th></tr>';
+ $lang->from_error ='<tr><th>Š³¿ù»~µo¥Í¡A§Aªº¹w³]±H«H€HÄæŠìšÃ¥Œ³Q§ó·s¡C</th></tr>';
+ $lang->fullname_error = '<tr><th>Š³¿ù»~µo¥Í¡A§Aªº¥þŠWšÃ¥Œ³Q§ó·s¡C</th></tr>';
+ 
+ $lang->save_button = ' ÀxŠs°ŸŠn³]©w ';
+ $lang->updated = '°ŸŠn³]©w€w§ó·s';
+ 
+ $lang->edit_from = 'œs¿è¹w³]±H«H€HÄæŠì';
+ $lang->edit_fullname = 'œs¿è§Aªº¥þŠW';
+ $lang->edit_lang = '¿ïŸÜ§A¹w³]ªº»yš¥Àô¹Ò';
+ $lang->edit_sig = 'œs¿èñŠWÀÉ';
+ $lang->sig_dashes = 'ŠbñŠW«e­±¥[€WŸîœu (\'-- \')';
+ 
+ $lang->prefs_title = 'IMP ¶l¥óšt²ÎšÏ¥ÎªÌ°ŸŠn³]©w';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/select.lang imp-2.2.0-pre5/locale/zh-tw/select.lang
*** imp-2.2.0-pre4/locale/zh-tw/select.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/select.lang	Sat Oct  2 23:31:50 1999
***************
*** 0 ****
--- 1,9 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ 
+ 
+ $lang->select_title = '¿ïŸÜ«Hœc';
+ $lang->open_folder = '¥Ž¶}«Hœc:';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/spelling.lang imp-2.2.0-pre5/locale/zh-tw/spelling.lang
*** imp-2.2.0-pre4/locale/zh-tw/spelling.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/spelling.lang	Sat Oct  2 23:31:50 1999
***************
*** 0 ****
--- 1,10 ----
+ <?php
+ 
+ $lang = new HordeLocaleLang();
+ require('./config/lang.php3');
+ 
+ $lang->spelling_title = 'Ãö©ó«÷Šr€è­±ªº«Øij';
+ $lang->select_lang_for_ispell = '»yš¥';
+ 
+ $lang->no_errors = 'µL«÷Šr¿ù»~';
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/locale/zh-tw/status.lang imp-2.2.0-pre5/locale/zh-tw/status.lang
*** imp-2.2.0-pre4/locale/zh-tw/status.lang	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/locale/zh-tw/status.lang	Sat Oct  2 23:31:50 1999
***************
*** 0 ****
--- 1,24 ----
+ <?php
+ 
+ class StatusLocaleLang extends HordeLocaleLang {
+    
+    function StatusLocaleLang () {
+       $this->HordeLocaleLang();
+    }
+    
+    function mailbox_status ($message, $unread, $recent) {
+       return "$message&nbsp;&nbsp;|&nbsp;&nbsp;$unread «Ê¥ŒÅª«H, $recent «Ê·s«H";
+    }
+    
+ }
+ 
+ 
+ $lang = new StatusLocaleLang();
+ 
+ 
+ $lang->status_title = 'ª¬ºAŠC';
+ $lang->newmail_msg = '§AŠ³·s«H!';
+ $lang->login_msg = 'ÅwªïšÏ¥Î IMP ¶l¥óšt²Î¡AœÐµn€J¡C';
+ $lang->green = 'št²Î€@€Á¥¿±`';
+ 
+ ?>
diff -r -N -C 2 imp-2.2.0-pre4/mailbox.php3 imp-2.2.0-pre5/mailbox.php3
*** imp-2.2.0-pre4/mailbox.php3	Thu Aug 26 15:22:16 1999
--- imp-2.2.0-pre5/mailbox.php3	Tue Oct  5 16:53:45 1999
***************
*** 2,19 ****
  
  /*
!  
!  File: mailbox.php3
!  $Author: chuck $
!  $Revision: 2.29.2.16 $
!  $Date: 1999/08/26 19:22:16 $
!  
!  IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
!  
!  You should have received a copy of the GNU Public
!  License along with this package; if not, write to the
!  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!  Boston, MA 02111-1307, USA.
!  
!  */
  
  /* display_toaddress: check the user's address and list of addresses that To: should be displayed for */
--- 2,34 ----
  
  /*
!   
!   File: mailbox.php3
!   $Author: chuck $
!   $Revision: 2.29.2.20 $
!   $Date: 1999/10/05 20:53:45 $
!   
!   IMP: Copyright 1999 Charles J. Hagenbuch <chuck@horde.org>
!   
!   You should have received a copy of the GNU Public
!   License along with this package; if not, write to the
!   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!   Boston, MA 02111-1307, USA.
!   
! */
! 
! 
! /* array of months for faster/cleaner code */
! $Months = array('jan' => '01',
! 		'feb' => '02',
! 		'mar' => '03',
! 		'apr' => '04',
! 		'may' => '05',
! 		'jun' => '06',
! 		'jul' => '07',
! 		'aug' => '08',
! 		'sep' => '09',
! 		'oct' => '10',
! 		'nov' => '11',
! 		'dec' => '12');
  
  /* display_toaddress: check the user's address and list of addresses that To: should be displayed for */
***************
*** 217,221 ****
  
  if ($default->user_use_folders) {
!   $options = mailbox_list($imp->mailbox);
  }
  
--- 232,236 ----
  
  if ($default->user_use_folders) {
!   $options = mailbox_list(true);
  }
  
***************
*** 349,426 ****
      $sub = '';
      $msg_size = '?';
-     
      /* now pull the IMAP header values into them, decoding and chopping them at the same time */
      
!     /* formats the header date string nicely             */
!     /* ignores the timezone info for now                 */
!     /* new code by: David R Bosso <dbosso@ltsc.ucsb.edu> */
!     if (isset($h->date)) {
!       $date = $h->date;
!       if (ord($date) > 64) {             // nuke leading day if it exists
! 	$date = substr($date, 5);
!       }
!       $dateparts = explode(' ', trim($date));
!       if (strlen($dateparts[0]) == 1)    // pad days with 0
! 	$dateparts[0] = '0' . $dateparts[0];
!       // cjh: compensate for messages with the year in the wrong place (mostly IMP's fault; fixed now)
!       if (strlen($dateparts[2]) != 2 && strlen($dateparts[2]) != 4) {
! 	$tmp = $dateparts[2];
! 	$dateparts[2] = $dateparts[3];
! 	$dateparts[3] = $tmp;
!       }
!       if (strlen($dateparts[2]) == 2)    // get 4 digit year
! 	if ($dateparts[2] > 70)
! 	  $dateparts[2] = '19' . $dateparts[2];
! 	else $dateparts[2] = '20'.$dateparts[2];
!       $timeparts = explode(':', $dateparts[3]);  // separate time parts
!       if (strlen($timeparts[0]) == 1)    // pad hours with 0
! 	$timeparts[0] = '0' . $timeparts[0];
!       $dateparts[3] = $timeparts[0] . ':' . $timeparts[1];  // time - HH:MM
!       switch ($dateparts[1]) {           // get a month number
!       case 'Jan':
! 	$monthnum='01';
! 	break;
!       case 'Feb':
! 	$monthnum='02';
! 	break;
!       case 'Mar':
! 	$monthnum='03';
! 	break;
!       case 'Apr':
! 	$monthnum='04';
! 	break;
!       case 'May':
! 	$monthnum='05';
! 	break;
!       case 'Jun':
! 	$monthnum='06';
! 	break;
!       case 'Jul':
! 	$monthnum='07';
! 	break;
!       case 'Aug':
! 	$monthnum='08';
! 	break;
!       case 'Sep':
! 	$monthnum='09';
! 	break;
!       case 'Oct':
! 	$monthnum='10';
! 	break;
!       case 'Nov':
! 	$monthnum='11';
! 	break;
!       default:
! 	$monthnum='12';
!       }
!       
!       // set $date for sorting
!       $date = $dateparts[2] . $monthnum . $dateparts[0] . $timeparts[0] . $timeparts[1];
!       if ($dateparts[2]!=date('Y')) { // if it's not this year use // MM/DD/YY
! 	$dat = $monthnum.'/'.$dateparts[0].'/'.substr($dateparts[2],2);
!       } else if ((date('M')!=$dateparts[1]) || (date('d')!=$dateparts[0])) { // not today, use DD MMM
! 	$dat = $dateparts[0] . ' ' . $dateparts[1];
        } else { // else it's today, use the time HH:MM
! 	$dat = $dateparts[3]; // cjh: make this 12hr and add am/pm?
        }
      }
--- 364,379 ----
      $sub = '';
      $msg_size = '?';
      /* now pull the IMAP header values into them, decoding and chopping them at the same time */
      
!     /* formats the header date string nicely */
!     if (empty($h->udate)) {
!       $dat = '';
!     } else {
!       if (date('Y', $h->udate) != date('Y')) { // if it's not this year use // MM/DD/YY
! 	$dat = strftime('%m/%d/%Y', $h->udate);
!       } else if ((date('M') != date('M', $h->udate)) || (date('d') != date('d', $h->udate))) { // not today, use DD MMM
! 	$dat = strftime('%d %b', $h->udate);
        } else { // else it's today, use the time HH:MM
! 	$dat = strftime('%l:%M %p', $h->udate); // cjh: make this 12hr and add am/pm?
        }
      }
***************
*** 471,475 ****
        /* Only one part in message, check for an attachment */
        $mime = new mime_part_data;
!       $mime->set_imap_data($msgnum, 0);
        $mime->parse($structure);
        if ($mime->type_text != 'text' || $mime->subtype != 'plain' )
--- 424,428 ----
        /* Only one part in message, check for an attachment */
        $mime = new mime_part_data;
!       $mime->set_imap_data($msgnum, 0, $imp->mailbox);
        $mime->parse($structure);
        if ($mime->type_text != 'text' || $mime->subtype != 'plain' )
diff -r -N -C 2 imp-2.2.0-pre4/message.php3 imp-2.2.0-pre5/message.php3
*** imp-2.2.0-pre4/message.php3	Tue Aug 24 13:05:50 1999
--- imp-2.2.0-pre5/message.php3	Wed Oct 13 22:45:14 1999
***************
*** 5,10 ****
    File: message.php3
    $Author: chuck $
!   $Revision: 2.23.2.9 $
!   $Date: 1999/08/24 17:05:50 $
    
    IMP: Copyright 1998, 1999 Charles J. Hagenbuch <chuck@horde.org>
--- 5,10 ----
    File: message.php3
    $Author: chuck $
!   $Revision: 2.23.2.17 $
!   $Date: 1999/10/14 02:45:14 $
    
    IMP: Copyright 1998, 1999 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 59,63 ****
      
      $mime = new mime_part_data;
!     $mime->set_imap_data($index, $aref);
      $mime->parse($p);
      // we only display the first text part (we can change it to
--- 59,63 ----
      
      $mime = new mime_part_data;
!     $mime->set_imap_data($index, $aref, $imp->mailbox);
      $mime->parse($p);
      // we only display the first text part (we can change it to
***************
*** 80,83 ****
--- 80,85 ----
        if ($mime->encoding == ENCQUOTEDPRINTABLE) {
  	$tmsg = imap_qprint($tmsg);
+       } else if ($mime->encoding == ENCBASE64) {
+ 	$tmsg = imap_base64($tmsg);
        }
        
***************
*** 99,102 ****
--- 101,109 ----
        }
        $charset = $mime->charset;
+       
+       if (strtolower($charset) == 'windows-1251') {
+         $tmsg = convert_cyr_string($tmsg, 'w', 'k');
+       }
+       
        if ($textpart > 0) {
  	$msg = $msg . '</pre></td></tr><tr><td></td></tr><tr><td bgcolor="' . $default->text_bg . '"><pre>' . $tmsg;
***************
*** 200,204 ****
  $imp->authenticate();
  $sorted = explode(':', $imp->msgl);
! if ($array_index == count($sorted)-1 || $array_index == 0) {
    $sorted = messageRange(imap_sort($imp->stream, $imp->sortby, $imp->sortdir, SE_UID), $array_index + $imp->offset + 1, &$offset, &$array_index);
    $imp->msgl = implode(':', $sorted);
--- 207,211 ----
  $imp->authenticate();
  $sorted = explode(':', $imp->msgl);
! if ($array_index == count($sorted)-1 || $array_index == 0 || (isset($actionID) && ($actionID == DELETE_MESSAGES || $actionID == MOVE_MESSAGES || $actionID == COPY_MESSAGES) && $array_index == count($sorted)-2)) {
    $sorted = messageRange(imap_sort($imp->stream, $imp->sortby, $imp->sortdir, SE_UID), $array_index + $imp->offset + 1, &$offset, &$array_index);
    $imp->msgl = implode(':', $sorted);
***************
*** 223,226 ****
--- 230,234 ----
        }
        $array_index++;
+       $msgindex++;
        $index = $sorted[$array_index];
      }
***************
*** 237,240 ****
--- 245,249 ----
  	$status_color = 'green';
  	$array_index++;
+ 	$msgindex++;
  	$index = $sorted[$array_index];
        }
***************
*** 257,260 ****
--- 266,270 ----
  	$status_color = 'green';
  	$array_index++;
+ 	$msgindex++;
  	$index = $sorted[$array_index];
        }
***************
*** 270,274 ****
  
  if ($default->user_use_folders) {
!   $options = mailbox_list($imp->mailbox);
  }
  
--- 280,284 ----
  
  if ($default->user_use_folders) {
!   $options = mailbox_list(true);
  }
  
***************
*** 277,280 ****
--- 287,291 ----
  $num_parts = count($structure->parts);
  
+ if (!isset($bodypart)) $bodypart = 1;
  $textpart = 0;
  $num = 0;
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/README.debian imp-2.2.0-pre5/packaging/debian/README.debian
*** imp-2.2.0-pre4/packaging/debian/README.debian	Wed Aug 25 11:13:31 1999
--- imp-2.2.0-pre5/packaging/debian/README.debian	Thu Oct 14 00:49:17 1999
***************
*** 5,9 ****
  will do the same for mysql once I get a handle on mysql.  If you have questions
  on why this is so, checkout the README.phplib file which should be in 
! /usr/doc/horde-core/
  
  NOTES:
--- 5,11 ----
  will do the same for mysql once I get a handle on mysql.  If you have questions
  on why this is so, checkout the README.phplib file which should be in 
! /usr/doc/horde/
! 
! Now using debconf!@#  woohoo
  
  NOTES:
***************
*** 36,40 ****
--- 38,46 ----
      You will need to restart postgresql after this.
  
+ If you have installed imp prior to doing this you will need to run
+ 
+ hordesetup imp
  
+ in order for IMP to configure the database properly.
  
  Ivan E. Moore II <rkrusty@debian.org>, Sun,  28 Mar 1999 14:50:10 -0500
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/changelog imp-2.2.0-pre5/packaging/debian/changelog
*** imp-2.2.0-pre4/packaging/debian/changelog	Fri Aug 27 08:02:33 1999
--- imp-2.2.0-pre5/packaging/debian/changelog	Wed Oct 20 13:07:25 1999
***************
*** 1,2 ****
--- 1,115 ----
+ imp (1:2.2.0.pre5-1.0) unstable; urgency=low
+ 
+   * New upstream version
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Oct 1999 13:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-8.0) unstable; urgency=low
+ 
+   * New upstream fixes
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Oct 1999 03:30:30 -0400
+ 
+ imp (1:2.2.0.pre4-7.3) unstable; urgency=low
+ 
+   * Fixing debconf settings a bit to make sure certain questions are asked.
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 19 Oct 1999 00:30:30 -0400
+ 
+ imp (1:2.2.0.pre4-7.2) unstable; urgency=low
+ 
+   * Fixing typo in postinst script
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Oct 1999 07:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-7.1) unstable; urgency=low
+ 
+   * fixing mktemp issue
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 14 Oct 1999 02:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-7.0) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+   * Implementing debconf
+   * Adding to cron job a routine to clear out leftover .jpg and .gif
+     images created by mswordview. (Closes: #47127)
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Oct 1999 21:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-6.0) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+   * BUG: renaming folders should work again (cjh)
+   * BUG: contacts with " in the fullname should work again
+   * BUG: went back to using $h->udate for message dates to avoid problems with 
+     strange dates
+   * BUG: fixed a garbled line that was causing a warning when resuming messages
+   * BUG: poppassd support should work now 
+   * CHANGE: $default->localhost is now deprecated in favor of $SERVER_NAME
+   * CHANGE: INBOX is no longer shown on the folders page
+   * LANGUAGE: Czech updated
+   * LANGUAGE: German updated
+   * LANGUAGE: Polish now available
+   * LANGUAGE: Norwegian Bokm\xe5l language support
+   * LANGUAGE: Icelandic language support
+   * LANGUAGE: French updated
+   * SECURITY: We should now be immune to the {} and mocha javascript exploits 
+     recently described on Bugtraq
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Oct 1999 07:20:30 -0400
+ 
+ imp (1:2.2.0.pre4-4.0) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Sep 1999 00:30:30 -0400
+ 
+ imp (1:2.2.0.pre4-3.2) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+   * Readding impsetup script
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Sep 1999 23:30:30 -0400
+ 
+ imp (1:2.2.0.pre4-3.1) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 18 Sep 1999 06:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-3.0) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 16 Sep 1999 14:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-2.0) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Sep 1999 14:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-1.3) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+   * More notes added to README
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Sep 1999 22:00:30 -0400
+ 
+ imp (1:2.2.0.pre4-1.2) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+   * Fixes from_server issue
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Aug 1999 06:45:30 -0400
+ 
+ imp (1:2.2.0.pre4-1.1) unstable; urgency=low
+ 
+   * New upstream CVS fixes
+   * This version fixes some peoples problems with doc contains no data errors
+ 
+  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 30 Aug 1999 03:45:30 -0400
+ 
  imp (1:2.2.0.pre4-1.0) unstable; urgency=low
  
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/config imp-2.2.0-pre5/packaging/debian/config
*** imp-2.2.0-pre4/packaging/debian/config	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/packaging/debian/config	Wed Oct 20 13:07:25 1999
***************
*** 0 ****
--- 1,12 ----
+ #!/bin/sh -e
+ 
+ # Versioning
+ version=1:2.2.0.pre5-1.0
+ 
+ # Use debconf baby
+ . /usr/share/debconf/confmodule.sh
+ 
+ db_version
+ db_input "medium" imp/welcome
+ db_go
+ 
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/control imp-2.2.0-pre5/packaging/debian/control
*** imp-2.2.0-pre4/packaging/debian/control	Wed Aug 25 22:01:42 1999
--- imp-2.2.0-pre5/packaging/debian/control	Tue Oct 19 00:41:52 1999
***************
*** 3,12 ****
  Priority: optional
  Maintainer: Ivan E. Moore II <rkrusty@debian.org>
! Standards-Version: 2.5.1
  
  Package: imp
  Architecture: all
! Depends: horde-core (>= 1.2.0.pre3-1.0), php3-imap, mswordview, php3-ldap
! Suggests: apache, imap-server, libapache-mod-ssl, libdbi-perl
  Provides: imap-client
  Description: Web Based IMAP Mail Program.
--- 3,13 ----
  Priority: optional
  Maintainer: Ivan E. Moore II <rkrusty@debian.org>
! Standards-Version: 3.0.1
  
  Package: imp
  Architecture: all
! Pre-Depends: debconf
! Depends: horde (>= 1.2.0.pre4-7.2), php3-imap, mswordview, php3-ldap, binutils, ${perl:Depends}
! Suggests: apache, imap-server, libapache-mod-ssl, poppasswd
  Provides: imap-client
  Description: Web Based IMAP Mail Program.
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/cron.daily imp-2.2.0-pre5/packaging/debian/cron.daily
*** imp-2.2.0-pre4/packaging/debian/cron.daily	Tue Aug 10 07:44:11 1999
--- imp-2.2.0-pre5/packaging/debian/cron.daily	Thu Oct 14 00:49:18 1999
***************
*** 7,8 ****
--- 7,16 ----
  	rm -f $IMP_FILE
  done
+ for IMP_FILE in `find /usr/share/horde/imp -name *.jpg -ctime 1 -maxdepth 1`; do
+         rm -f $IMP_FILE
+ done
+ 
+ for IMP_FILE in `find /usr/share/horde/imp -name *.gif -ctime 1 -maxdepth 1`; do
+         rm -f $IMP_FILE
+ done
+ 
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/defaults.options imp-2.2.0-pre5/packaging/debian/defaults.options
*** imp-2.2.0-pre4/packaging/debian/defaults.options	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/packaging/debian/defaults.options	Thu Oct 14 00:49:19 1999
***************
*** 0 ****
--- 1,25 ----
+ # DO NOT MODIFY THIS FILE
+ minimum_popups
+ server
+ servtype
+ port
+ from_server
+ root_url
+ graphics_url
+ include_dir
+ folders
+ use_imap_subscribe
+ use_ldap_search
+ use_server_list
+ user_change_server
+ user_change_port
+ user_change_servtype
+ user_change_folder
+ user_change_from
+ user_change_fullname
+ user_use_addressbook
+ user_use_folders
+ newmail_popup
+ path_to_mswordview
+ path_to_ispell
+ language
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/dirs imp-2.2.0-pre5/packaging/debian/dirs
*** imp-2.2.0-pre4/packaging/debian/dirs	Wed Aug 25 11:13:31 1999
--- imp-2.2.0-pre5/packaging/debian/dirs	Sat Sep 18 23:27:01 1999
***************
*** 1,4 ****
  etc/imp
  usr/share/horde/imp
! usr/doc/imp
! usr/doc/imp/examples
--- 1,4 ----
  etc/imp
  usr/share/horde/imp
! usr/share/doc/imp
! usr/bin
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/mysql_create.sql imp-2.2.0-pre5/packaging/debian/mysql_create.sql
*** imp-2.2.0-pre4/packaging/debian/mysql_create.sql	Tue Aug 24 11:13:04 1999
--- imp-2.2.0-pre5/packaging/debian/mysql_create.sql	Thu Oct 14 01:01:56 1999
***************
*** 3,11 ****
  # you can simply direct this file to mysql as STDIN:
  # mysql (user/pass/host args) < mysql_create.sql
- # 
  
  CONNECT mysql;
  
! CONNECT imp;
  
  # create the address table
--- 3,10 ----
  # you can simply direct this file to mysql as STDIN:
  # mysql (user/pass/host args) < mysql_create.sql
  
  CONNECT mysql;
  
! CONNECT @dbname@;
  
  # create the address table
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/pgsql_create.sql imp-2.2.0-pre5/packaging/debian/pgsql_create.sql
*** imp-2.2.0-pre4/packaging/debian/pgsql_create.sql	Mon Aug 23 19:28:26 1999
--- imp-2.2.0-pre5/packaging/debian/pgsql_create.sql	Thu Oct 14 00:49:19 1999
***************
*** 1,3 ****
! \connect horde
  
  CREATE TABLE imp_pref (
--- 1,3 ----
! \connect @dbname@
  
  CREATE TABLE imp_pref (
***************
*** 16,18 ****
  );
  
- GRANT SELECT, INSERT, UPDATE ON imp_pref, imp_addr TO hordemgr
--- 16,17 ----
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/pgsql_cuser.sh imp-2.2.0-pre5/packaging/debian/pgsql_cuser.sh
*** imp-2.2.0-pre4/packaging/debian/pgsql_cuser.sh	Mon Aug 23 19:28:26 1999
--- imp-2.2.0-pre5/packaging/debian/pgsql_cuser.sh	Wed Dec 31 19:00:00 1969
***************
*** 1,21 ****
- #!/bin/sh
- NEWUSER=hordemgr
- SYSID=33
- CANCREATE=t
- CANADDUSER=t
- PASSWORD=$1
- PSQL=/usr/bin/psql
- 
- QUERY="insert into pg_shadow \
-         (usename, usesysid, usecreatedb, usetrace, usesuper, usecatupd,passwd) \
-        values \
-          ('$NEWUSER', $SYSID, '$CANCREATE', 't', '$CANADDUSER','t','$PASSWORD')"
- 
- RES=`$PSQL -c "$QUERY" template1`
- if [ -n "$RES" ]
- then
-     echo "$CMDNAME: user "\"$NEWUSER\"" already exists" 1>&2
-     exit 1
- fi
- 
- 
--- 0 ----
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/postinst imp-2.2.0-pre5/packaging/debian/postinst
*** imp-2.2.0-pre4/packaging/debian/postinst	Mon Aug 23 19:28:26 1999
--- imp-2.2.0-pre5/packaging/debian/postinst	Tue Oct 19 00:41:52 1999
***************
*** 1,30 ****
! #! /bin/sh
! # postinst script for imp
  #
- # see: dh_installdeb(1)
  
! set -e
  
! case "$1" in
!     configure)
!        cp /etc/imp/imp_module_config.php3 /etc/horde/modules >>/dev/null 2>&1
!        /usr/bin/hordesetup imp
!     ;;
  
!     abort-upgrade|abort-remove|abort-deconfigure)
  
!     ;;
  
!     *)
!         echo "postinst called with unknown argument \`$1'" >&2
!         exit 0
!     ;;
! esac
  
! # dh_installdeb will replace this with shell code automatically
! # generated by other debhelper scripts.
  
  
! exit 0
  
  
--- 1,286 ----
! #!/bin/sh -e
! # Horde postinst script using debconf
! # written by Ivan E. Moore II <rkrusty@tdyc.com> with help from
! # debconf examples and tons of other references
  #
  
! # Source debconf library
! . /usr/share/debconf/confmodule.sh
  
! # Where the config file is that stores the previous selections
! CHOICES_FILE="/etc/imp/defaults.choices";
! OPTIONS_FILE="/etc/imp/defaults.options";
! DEFAULTS_FILE="/etc/imp/defaults.php3";
! HCHOICES_FILE="/etc/horde/defaults.choices";
! HCHOICES_PHP="/etc/horde/horde.choices";
  
! # read those selections in if and only if they exist
! if [ -f "$CHOICES_FILE." ]; then
!    . $CHOICES_FILE
! fi
  
! if [ -f "$HCHOICES_FILE." ]; then
!    . $HCHOICES_FILE
! fi
  
! if [ -f "$HCHOICES_PHP." ]; then
!    . $CHOICES_PHP
! fi
  
! ## Grab some extra db info from horde configs
!   db_input "critical" "horde/database_type"     
!   db_go
!   db_get "horde/database_type"
!   dbtype="$RET"
!   db_input "high" "horde/database_server"
!   db_go  
!   db_get "horde/database_server"
!   dbserver="$RET"
!   db_input "high" "horde/database_name"
!   db_go
!   db_get "horde/database_name"
!   dbname="$RET"
!   db_input "high" "horde/database_user"
!   db_go
!   db_get "horde/database_user"
!   dbuser="$RET"
!   db_input "high" "horde/database_pass"
!   db_go
!   db_get "horde/database_pass"
!   dbpass="$RET"
!   db_input "high" "horde/path_to_sendmail"
!   db_go
!   db_get "horde/path_to_sendmail"
!   path_to_sendmail="$RET"
  
+ ## Ok set our temp file to use
+ p=`basename $0`
+ TMPFILE=`mktemp /tmp/$p.XXXXXX` || exit 1
  
! ### Set the shell variable so that it can be sourced in
! echo "#!/bin/sh" >>$TMPFILE 2>&1;
! echo "# Config file read in by IMP setup program" >>$TMPFILE
! echo "# Autobuilt by debconf/hordeconf Do not edit" >>$TMPFILE
! echo "#" >>$TMPFILE
! echo "#  DO NOT EDIT" >>$TMPFILE
! echo "#" >>$TMPFILE
! echo "# configure program (defaults.php3)" >>$TMPFILE
! 
! ## Ok, now we need to run through the choices ##
! for i in `cat $OPTIONS_FILE | grep -v "#"`; do
!   # go get the value, prompt for it if we don't have it
!   db_input "high" "imp/$i"
!   db_go
!   # set the tmp file with this value
!   db_get "imp/$i"
!   echo "$i=\"$RET\";" >>$TMPFILE
! done
! 
! # Now drop the newly created file into it's place
! mv $TMPFILE $CHOICES_FILE > /dev/null 2>&1;
! chmod 755 $CHOICES_FILE
! chmod go-rwx $CHOICES_FILE
! 
! # Read in the new values
! . $CHOICES_FILE
! 
! # Now let's create the defaults.php3 file needed by IMP 
! 
! echo "<?php" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* true = put the compose window in the main frame; false = use a popup window for compose windows */" >>$TMPFILE
! echo "\$default->minimum_popups = $minimum_popups;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* For debugging purposes */" >>$TMPFILE
! echo "\$default->error_level               = 15;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* The longest that things like file uploads and slow functions should be" >>$TMPFILE
! echo " * allowed to run. 0 means run until termination (forever if infinite loop)." >>$TMPFILE
! echo " * NOTE: you can't set this to 0 if safe_mode is on. */ " >>$TMPFILE
! echo "\$default->max_execution_time        = 0;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Imap Server Default */" >>$TMPFILE
! echo "\$default->server                    = '$server'; " >>$TMPFILE
! echo "\$default->from_server               = '$from_server'; " >>$TMPFILE
! echo "\$default->port                      = $port; " >>$TMPFILE
! echo "\$default->servtype                  = '$servtype'; " >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Web server configuration */" >>$TMPFILE
! echo "\$default->root_url                  = '$root_url'; " >>$TMPFILE
! echo "\$default->include_dir               = '$include_dir'; " >>$TMPFILE
! echo "\$default->graphics_url              = '$graphics_url'; " >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Folder configuration */" >>$TMPFILE
! echo "\$default->folders                   = '$folders'; " >>$TMPFILE
! echo "\$default->use_imap_subscribe        = $use_imap_subscribe; " >>$TMPFILE
! echo "\$default->show_dotfiles             = false; " >>$TMPFILE
! echo "\$default->sent_mail                 = 'sent_mail'; " >>$TMPFILE
! echo "\$default->save_sent_mail            = true; " >>$TMPFILE
! echo "\$default->drafts                    = 'drafts'; " >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Ldap searching */" >>$TMPFILE
! echo "\$default->use_ldap_search           = $use_ldap_search;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* user is presented with an list of available imap servers */" >>$TMPFILE
! echo "\$default->use_server_list           = $use_server_list;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* User changable items */" >>$TMPFILE
! echo "\$default->user_change_server        = $user_change_server;" >>$TMPFILE
! echo "\$default->user_change_port          = $user_change_port;" >>$TMPFILE
! echo "\$default->user_change_servtype      = $user_change_servtype;" >>$TMPFILE
! echo "\$default->user_change_folder        = $user_change_folder;" >>$TMPFILE
! echo "\$default->user_change_from          = $user_change_from;" >>$TMPFILE
! echo "\$default->user_change_fullname      = $user_change_fullname;" >>$TMPFILE
! echo "\$default->user_use_addressbook      = $user_use_addressbook;" >>$TMPFILE
! echo "\$default->user_use_folders          = $user_use_folders;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* New mail configuration */" >>$TMPFILE
! echo "/* Refresh between check for new mail */" >>$TMPFILE
! echo "\$default->refresh_delay                  = 300;" >>$TMPFILE
! echo "\$default->newmail_popup                  = $newmail_popup;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Path to sendmail */" >>$TMPFILE
! echo "\$default->path_to_sendmail          = '$path_to_sendmail';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Ispell setup */" >>$TMPFILE
! echo "\$default->path_to_ispell            = '$path_to_ispell';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Mswordview setup */" >>$TMPFILE
! echo "\$default->path_to_mswordview        = '$path_to_mswordview';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* path to tar so that tarballs can be listed */" >>$TMPFILE
! echo "\$default->path_to_tar               = '/bin/tar';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Cyrus configuration block */" >>$TMPFILE
! echo "\$default->personal_folders          = '$personal_folders';" >>$TMPFILE
! echo "// cyrus configs may look like this:" >>$TMPFILE
! echo "// $default->personal_folders       = 'INBOX.';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* Default Language */" >>$TMPFILE
! echo "\$default->language                  = '$language';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "\$default->append_header             = true;" >>$TMPFILE
! echo "\$default->append_trailer            = true;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "\$default->text_parts_inline         = true;" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "/* database config */" >>$TMPFILE
! echo "\$default->use_db                    = true;" >>$TMPFILE
! echo "\$default->db_user_name              = '$dbuser';" >>$TMPFILE
! echo "\$default->db_password               = '$dbpass';" >>$TMPFILE
! echo "\$default->db_name                   = '$dbname';" >>$TMPFILE
! echo "\$default->db_server_name            = '$dbserver';" >>$TMPFILE
! echo "\$default->db_pref_table             = 'imp_pref';" >>$TMPFILE
! echo "\$default->db_address_table          = 'imp_addr';" >>$TMPFILE
! echo "\$default->db_connect_string         = '';" >>$TMPFILE
! echo "\$default->db_server_port            = '';" >>$TMPFILE
! echo "\$default->db_server_options         = '';" >>$TMPFILE
! echo "\$default->db_server_tty             = '';" >>$TMPFILE
! echo "" >>$TMPFILE
! echo "?>" >>$TMPFILE
! 
! 
! # Now lets move that file into place
! 
! mv $TMPFILE $DEFAULTS_FILE > /dev/null 2>&1
! 
! ##  Now take care of the rest of the conf files needing changed
! 
! ##  We need to figure out what type of database to use now:
! 
! if [ "$dbtype" = "PostgreSQL" ]; then
! 
!   if (grep 'extension' /etc/php3/apache/php3.ini | grep 'imap.so'>/dev/null 2>&1); then (notsome="1"); else (echo 'extension=imap.so' >> /etc/php3/apache/php3.ini ); fi
!   if (grep 'extension' /etc/php3/apache/php3.ini | grep 'ldap.so'>/dev/null 2>&1);
!   then
!     (notsome="1");
!   else
!     (echo 'extension=ldap.so' >> /etc/php3/apache/php3.ini );
!   fi
!   /bin/sed -e "s#@dbname@#$dbname#" /usr/share/doc/imp/examples/pgsql_create.sql > /usr/share/doc/imp/examples/pgsql_create.sql.new
!   cp /usr/share/doc/imp/examples/pgsql_create.sql /usr/share/doc/imp/examples/pgsql_create.sql.bak >/dev/null 2>&1
!   mv /usr/share/doc/imp/examples/pgsql_create.sql.new /usr/share/doc/imp/examples/pgsql_create.sql >/dev/null 2>&1
! 
!   db_input "high" "imp/dbconfigured"
!   db_go
!   db_get "imp/dbconfigured"
!   if [ "$RET" = "no" ] ; then
! 
!     PSQL2_QUERY="GRANT SELECT, INSERT, UPDATE ON active_sessions, auth_user,auth_user_md5, imp_pref, imp_addr TO $dbuser"
!     su - postgres -c '/usr/bin/psql -q template1 < /usr/share/doc/imp/examples/pgsql_create.sql >/dev/null 2>&1'
!     su - postgres -c '/usr/bin/psql -q horde -c "$PSQL2_QUERY" >/dev/null 2>&1'
!     db_set "imp/dbconfigured" "yes"
!   fi
!   /etc/init.d/postgresql restart > /dev/null 2>&1
!   (cd /usr/share/horde/imp/lib/src && ./build.pl --database=postgres >/dev/null 2>&1)
  
+ fi
  
+ if [ "$dbtype" = "MySql" ]; then
+ 
+     /bin/sed -e "s#@dbname@#$dbname#" /usr/share/doc/horde/examples/mysql_create.sql > /usr/share/doc/horde/examples/mysql_create.sql.new
+     cp /usr/share/doc/horde/examples/mysql_create.sql /usr/share/doc/horde/examples/mysql_create.sql.bak >/dev/null 2>&1
+     mv /usr/share/doc/horde/examples/mysql_create.sql.new /usr/share/doc/horde/examples/mysql_create.sql >/dev/null 2>&1
+ 
+   if (grep 'extension' /etc/php3/apache/php3.ini | grep 'imap.so'>/dev/null 2>&1); then (notsome="1"); else (echo 'extension=imap.so' >> /etc/php3/apache/php3.ini); fi
+   if (grep 'extension' /etc/php3/apache/php3.ini | grep 'ldap.so'>/dev/null 2>&1); then (notsome="1"); else (echo 'extension=ldap.so' >> /etc/php3/apache/php3.ini ); fi    
+ 
+   db_input "high" "imp/dbconfigured"
+   db_go
+   db_get "imp/dbconfigured"
+   if [ "$RET" = "no" ] ; then
+     if [ "$dbpass" = "none" ] ; then
+       /usr/bin/mysql -f < /usr/share/doc/imp/examples/mysql_create.sql >/dev/null 2>&1
+     else
+       /usr/bin/mysql -f --password=$dbpass < /usr/share/doc/imp/examples/mysql_create.sql > /dev/null 2>&1
+     fi
+     db_set imp/dbconfigured "yes"
+     db_go
+   fi
+   /etc/init.d/mysql restart >/dev/null 2>&1
+   cd /usr/share/horde/imp/lib/src && ./build.pl --database=mysql >> /dev/null 2>&1
+       
+ fi
+ 
+ 
+ 
+ ###  Done with the database stuff, move on to the next item on the list
+ 
+ db_input "critical" "horde/webserver_type"
+ db_go
+ db_get "horde/webserver_type"
+ webtype="$RET"
+ 
+ if [ "$webtype" = "Apache" ] || [ "$RET" = "Both" ]; then
+   if (grep 'Added for IMP' /etc/apache/srm.conf >/dev/null 2>&1); \
+   then \
+     (notsome="1"); \
+   else \
+     echo '# Added for IMP' >> /etc/apache/srm.conf ;\
+     echo 'Alias /imp /usr/share/horde/imp' >> /etc/apache/srm.conf ; \
+   fi
+   /etc/init.d/apache reload >/dev/null 2>&1
+ fi
+ 
+ if [ "$webtype" = "Apache-SSL" ] || [ "$RET" = "Both" ]; then
+   if (grep 'Added for IMP' /etc/apache-ssl/srm.conf >/dev/null 2>&1); \
+   then \
+     (notsome="1"); \
+   else \
+     (echo '# Added for IMP' >> /etc/apache-ssl/srm.conf ;\
+     echo 'Alias /imp /usr/share/horde/imp' >> /etc/apache-ssl/srm.conf); \
+   fi
+   /etc/init.d/apache-ssl reload >/dev/null 2>&1
+ fi
+ 
+ chown -R www-data.root /usr/share/horde >> /dev/null 2>&1
+ chown -R www-data.root /etc/imp >> /dev/null 2>&1
+ chmod -R 555 /usr/share/horde/imp/lib/*.lib >> /dev/null 2>&1
+ chmod 555 `find /etc/imp/ -type f -print ` >/dev/null 2>&1
+ chmod o-rwx `find /etc/imp/ -type f -print ` >/dev/null 2>&1
+ 
+ db_stop
+ 
+ #DEBHELPER#
+ 
+ exit 0
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/postrm imp-2.2.0-pre5/packaging/debian/postrm
*** imp-2.2.0-pre4/packaging/debian/postrm	Thu Aug 19 16:07:14 1999
--- imp-2.2.0-pre5/packaging/debian/postrm	Thu Oct 14 00:49:20 1999
***************
*** 18,19 ****
--- 18,22 ----
  esac
  
+ #DEBHELPER#
+ 
+ exit 0
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/preinst imp-2.2.0-pre5/packaging/debian/preinst
*** imp-2.2.0-pre4/packaging/debian/preinst	Wed Aug 25 22:01:42 1999
--- imp-2.2.0-pre5/packaging/debian/preinst	Thu Oct 14 00:49:20 1999
***************
*** 1,8 ****
! #! /bin/sh
! # preinst script for imp
! #
! # see: dh_installdeb(1)
  
! set -e
  
  case "$1" in
--- 1,6 ----
! #! /bin/sh -e
  
! # Source debconf library
! . /usr/share/debconf/confmodule.sh
  
  case "$1" in
***************
*** 13,17 ****
        if [ -x /etc/imp/defaults.php3 ]; then
          cp /etc/imp/defaults.php3 /etc/imp/defaults.php3.bak
-         echo "Making a backup of defaults.php3 to defaults.php3.bak just in case"
        fi
        if [ -x /usr/share/horde/imp/imp.lib ]; then
--- 11,14 ----
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/prerm imp-2.2.0-pre5/packaging/debian/prerm
*** imp-2.2.0-pre4/packaging/debian/prerm	Thu Aug 19 16:07:14 1999
--- imp-2.2.0-pre5/packaging/debian/prerm	Thu Oct 14 00:49:20 1999
***************
*** 20,23 ****
--- 20,24 ----
  # generated by other debhelper scripts.
  
+ #DEBHELPER#
  
  exit 0
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/rules imp-2.2.0-pre5/packaging/debian/rules
*** imp-2.2.0-pre4/packaging/debian/rules	Wed Aug 25 22:01:42 1999
--- imp-2.2.0-pre5/packaging/debian/rules	Wed Oct 20 13:07:25 1999
***************
*** 26,48 ****
  	-cp -R * debian/tmp/usr/share/horde/imp/
  	-rm -rf debian/tmp/usr/share/horde/imp/debian
! 	mv debian/tmp/usr/share/horde/imp/config/scripts debian/tmp/usr/doc/imp
  	-rm -rf `find debian/tmp/ -print | grep CVS`
! 	-mv debian/tmp/usr/share/horde/imp/docs/* debian/tmp/usr/doc/imp/
  	-rm -rf debian/tmp/usr/share/horde/imp/docs debian/tmp/usr/share/horde/imp/packaging
  	mv debian/tmp/usr/share/horde/imp/config/* debian/tmp/etc/imp
! 	mv debian/tmp/etc/imp/defaults.php3.dist debian/tmp/usr/doc/imp/examples
  	-rm -rf debian/tmp/usr/share/horde/imp/config
  	#ln -s /etc/imp debian/tmp/usr/share/horde/imp/config
  	cp debian/menu.txt debian/tmp/etc/imp
  	chmod 644 `find debian/tmp/usr/share -type f -print `
! 	chmod 644 `find debian/tmp/usr/doc -type f -print `
  	chmod 644 debian/tmp/etc/imp/*
  	-chmod 755 debian/tmp/usr/share/horde/imp/lib/src/*.pl \
  	debian/tmp/usr/share/horde/imp/lib/db/src/*.pl \
! 	debian/tmp/usr/share/horde/imp/scripts/*
! 	cp debian/pgsql_* debian/tmp/usr/doc/imp/scripts
! 	cp debian/mysql* debian/tmp/usr/doc/imp/scripts
  	cp debian/ImpLibVersion.def debian/tmp/usr/share/horde/imp/lib/src/defines
! 	-chmod 755 debian/tmp/usr/doc/imp/scripts/pgsql_cuser.sh
  	cd debian/tmp/usr/share/horde/imp && rm -f COPYING README
  
--- 26,54 ----
  	-cp -R * debian/tmp/usr/share/horde/imp/
  	-rm -rf debian/tmp/usr/share/horde/imp/debian
! 	mv debian/tmp/usr/share/horde/imp/config/scripts debian/tmp/usr/share/doc/imp/examples
! 	-cp -R debian/tmp/usr/share/horde/imp/scripts/* debian/tmp/usr/share/doc/imp/examples/
! 	-rm -rf debian/tmp/usr/share/horde/imp/scripts
  	-rm -rf `find debian/tmp/ -print | grep CVS`
! 	-mv debian/tmp/usr/share/horde/imp/docs/* debian/tmp/usr/share/doc/imp/
  	-rm -rf debian/tmp/usr/share/horde/imp/docs debian/tmp/usr/share/horde/imp/packaging
  	mv debian/tmp/usr/share/horde/imp/config/* debian/tmp/etc/imp
! 	mv debian/tmp/etc/imp/README debian/tmp/usr/share/doc/imp/README.config
! 	mv debian/tmp/etc/imp/defaults.php3.dist debian/tmp/usr/share/doc/imp/examples
  	-rm -rf debian/tmp/usr/share/horde/imp/config
  	#ln -s /etc/imp debian/tmp/usr/share/horde/imp/config
  	cp debian/menu.txt debian/tmp/etc/imp
  	chmod 644 `find debian/tmp/usr/share -type f -print `
! 	chmod 644 `find debian/tmp/usr/share/doc -type f -print `
  	chmod 644 debian/tmp/etc/imp/*
  	-chmod 755 debian/tmp/usr/share/horde/imp/lib/src/*.pl \
  	debian/tmp/usr/share/horde/imp/lib/db/src/*.pl \
! 	debian/tmp/usr/share/horde/imp/examples/*
! 	cp debian/defaults.* debian/tmp/etc/imp/
! 	cp debian/pgsql_* debian/tmp/usr/share/doc/imp/examples
! 	cp debian/mysql* debian/tmp/usr/share/doc/imp/examples
! 	mv debian/tmp/usr/share/doc/imp/examples/impsetup.pl debian/tmp/usr/bin/impsetup
! 	chmod 755 debian/tmp/usr/bin/impsetup
  	cp debian/ImpLibVersion.def debian/tmp/usr/share/horde/imp/lib/src/defines
! 	-chmod 755 debian/tmp/usr/share/doc/imp/examples/pgsql_cuser.sh
  	cd debian/tmp/usr/share/horde/imp && rm -f COPYING README
  
***************
*** 52,55 ****
--- 58,62 ----
  	dh_testdir
  	dh_testroot
+ 	dh_installdebconf
  	dh_installdocs 
  	dh_installexamples
***************
*** 61,66 ****
  	dh_fixperms 
  	chown -R www-data.root debian/tmp/usr/share/horde/imp 
! 	-chmod 755 debian/tmp/usr/doc/imp/scripts/*.sh
  	dh_suidregister
  	dh_installdeb
  	dh_shlibdeps
--- 68,74 ----
  	dh_fixperms 
  	chown -R www-data.root debian/tmp/usr/share/horde/imp 
! 	-chmod 755 debian/tmp/usr/share/doc/imp/examples/*.sh
  	dh_suidregister
+ 	dh_perl
  	dh_installdeb
  	dh_shlibdeps
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/templates imp-2.2.0-pre5/packaging/debian/templates
*** imp-2.2.0-pre4/packaging/debian/templates	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/packaging/debian/templates	Tue Oct 19 00:41:52 1999
***************
*** 0 ****
--- 1,193 ----
+ Template: imp/welcome
+ Type: note
+ Description: Welcome to the new IMP setup program
+  Please note that these options will only be asked of you the first time
+  around and only new options will show during future upgrades.  If you
+  need to change any of these options after installation, please look at
+  /etc/imp/defaults.choices.
+  .
+  If you are upgrading currently and this is the first time your using
+  the debconf version of the imp install we'll let you know this once.
+  Your current defaults.php3 file is getting backed up during the preinst
+  process.  This will happen every time you upgrade even though you will
+  never see this prompt again unless you have debconf set to prompt you
+  for everything.  Also note that the defaults.php3 file is now generated
+  on the fly *everytime* you install or upgrade imp.  
+ 
+ Template: imp/dbconfigured
+ Type: select
+ Choices: yes, no
+ Default: no
+ Description: Have you already configured your IMP database?
+  If you are upgrading or for any other reason have already configured your
+  database for use with IMP you'll want to set this to yes.
+ 
+ Template: imp/root_url
+ Type: string
+ Default: /horde/imp
+ Description: What is the default url path for IMP?
+  When pointing your web browser to IMP, what is the directory pathing you
+  will need for getting to imp?  As in http://localhost/horde/imp 
+  where /horde/imp would be what we are looking for.
+ 
+ Template: imp/graphics_url
+ Type: string
+ Default: /horde/imp/graphics
+ Description: What is the default url path for imp graphics?
+  When pointing your web browser to IMP, what is the directory pathing you
+  will need for getting to imp graphics?  As in 
+  http://localhost/horde/imp/graphics
+  where /horde/imp/graphics would be what we are looking for.
+ 
+ Template: imp/include_dir
+ Type: string
+ Default: ./templates
+ Description: What is the path to the templates directory?
+  Where are all the html templates stored for imp?  Unless you have changed
+  this on purpose then leave it as is.
+ 
+ Template: imp/path_to_mswordview
+ Type: string
+ Default: /usr/bin/mswordview -c
+ Description: What is the path to your mswordview program?
+  Please put the full path to your mswordview program with any flags
+  necessary for it to run properly.
+ 
+ Template: imp/path_to_ispell
+ Type: string
+ Default: /usr/bin/ispell
+ Description: What is the path to your ISPell program?
+  If you want to use ISPell for spell checking put in the full path here.
+ 
+ Template: imp/minimum_popups
+ Type: select
+ Choices: true, false
+ Default: false
+ Description: Put the compose window in the main frame?
+  If you chose true here the compose window will appear in the main window
+  instead of a seperate popup window.  
+ 
+ Template: imp/server
+ Type: string
+ Default: localhost
+ Description: Enter the hostname for the IMAP/POP server you want to connect to
+  This is the default IMAP/POP server you plan on having IMP connect to.
+  Please change it from localhost to the fully qualified domain name.
+ 
+ Template: imp/from_server
+ Type: string
+ Default: localhost
+ Description: Enter the hostname that you want mail to appear to come from.
+  This is the default hostname that all mail sent from IMP will appear to
+  come from (baring any restrictions on your mail program itself). This
+  needs to be a fully qualified domain name.
+ 
+ Template: imp/port
+ Type: string
+ Default: 143
+ Description: What port is IMAP/POP running on?
+  For the IMAP/POP server you chose above, what port is the daemon running.
+  By default this is 143 for a IMAP server and 110 for a POP server.
+ 
+ Template: imp/servtype
+ Type: select
+ Choices: imap, pop
+ Default: imap
+ Description: What type of server is this? 
+  For the server you just entered, what type of service is it running?  Please
+  chose either IMAP or POP as that's the only 2 choices you have. :)
+ 
+ Template: imp/folders
+ Type: string
+ Default: mail/
+ Description: In what directory are a users mail folders in?
+  Depending on how you have things configured, a user's email folders can
+  be stored in different locations.  Some don't even need this option but
+  others use folder subdirectories such as "mail/" or "Mail/"
+ 
+ Template: imp/use_imap_subscribe
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Use the spiffy IMAP subscribe feature?
+ 
+ Template: imp/use_ldap_search
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Use the LDAP Search features of IMP?
+  IMP has the ability to allow users to look up email address via any LDAP
+  server.  You can customize the list of available servers by modifying 
+  the /etc/imp/ldap.php3 file. By default it supports bigfoot and several other
+  major Internet based LDAP servers.
+ 
+ Template: imp/user_change_server
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to change the server they connect to?
+ 
+ Template: imp/user_change_port
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to change the server port they connect to?
+ 
+ Template: imp/user_change_servtype
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to change the type of server they connect to?
+ 
+ Template: imp/user_change_folder
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to change the default mail folders value?
+ 
+ Template: imp/user_change_from
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to change their From: line? 
+ 
+ Template: imp/user_change_fullname
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to change how their name appears in email?
+ 
+ Template: imp/user_use_addressbook
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to use the Addressbook features of IMP?
+ 
+ Template: imp/user_use_folders
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Allow users to manage their folder subscriptions?
+ 
+ Template: imp/newmail_popup
+ Type: select
+ Choices: true, false
+ Default: true
+ Description: Use the New Mail Popup feature?
+  If you select this feature, whenever new mail is detected in the current
+  folder, a new mail popup window will appear letting you know.
+ 
+ Template: imp/use_server_list
+ Type: select
+ Choices: true, false
+ Default: false
+ Description: Use the multiple server listing?
+  If you chose this option you will need to modify /etc/imp/servers.php3
+  before things will work properly.
+ 
+ Template: imp/language
+ Type: select
+ Choices: cs, da, de, en, es, et, fi, fr, hu, id, is, it, no-bok, no-ryn, pl, pt-BR, se
+ Default: en
+ Description: What default language do you want to use?
+  What default language do you want to use?
diff -r -N -C 2 imp-2.2.0-pre4/packaging/debian/undocumented imp-2.2.0-pre5/packaging/debian/undocumented
*** imp-2.2.0-pre4/packaging/debian/undocumented	Wed Dec 31 19:00:00 1969
--- imp-2.2.0-pre5/packaging/debian/undocumented	Sat Sep 18 23:27:02 1999
***************
*** 0 ****
--- 1 ----
+ impsetup.1
diff -r -N -C 2 imp-2.2.0-pre4/poppassd.php3 imp-2.2.0-pre5/poppassd.php3
*** imp-2.2.0-pre4/poppassd.php3	Sat Aug 14 00:44:06 1999
--- imp-2.2.0-pre5/poppassd.php3	Mon Sep 13 14:12:31 1999
***************
*** 17,26 ****
  */
  
- 
- /* poppassd settings. You MUST edit these for this script to work! */
- $poppassd_server = '/dev/null'; // 'localhost'
- $poppassd_port   = 0;           // 106
- 
- 
  if (!defined('HORDE_LIB')) include '../lib/horde.lib';
  require './lib/imp.lib';           /* IMPlib is the IMP function library  */
--- 17,20 ----
***************
*** 33,36 ****
--- 27,31 ----
  require './locale/local/passwd.lang';
  
+ 
  /* add help in future */
  /* require "./help/defines/passwd.help"; */
***************
*** 45,48 ****
--- 40,64 ----
  require "$default->include_dir/doctype.inc";
  
+ 
+ /* Get the poppassd server from defaults, otherwise set to safe values */
+ if (isset($default->poppassd_server))
+ { 
+ 	$poppassd_server = $default->poppassd_server;
+ 	if (isset($default->poppassd_port))
+ 	{
+ 		$poppassd_port = $default->poppassd_port;
+ 	}
+ 	else
+ 	{
+ 		$poppassd_port = 106;
+ 	}
+ }
+ else
+ {
+ 	$poppassd_server = '/dev/null';
+ 	$poppassd_port   = 0;
+ }
+ 
+ 
  /* run through ActionIDs */
  if (isset($actionID)) {
***************
*** 91,95 ****
  	include "$default->include_dir/passwd/poppassd_error.inc" ;
        }
!       $output = 'user ' . $session->get_user() . "\n";
        fputs($passd,$output);
        
--- 107,111 ----
  	include "$default->include_dir/passwd/poppassd_error.inc" ;
        }
!       $output = 'user ' . $imp->user . "\n";
        fputs($passd,$output);
        
***************
*** 100,104 ****
  	include "$default->include_dir/passwd/poppassd_error.inc";
        }
!       $output = "pass " . $session->get_password() . "\n";
        fputs($passd,$output);
        
--- 116,120 ----
  	include "$default->include_dir/passwd/poppassd_error.inc";
        }
!       $output = "pass " . $imp->pass . "\n";
        fputs($passd,$output);
        
diff -r -N -C 2 imp-2.2.0-pre4/select.php3 imp-2.2.0-pre5/select.php3
*** imp-2.2.0-pre4/select.php3	Thu Aug 19 14:24:16 1999
--- imp-2.2.0-pre5/select.php3	Tue Oct  5 16:53:46 1999
***************
*** 5,10 ****
    File: select.php3
    $Author: chuck $
!   $Revision: 2.13.2.3 $
!   $Date: 1999/08/19 18:24:16 $
    
    IMP: Copyright 1999 Charles J. Hagenbuch  <chuck@horde.org>
--- 5,10 ----
    File: select.php3
    $Author: chuck $
!   $Revision: 2.13.2.4 $
!   $Date: 1999/10/05 20:53:46 $
    
    IMP: Copyright 1999 Charles J. Hagenbuch  <chuck@horde.org>
***************
*** 49,53 ****
    $imp->unpickle();
    $imp->authenticate(OP_HALFOPEN);
!   $options = mailbox_list(false,'',false,true);
    
    if (isset($imp->stream) && $imp->stream) {
--- 49,53 ----
    $imp->unpickle();
    $imp->authenticate(OP_HALFOPEN);
!   $options = mailbox_list(false,false,true);
    
    if (isset($imp->stream) && $imp->stream) {
diff -r -N -C 2 imp-2.2.0-pre4/templates/compose/compose.inc imp-2.2.0-pre5/templates/compose/compose.inc
*** imp-2.2.0-pre4/templates/compose/compose.inc	Thu Aug 26 20:19:14 1999
--- imp-2.2.0-pre5/templates/compose/compose.inc	Mon Oct 18 12:43:37 1999
***************
*** 4,11 ****
  <tr bgcolor="<?php echo $default->dark_bg; ?>">
    <td colspan="3">
!     <?php $default->text_on_dark->start(); ?><b><?php echo $ACTION_TEXT ?></b> - <i><?php echo strftime('%c') ?></i></font>
    </td>
  </tr>
! <form method="post" name="compose" enctype="multipart/form-data" action="<?php $sess->pself_url() ?>">
  
  
--- 4,11 ----
  <tr bgcolor="<?php echo $default->dark_bg; ?>">
    <td colspan="3">
!     <?php $default->text_on_dark->start(); ?><b><?php echo htmlspecialchars($ACTION_TEXT) ?></b> - <i><?php echo strftime('%c') ?></i></font>
    </td>
  </tr>
! <form method="post" name="compose" enctype="multipart/form-data" action="<?php $sess->pself_url() . $sess->padd_query(array('uniq' => uniqid(rand()))) ?>">
  
  
***************
*** 21,29 ****
  <?php
  if (isset($default->path_to_ispell)) {
!   echo "<a href=\"javascript:spellcheck()\">" . $lang->button_spellcheck;
    
    if (isset($default->ispell_lang)) {
       echo "$lang->spell_in</a>\n";
!      echo "<select name=\"spell_lang\">\n";
       
       reset($default->ispell_lang);
--- 21,29 ----
  <?php
  if (isset($default->path_to_ispell)) {
!   echo "<a href=\"javascript:spellcheck(1)\">" . $lang->button_spellcheck;
    
    if (isset($default->ispell_lang)) {
       echo "$lang->spell_in</a>\n";
!      echo "<select name=\"spell_lang1\">\n";
       
       reset($default->ispell_lang);
***************
*** 46,50 ****
      <input type="submit" name="actionID" value="<?php echo $lang->button_cancel ?>" >
  <?php else: ?>
!     <input type="button" value="<?php echo $lang->button_cancel ?>" onClick="self.close();">
  <?php endif; ?>
      <?php if ($default->user_use_folders): ?>
--- 46,50 ----
      <input type="submit" name="actionID" value="<?php echo $lang->button_cancel ?>" >
  <?php else: ?>
!     <input type="submit" value="<?php echo $lang->button_cancel ?>" onClick="self.close();">
  <?php endif; ?>
      <?php if ($default->user_use_folders): ?>
***************
*** 59,64 ****
  <?php if (isset($actionID) && (($actionID == REPLY) || ($actionID == REPLY_ALL))): ?>
  <input type="hidden" name="is_reply" value="1">
! <input type="hidden" name="in_reply_to" value="<?php echo $in_reply_to ?>">
! <input type="hidden" name="references" value="<?php echo $references ?>">
  <input type="hidden" name="index" value="<?php echo $index ?>">
  <?php endif; ?>
--- 59,64 ----
  <?php if (isset($actionID) && (($actionID == REPLY) || ($actionID == REPLY_ALL))): ?>
  <input type="hidden" name="is_reply" value="1">
! <input type="hidden" name="in_reply_to" value="<?php echo htmlspecialchars($in_reply_to) ?>">
! <input type="hidden" name="references" value="<?php echo htmlspecialchars($references) ?>">
  <input type="hidden" name="index" value="<?php echo $index ?>">
  <?php endif; ?>
***************
*** 67,71 ****
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->from_string ?></font></td>
!   <td bgcolor="<?php echo $default->item_bg ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="1" name="from" value="<?php echo htmlentities($from) ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_FROM, $help_file, 'imp') ?></td>
  </tr>
--- 67,71 ----
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->from_string ?></font></td>
!   <td bgcolor="<?php echo $default->item_bg ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="1" name="from" value="<?php echo htmlspecialchars($from) ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_FROM, $help_file, 'imp') ?></td>
  </tr>
***************
*** 74,78 ****
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->to_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="2" name="to" onBlur="expand_to()" value="<?php echo $to ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_TO, $help_file, 'imp') ?></td>
  </tr>
--- 74,78 ----
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->to_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="2" name="to" onBlur="expand_to()" value="<?php echo htmlspecialchars($to) ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_TO, $help_file, 'imp') ?></td>
  </tr>
***************
*** 80,84 ****
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->cc_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg; ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="3" name="cc" onBlur="expand_cc()" value="<?php echo $cc ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_CC, $help_file, 'imp') ?></td>
  </tr>
--- 80,84 ----
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->cc_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg; ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="3" name="cc" onBlur="expand_cc()" value="<?php echo htmlspecialchars($cc) ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_CC, $help_file, 'imp') ?></td>
  </tr>
***************
*** 86,90 ****
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->bcc_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg; ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="3" name="bcc" onBlur="expand_bcc()" value="<?php echo $bcc ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_BCC, $help_file, 'imp') ?></td>
  </tr>
--- 86,90 ----
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->bcc_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg; ?>"><input type="text" size="<?php echo $_html['compose_headers_size'] ?>" tabindex="3" name="bcc" onBlur="expand_bcc()" value="<?php echo htmlspecialchars($bcc) ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_BCC, $help_file, 'imp') ?></td>
  </tr>
***************
*** 93,97 ****
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->subject_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg ?>"><input type="text" tabindex="4" name="subject" value="<?php echo $subject ?>" size="<?php echo $_html['compose_headers_size'] ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_SUBJECT, $help_file, 'imp') ?></td>
  </tr>
--- 93,97 ----
  <tr>
    <td align="right" bgcolor="<?php echo $default->light_bg; ?>"><?php $default->text_on_light->start(); ?><?php echo $lang->subject_string ?></FONT></td>
!   <td bgcolor="<?php echo $default->item_bg ?>"><input type="text" tabindex="4" name="subject" value="<?php echo htmlspecialchars($subject) ?>" size="<?php echo $_html['compose_headers_size'] ?>"></td>
    <td align="right"><?php $help->link(COMPOSE_HELP_SUBJECT, $help_file, 'imp') ?></td>
  </tr>
***************
*** 166,170 ****
  </tr>
  <tr>
!   <td colspan="3" align="center"><textarea tabindex="5" name="message" rows="<?php echo $_html['compose_body_rows'] ?>" cols="<?php echo $_html['compose_body_cols'] ?>" wrap="hard"><?php echo $msg ?></textarea></td>
  </tr>
  
--- 166,170 ----
  </tr>
  <tr>
!   <td colspan="3" align="center"><textarea tabindex="5" name="message" rows="<?php echo $_html['compose_body_rows'] ?>" cols="<?php echo $_html['compose_body_cols'] ?>" wrap="hard"><?php echo htmlspecialchars($msg) ?></textarea></td>
  </tr>
  
***************
*** 180,188 ****
  <?php
  if (isset($default->path_to_ispell)) {
!   echo "<a href=\"javascript:spellcheck()\">" . $lang->button_spellcheck;
    
    if (isset($default->ispell_lang)) {
       echo "$lang->spell_in</a>\n";
!      echo "<select name=\"spell_lang\">\n";
       
       reset($default->ispell_lang);
--- 180,188 ----
  <?php
  if (isset($default->path_to_ispell)) {
!   echo "<a href=\"javascript:spellcheck(2)\">" . $lang->button_spellcheck;
    
    if (isset($default->ispell_lang)) {
       echo "$lang->spell_in</a>\n";
!      echo "<select name=\"spell_lang2\">\n";
       
       reset($default->ispell_lang);
***************
*** 205,209 ****
      <input type="submit" name="actionID" value="<?php echo $lang->button_cancel ?>" >
  <?php else: ?>
!     <input type="button" value="<?php echo $lang->button_cancel ?>" onClick="self.close();">
  <?php endif; ?>
      <?php if ($default->user_use_folders): ?>
--- 205,209 ----
      <input type="submit" name="actionID" value="<?php echo $lang->button_cancel ?>" >
  <?php else: ?>
!     <input type="submit" value="<?php echo $lang->button_cancel ?>" onClick="self.close();">
  <?php endif; ?>
      <?php if ($default->user_use_folders): ?>
diff -r -N -C 2 imp-2.2.0-pre4/templates/compose/javascript.inc imp-2.2.0-pre5/templates/compose/javascript.inc
*** imp-2.2.0-pre4/templates/compose/javascript.inc	Sat Jul 17 16:48:49 1999
--- imp-2.2.0-pre5/templates/compose/javascript.inc	Sat Oct  2 21:47:53 1999
***************
*** 101,107 ****
  
  <?php if (isset($default->path_to_ispell)): ?>
! function spellcheck () {
    document.spelling.message.value = document.compose.message.value;
!   document.spelling.spell_lang.value = document.compose.spell_lang.options[document.compose.spell_lang.selectedIndex].value;
    document.spelling.submit();
  }
--- 101,110 ----
  
  <?php if (isset($default->path_to_ispell)): ?>
! function spellcheck (num) {
    document.spelling.message.value = document.compose.message.value;
!   if (num == 1)
!     document.spelling.spell_lang.value = document.compose.spell_lang1.options[document.compose.spell_lang1.selectedIndex].value;
!   else
!     document.spelling.spell_lang.value = document.compose.spell_lang2.options[document.compose.spell_lang2.selectedIndex].value;
    document.spelling.submit();
  }
***************
*** 114,118 ****
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ', '; }
!       echo '"' . $addresses[$i][0] . '"';
      }
    }
--- 117,121 ----
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ', '; }
!       echo '"' . addslashes($addresses[$i][0]) . '"';
      }
    }
***************
*** 124,128 ****
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ', '; }
!       echo '"' . $addresses[$i][1] . '"';
      }
    }
--- 127,131 ----
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ', '; }
!       echo '"' . addslashes($addresses[$i][1]) . '"';
      }
    }
***************
*** 134,138 ****
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ', '; }
!       echo '"' . $addresses[$i][2] . '"';
      }
    }
--- 137,141 ----
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ', '; }
!       echo '"' . addslashes($addresses[$i][2]) . '"';
      }
    }
diff -r -N -C 2 imp-2.2.0-pre4/templates/contacts/javascript.inc imp-2.2.0-pre5/templates/contacts/javascript.inc
*** imp-2.2.0-pre4/templates/contacts/javascript.inc	Wed May  5 08:45:49 1999
--- imp-2.2.0-pre5/templates/contacts/javascript.inc	Sat Oct  2 21:47:55 1999
***************
*** 7,11 ****
      for ($i = 0; $i < sizeof($addresses); $i++) {
        if ($i > 0) { echo ' , '; }
!       echo '"' . $addresses[$i][0] . '"';
      }
      echo "\n";
--- 7,11 ----
      for ($i = 0; $i < sizeof($addresses); $i++) {
        if ($i > 0) { echo ' , '; }
!       echo '"' . addslashes($addresses[$i][0]) . '"';
      }
      echo "\n";
***************
*** 115,119 ****
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ' , '; }
!       echo '"' . $addresses[$i][1] . '"';
      }
      echo "\n";
--- 115,119 ----
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ' , '; }
!       echo '"' . addslashes($addresses[$i][1]) . '"';
      }
      echo "\n";
***************
*** 127,131 ****
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ' , '; }
!       echo '"' . $addresses[$i][2] . '"';
      }
      echo "\n";
--- 127,131 ----
      for ($i = 0; $i < count($addresses); $i++) {
        if ($i > 0) { echo ' , '; }
!       echo '"' . addslashes($addresses[$i][2]) . '"';
      }
      echo "\n";
diff -r -N -C 2 imp-2.2.0-pre4/templates/login/login.inc imp-2.2.0-pre5/templates/login/login.inc
*** imp-2.2.0-pre4/templates/login/login.inc	Mon Aug 23 17:33:06 1999
--- imp-2.2.0-pre5/templates/login/login.inc	Tue Oct  5 16:34:43 1999
***************
*** 14,22 ****
  
  function submit_login() {
!    if (document.login.imapuser.value == "" || document.login.pass.value == "" ) {
!        alert( "<? echo $lang->alert_user_pass ?>" );
!    } else {
!        document.login.submit();
!    }
  }
  
--- 14,29 ----
  
  function submit_login() {
!   if (document.login.imapuser.value == "") {
!     alert( "<? echo $lang->alert_user_pass ?>" );
!     document.login.imapuser.focus();
!     return false;
!   } else if (document.login.pass.value == "") {
!     alert( "<? echo $lang->alert_user_pass ?>" );
!     document.login.pass.focus();
!     return false;
!   } else {
!     document.login.submit();
!     return true;
!   }
  }
  
***************
*** 101,105 ****
        }
     } else {
!       if ($iserver->preferred == $default->localhost) {
  	 $option = ' selected';
        }
--- 108,112 ----
        }
     } else {
!       if ($iserver->preferred == $SERVER_NAME) {
  	 $option = ' selected';
        }
diff -r -N -C 2 imp-2.2.0-pre4/templates/login/login_lynx.inc imp-2.2.0-pre5/templates/login/login_lynx.inc
*** imp-2.2.0-pre4/templates/login/login_lynx.inc	Tue Jul 13 18:39:41 1999
--- imp-2.2.0-pre5/templates/login/login_lynx.inc	Tue Oct  5 16:34:44 1999
***************
*** 45,49 ****
     if (gettype($iserver->preferred) == 'array') {
        while (list($pkey, $pref) = each($iserver->preferred)) {
!          if ($pref == $default->localhost) {
  	    $option = ' selected';
  	    $defaultport = $iserver->port;
--- 45,49 ----
     if (gettype($iserver->preferred) == 'array') {
        while (list($pkey, $pref) = each($iserver->preferred)) {
!          if ($pref == $SERVER_NAME) {
  	    $option = ' selected';
  	    $defaultport = $iserver->port;
***************
*** 51,55 ****
        }
     } else {
!       if ($iserver->preferred == $default->localhost) {
  	 $option = ' selected';
  	 $defaultport = $iserver->port;
--- 51,55 ----
        }
     } else {
!       if ($iserver->preferred == $SERVER_NAME) {
  	 $option = ' selected';
  	 $defaultport = $iserver->port;
diff -r -N -C 2 imp-2.2.0-pre4/templates/message/navbar.inc imp-2.2.0-pre5/templates/message/navbar.inc
*** imp-2.2.0-pre4/templates/message/navbar.inc	Thu Aug 26 20:19:17 1999
--- imp-2.2.0-pre5/templates/message/navbar.inc	Tue Sep 28 13:24:31 1999
***************
*** 19,23 ****
  <a href="<?php echo $default->root_url ?>/view.php3?actionID=<?php echo SAVE_MESSAGE ?>&index=<?php echo $index ?>"><?php echo $lang->saveas ?></a>
  <?php if (($default->user_use_addressbook == true) && $default->use_db): ?> |
! <a href="javascript:open_add_contact_win('actionID=<?php echo ADD_CONTACT ?>&index=<?php echo $index ?>&bodypart=<?php echo $bodypart ?>');"><?php echo $lang->add_to_contacts ?></a>
  <?php endif; ?>
  
--- 19,23 ----
  <a href="<?php echo $default->root_url ?>/view.php3?actionID=<?php echo SAVE_MESSAGE ?>&index=<?php echo $index ?>"><?php echo $lang->saveas ?></a>
  <?php if (($default->user_use_addressbook == true) && $default->use_db): ?> |
! <a href="javascript:open_add_contact_win('actionID=<?php echo ADD_CONTACT ?>&index=<?php echo $index ?>');"><?php echo $lang->add_to_contacts ?></a>
  <?php endif; ?>
  
diff -r -N -C 2 imp-2.2.0-pre4/templates/passwd/poppassd_input.inc imp-2.2.0-pre5/templates/passwd/poppassd_input.inc
*** imp-2.2.0-pre4/templates/passwd/poppassd_input.inc	Sat Aug 14 00:44:08 1999
--- imp-2.2.0-pre5/templates/passwd/poppassd_input.inc	Sun Oct  3 17:54:04 1999
***************
*** 15,19 ****
  </tr>
  
! <form action="<?php echo $default->root_url ?>/passwd.php3" method="post">
  <input type="hidden" name="actionID" value="<?php echo PASSWD_CHANGE ?>">
  <input type="hidden" name="username" value="<?php echo $user?>">
--- 15,19 ----
  </tr>
  
! <form action="<?php echo $default->root_url ?>/poppassd.php3" method="post">
  <input type="hidden" name="actionID" value="<?php echo PASSWD_CHANGE ?>">
  <input type="hidden" name="username" value="<?php echo $user?>">
diff -r -N -C 2 imp-2.2.0-pre4/view.php3 imp-2.2.0-pre5/view.php3
*** imp-2.2.0-pre4/view.php3	Sat Aug 14 12:11:55 1999
--- imp-2.2.0-pre5/view.php3	Mon Oct 18 10:55:51 1999
***************
*** 7,12 ****
    File: view.php3
    $Author: chuck $
!   $Revision: 2.8.2.3 $
!   $Date: 1999/08/14 16:11:55 $
    
    IMP: Copyright 1998, 1999 Charles J. Hagenbuch <chuck@horde.org>
--- 7,12 ----
    File: view.php3
    $Author: chuck $
!   $Revision: 2.8.2.7 $
!   $Date: 1999/10/18 14:55:51 $
    
    IMP: Copyright 1998, 1999 Charles J. Hagenbuch <chuck@horde.org>
***************
*** 69,82 ****
      $mime->parse($part);
      
!     /* This should force a save file dialog...  */
!     header('Content-type: application/RFC822');
      break;
      
!   case VIEW_ATTACH: {
      $mime = new mime_part_data;
      $mime->parse($part);
      $mime->set_imap_data($index, $bodypart );
      if (isset($mime->action['view_function'])) {
!       header('content-type: text/html');
        $title = 'MIME Attachment View';
        include "$default->include_dir/generic-header.inc";
--- 69,83 ----
      $mime->parse($part);
      
!     header('Content-Disposition: attachment; filename="' . $mime->name .'"');
!     header('Content-type: application/RFC822');    /* This should force a save file dialog...  */
      break;
      
!   case VIEW_ATTACH:
      $mime = new mime_part_data;
      $mime->parse($part);
      $mime->set_imap_data($index, $bodypart );
+     header("Content-Disposition: inline; filename=$mime->name");
      if (isset($mime->action['view_function'])) {
!       header('Content-type: text/html');
        $title = 'MIME Attachment View';
        include "$default->include_dir/generic-header.inc";
***************
*** 86,90 ****
      }
      
!     if (($mime->subtype == 'jpeg') || ($mime->subtype == 'gif') || ($mime->subtype == 'png')) {
        header("Content-type: image/$mime->subtype");
      } else {
--- 87,91 ----
      }
      
!     if (($mime->subtype == 'jpeg') || ($mime->subtype == 'gif') || ($mime->subtype == 'png') || ($mime->subtype == 'pjpeg')) {
        header("Content-type: image/$mime->subtype");
      } else {
***************
*** 94,107 ****
        header('Content-type: text/plain');
      }
!   } break;
!   
    case VIEW_SOURCE:
!     if (!$default->view_message_source) {
!       echo 'Not Authorized.';
!     } else {
!       header('Content-type: text/plain');
!       echo imap_fetchheader ($imp->stream, imap_msgno($imp->stream, $index)) . "\n" . imap_body ($imp->stream, $index, FT_UID );
!       exit; 
!     }
      break;
      
--- 95,105 ----
        header('Content-type: text/plain');
      }
!     break;
!     
    case VIEW_SOURCE:
!     header('Content-type: text/plain');
!     header('Content-Disposition: inline; filename="Message Source"');
!     echo imap_fetchheader ($imp->stream, imap_msgno($imp->stream, $index)) . "\n" . imap_body ($imp->stream, $index, FT_UID );
!     exit; 
      break;
      
***************
*** 120,123 ****
--- 118,122 ----
      $body = $msg . imap_body ($imp->stream, $index, FT_UID);
      
+     header('Content-Disposition: attachment; filename="' . $mime->name . '"');
      header('Content-type: application/RFC822');
      break;
***************
*** 126,130 ****
  }
  
! header("Content-Disposition: attachment; filename=$mime->name");
  
  if ($actionID != SAVE_MESSAGE) {
--- 125,131 ----
  }
  
! if (isset($actionID) && $actionID == VIEW_ATTACH) {
!   header('Content-Disposition: inline; filename="' . $mime->name . '"');
! }
  
  if ($actionID != SAVE_MESSAGE) {